diff --git a/source/tools/atlas/AtlasUI/CustomControls/DraggableListCtrl/DraggableListCtrlCommands.cpp b/source/tools/atlas/AtlasUI/CustomControls/DraggableListCtrl/DraggableListCtrlCommands.cpp
index 68574c625e..bbac387f90 100644
--- a/source/tools/atlas/AtlasUI/CustomControls/DraggableListCtrl/DraggableListCtrlCommands.cpp
+++ b/source/tools/atlas/AtlasUI/CustomControls/DraggableListCtrl/DraggableListCtrlCommands.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2025 Wildfire Games.
+/* Copyright (C) 2026 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@
 
 //////////////////////////////////////////////////////////////////////////
 
-IMPLEMENT_CLASS(DragCommand, AtlasWindowCommand);
+wxIMPLEMENT_CLASS(DragCommand, AtlasWindowCommand);
 
 DragCommand::DragCommand(DraggableListCtrl* ctrl, long src, long tgt)
 	: AtlasWindowCommand(true, _("Drag")), m_Ctrl(ctrl), m_Src(src), m_Tgt(tgt)
@@ -104,7 +104,7 @@ bool DragCommand::Merge(AtlasWindowCommand* command)
 
 //////////////////////////////////////////////////////////////////////////
 
-IMPLEMENT_CLASS(DeleteCommand, AtlasWindowCommand);
+wxIMPLEMENT_CLASS(DeleteCommand, AtlasWindowCommand);
 
 DeleteCommand::DeleteCommand(DraggableListCtrl* ctrl, long itemID)
 	: AtlasWindowCommand(true, _("Delete")), m_Ctrl(ctrl), m_ItemID(itemID)
diff --git a/source/tools/atlas/AtlasUI/CustomControls/DraggableListCtrl/DraggableListCtrlCommands.h b/source/tools/atlas/AtlasUI/CustomControls/DraggableListCtrl/DraggableListCtrlCommands.h
index dc05380aa4..6fd7e7653a 100644
--- a/source/tools/atlas/AtlasUI/CustomControls/DraggableListCtrl/DraggableListCtrlCommands.h
+++ b/source/tools/atlas/AtlasUI/CustomControls/DraggableListCtrl/DraggableListCtrlCommands.h
@@ -25,7 +25,7 @@ class DraggableListCtrl;
 
 class DragCommand : public AtlasWindowCommand
 {
-	DECLARE_CLASS(DragCommand);
+	wxDECLARE_CLASS(DragCommand);
 
 public:
 	DragCommand(DraggableListCtrl* ctrl, long src, long tgt);
@@ -44,7 +44,7 @@ private:
 
 class DeleteCommand : public AtlasWindowCommand
 {
-	DECLARE_CLASS(DeleteCommand);
+	wxDECLARE_CLASS(DeleteCommand);
 
 public:
 	DeleteCommand(DraggableListCtrl* ctrl, long itemID);
diff --git a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrlCommands.cpp b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrlCommands.cpp
index 1501a656ba..dec6e7a190 100644
--- a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrlCommands.cpp
+++ b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrlCommands.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2025 Wildfire Games.
+/* Copyright (C) 2026 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
 
 //////////////////////////////////////////////////////////////////////////
 
-IMPLEMENT_CLASS(EditCommand_Dialog, AtlasWindowCommand);
+wxIMPLEMENT_CLASS(EditCommand_Dialog, AtlasWindowCommand);
 
 EditCommand_Dialog::EditCommand_Dialog(EditableListCtrl* ctrl, long row, int col, AtObj& newData)
 	: AtlasWindowCommand(true, _("Edit")), m_Ctrl(ctrl), m_Row(row), m_Col(col), m_NewData(newData)
@@ -60,7 +60,7 @@ bool EditCommand_Dialog::Undo()
 
 //////////////////////////////////////////////////////////////////////////
 
-IMPLEMENT_CLASS(EditCommand_Text, AtlasWindowCommand);
+wxIMPLEMENT_CLASS(EditCommand_Text, AtlasWindowCommand);
 
 EditCommand_Text::EditCommand_Text(EditableListCtrl* ctrl, long row, int col, wxString newText)
 	: AtlasWindowCommand(true, _("Edit")), m_Ctrl(ctrl), m_Row(row), m_Col(col), m_NewText(newText)
@@ -93,7 +93,7 @@ bool EditCommand_Text::Undo()
 
 //////////////////////////////////////////////////////////////////////////
 
-IMPLEMENT_CLASS(PasteCommand, AtlasWindowCommand);
+wxIMPLEMENT_CLASS(PasteCommand, AtlasWindowCommand);
 
 PasteCommand::PasteCommand(EditableListCtrl* ctrl, long row, AtObj& newData)
 	: AtlasWindowCommand(true, _("Paste")), m_Ctrl(ctrl), m_Row(row), m_NewData(newData)
diff --git a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrlCommands.h b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrlCommands.h
index 9bc71bcfa3..7a115b80f3 100644
--- a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrlCommands.h
+++ b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrlCommands.h
@@ -26,7 +26,7 @@ class EditableListCtrl;
 
 class EditCommand_Dialog : public AtlasWindowCommand
 {
-	DECLARE_CLASS(EditCommand_Dialog);
+	wxDECLARE_CLASS(EditCommand_Dialog);
 
 public:
 	EditCommand_Dialog(EditableListCtrl* ctrl, long row, int col, AtObj& newData);
@@ -46,7 +46,7 @@ private:
 
 class EditCommand_Text : public AtlasWindowCommand
 {
-	DECLARE_CLASS(EditCommand_Text);
+	wxDECLARE_CLASS(EditCommand_Text);
 
 public:
 	EditCommand_Text(EditableListCtrl* ctrl, long row, int col, wxString newText);
@@ -65,7 +65,7 @@ private:
 
 class PasteCommand : public AtlasWindowCommand
 {
-	DECLARE_CLASS(PasteCommand);
+	wxDECLARE_CLASS(PasteCommand);
 
 public:
 	PasteCommand(EditableListCtrl* ctrl, long row, AtObj& newData);
diff --git a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickFileCtrl.cpp b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickFileCtrl.cpp
index f8b84ed480..701d2a0807 100644
--- a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickFileCtrl.cpp
+++ b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickFileCtrl.cpp
@@ -186,7 +186,7 @@ private:
 //////////////////////////////////////////////////////////////////////////
 
 
-IMPLEMENT_DYNAMIC_CLASS(QuickFileCtrl, wxPanel);
+wxIMPLEMENT_DYNAMIC_CLASS(QuickFileCtrl, wxPanel);
 
 QuickFileCtrl::QuickFileCtrl(wxWindow* parent,
 							 wxRect& location,
diff --git a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.cpp b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.cpp
index e585b2e020..624fa973cd 100644
--- a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.cpp
+++ b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.cpp
@@ -33,7 +33,7 @@
 class wxSize;
 class wxWindow;
 
-IMPLEMENT_CLASS(AtlasDialog, wxDialog);
+wxIMPLEMENT_CLASS(AtlasDialog, wxDialog);
 
 wxBEGIN_EVENT_TABLE(AtlasDialog, wxDialog)
 	EVT_MENU(wxID_UNDO, AtlasDialog::OnUndo)
diff --git a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.h b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.h
index 2fd085a6d4..e91ae71b4b 100644
--- a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.h
+++ b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.h
@@ -35,7 +35,7 @@ class AtlasDialog : public wxDialog, public IAtlasSerialiser
 	friend class FieldEditCtrl_Dialog;
 	friend class AtlasWindowCommandProc;
 
-	DECLARE_CLASS(AtlasDialog);
+	wxDECLARE_CLASS(AtlasDialog);
 
 public:
 	AtlasDialog(wxWindow* parent, const wxString& title, const wxSize& size);
diff --git a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.cpp b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.cpp
index dc367a70f2..0a7f33eaae 100644
--- a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.cpp
+++ b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.cpp
@@ -95,7 +95,7 @@ wxEND_EVENT_TABLE()
 
 //////////////////////////////////////////////////////////////////////////
 
-IMPLEMENT_CLASS(AtlasWindow, wxFrame);
+wxIMPLEMENT_CLASS(AtlasWindow, wxFrame);
 
 wxBEGIN_EVENT_TABLE(AtlasWindow, wxFrame)
 	EVT_MENU(wxID_NEW, AtlasWindow::OnNew)
diff --git a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h
index 1b07e903dc..531e809113 100644
--- a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h
+++ b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h
@@ -39,7 +39,7 @@ class AtlasWindow : public wxFrame, public IAtlasSerialiser
 {
 	friend class AtlasWindowCommandProc;
 
-	DECLARE_CLASS(AtlasWindow);
+	wxDECLARE_CLASS(AtlasWindow);
 
 public:
 
diff --git a/source/tools/atlas/AtlasUI/General/AtlasWindowCommand.cpp b/source/tools/atlas/AtlasUI/General/AtlasWindowCommand.cpp
index 18c6266e17..7a73ab14fc 100644
--- a/source/tools/atlas/AtlasUI/General/AtlasWindowCommand.cpp
+++ b/source/tools/atlas/AtlasUI/General/AtlasWindowCommand.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2025 Wildfire Games.
+/* Copyright (C) 2026 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -26,10 +26,10 @@
 #include <wx/log.h>
 #include <wx/translation.h>
 
-IMPLEMENT_ABSTRACT_CLASS(AtlasWindowCommand, wxCommand);
+wxIMPLEMENT_ABSTRACT_CLASS(AtlasWindowCommand, wxCommand);
 
-IMPLEMENT_CLASS(AtlasCommand_Begin, AtlasWindowCommand);
-IMPLEMENT_CLASS(AtlasCommand_End, AtlasWindowCommand);
+wxIMPLEMENT_CLASS(AtlasCommand_Begin, AtlasWindowCommand);
+wxIMPLEMENT_CLASS(AtlasCommand_End, AtlasWindowCommand);
 
 AtlasCommand_Begin::AtlasCommand_Begin(const wxString& description, IAtlasSerialiser* object)
 	: AtlasWindowCommand(true, description),
diff --git a/source/tools/atlas/AtlasUI/General/AtlasWindowCommand.h b/source/tools/atlas/AtlasUI/General/AtlasWindowCommand.h
index d6c799d650..28e3c89ce5 100644
--- a/source/tools/atlas/AtlasUI/General/AtlasWindowCommand.h
+++ b/source/tools/atlas/AtlasUI/General/AtlasWindowCommand.h
@@ -29,7 +29,7 @@ class IAtlasSerialiser;
 
 class AtlasWindowCommand : public wxCommand
 {
-	DECLARE_ABSTRACT_CLASS(AtlasWindowCommand);
+	wxDECLARE_ABSTRACT_CLASS(AtlasWindowCommand);
 
 	friend class AtlasWindowCommandProc;
 
@@ -53,7 +53,7 @@ private:
 
 class AtlasCommand_Begin : public AtlasWindowCommand
 {
-	DECLARE_CLASS(AtlasCommand_Begin);
+	wxDECLARE_CLASS(AtlasCommand_Begin);
 
 	friend class AtlasCommand_End;
 
@@ -70,7 +70,7 @@ private:
 
 class AtlasCommand_End : public AtlasWindowCommand
 {
-	DECLARE_CLASS(AtlasCommand_End);
+	wxDECLARE_CLASS(AtlasCommand_End);
 
 public:
 	AtlasCommand_End() : AtlasWindowCommand(true, _T("[error]")) {}
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/ActorViewerTool.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/ActorViewerTool.cpp
index 5c43a82aa1..d6084e6496 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/ActorViewerTool.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/ActorViewerTool.cpp
@@ -187,4 +187,4 @@ public:
 	Viewing;
 };
 
-IMPLEMENT_DYNAMIC_CLASS(ActorViewerTool, StateDrivenTool<ActorViewerTool>);
+wxIMPLEMENT_DYNAMIC_CLASS(ActorViewerTool, StateDrivenTool<ActorViewerTool>);
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/AlterElevation.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/AlterElevation.cpp
index d7fad2f1f2..90b8a1d29d 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/AlterElevation.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/AlterElevation.cpp
@@ -143,4 +143,4 @@ public:
 	Lowering;
 };
 
-IMPLEMENT_DYNAMIC_CLASS(AlterElevation, StateDrivenTool<AlterElevation>);
+wxIMPLEMENT_DYNAMIC_CLASS(AlterElevation, StateDrivenTool<AlterElevation>);
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Tools.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Tools.cpp
index 9755ce9c78..1b8d952eb6 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Tools.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Tools.cpp
@@ -151,7 +151,7 @@ void RegisterToolBarButton(wxToolBar* toolbar, int buttonId, const wxString& too
 
 //////////////////////////////////////////////////////////////////////////
 
-IMPLEMENT_CLASS(WorldCommand, AtlasWindowCommand);
+wxIMPLEMENT_CLASS(WorldCommand, AtlasWindowCommand);
 
 WorldCommand::WorldCommand(AtlasMessage::mWorldCommand* command)
 	: AtlasWindowCommand(true, wxString::FromAscii(command->GetName())), m_Command(command), m_AlreadyDone(false)
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Tools.h b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Tools.h
index 2eed1f9e47..981f01a706 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Tools.h
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Tools.h
@@ -75,7 +75,7 @@ extern void RegisterToolBarButton(wxToolBar* toolbar, int buttonId, const wxStri
 namespace AtlasMessage { struct mWorldCommand; }
 class WorldCommand : public AtlasWindowCommand
 {
-	DECLARE_CLASS(WorldCommand);
+	wxDECLARE_CLASS(WorldCommand);
 
 	bool m_AlreadyDone;
 public:
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/FillTerrain.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/FillTerrain.cpp
index dc8b555dd2..da4ff49c4f 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/FillTerrain.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/FillTerrain.cpp
@@ -83,4 +83,4 @@ public:
 	Waiting;
 };
 
-IMPLEMENT_DYNAMIC_CLASS(FillTerrain, StateDrivenTool<FillTerrain>);
+wxIMPLEMENT_DYNAMIC_CLASS(FillTerrain, StateDrivenTool<FillTerrain>);
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/FlattenElevation.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/FlattenElevation.cpp
index bd228a0e8a..1c0a7219b1 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/FlattenElevation.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/FlattenElevation.cpp
@@ -120,4 +120,4 @@ public:
 	Flattening;
 };
 
-IMPLEMENT_DYNAMIC_CLASS(FlattenElevation, StateDrivenTool<FlattenElevation>);
+wxIMPLEMENT_DYNAMIC_CLASS(FlattenElevation, StateDrivenTool<FlattenElevation>);
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PaintTerrain.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PaintTerrain.cpp
index 356d8c29e4..5da87f1711 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PaintTerrain.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PaintTerrain.cpp
@@ -219,4 +219,4 @@ public:
 	Eyedropper;
 };
 
-IMPLEMENT_DYNAMIC_CLASS(PaintTerrain, StateDrivenTool<PaintTerrain>);
+wxIMPLEMENT_DYNAMIC_CLASS(PaintTerrain, StateDrivenTool<PaintTerrain>);
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PickWaterHeight.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PickWaterHeight.cpp
index f1654990ce..96d6340cf8 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PickWaterHeight.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PickWaterHeight.cpp
@@ -66,4 +66,4 @@ public:
 	Waiting;
 };
 
-IMPLEMENT_DYNAMIC_CLASS(PickWaterHeight, StateDrivenTool<PickWaterHeight>);
+wxIMPLEMENT_DYNAMIC_CLASS(PickWaterHeight, StateDrivenTool<PickWaterHeight>);
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PikeElevation.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PikeElevation.cpp
index 1557e72df7..3ee2cd5ed5 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PikeElevation.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PikeElevation.cpp
@@ -143,4 +143,4 @@ public:
 	PikeLowering;
 };
 
-IMPLEMENT_DYNAMIC_CLASS(PikeElevation, StateDrivenTool<PikeElevation>);
+wxIMPLEMENT_DYNAMIC_CLASS(PikeElevation, StateDrivenTool<PikeElevation>);
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PlaceObject.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PlaceObject.cpp
index fceb970a95..ab45cb70b5 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PlaceObject.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PlaceObject.cpp
@@ -246,4 +246,4 @@ public:
 	Placing;
 };
 
-IMPLEMENT_DYNAMIC_CLASS(PlaceObject, StateDrivenTool<PlaceObject>);
+wxIMPLEMENT_DYNAMIC_CLASS(PlaceObject, StateDrivenTool<PlaceObject>);
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/ReplaceTerrain.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/ReplaceTerrain.cpp
index 7a1777cd23..502b3b9906 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/ReplaceTerrain.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/ReplaceTerrain.cpp
@@ -83,4 +83,4 @@ public:
 	Waiting;
 };
 
-IMPLEMENT_DYNAMIC_CLASS(ReplaceTerrain, StateDrivenTool<ReplaceTerrain>);
+wxIMPLEMENT_DYNAMIC_CLASS(ReplaceTerrain, StateDrivenTool<ReplaceTerrain>);
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/SmoothElevation.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/SmoothElevation.cpp
index cdf247af14..644fa92142 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/SmoothElevation.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/SmoothElevation.cpp
@@ -143,4 +143,4 @@ public:
 	Roughing;
 };
 
-IMPLEMENT_DYNAMIC_CLASS(SmoothElevation, StateDrivenTool<SmoothElevation>);
+wxIMPLEMENT_DYNAMIC_CLASS(SmoothElevation, StateDrivenTool<SmoothElevation>);
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/TransformObject.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/TransformObject.cpp
index faba3dd607..1ebf0df39a 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/TransformObject.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/TransformObject.cpp
@@ -624,4 +624,4 @@ public:
 	Rotating;
 };
 
-IMPLEMENT_DYNAMIC_CLASS(TransformObject, StateDrivenTool<TransformObject>);
+wxIMPLEMENT_DYNAMIC_CLASS(TransformObject, StateDrivenTool<TransformObject>);
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/TransformPath.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/TransformPath.cpp
index 523d1dd345..63033417cc 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/TransformPath.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/TransformPath.cpp
@@ -167,4 +167,4 @@ public:
 	Dragging;
 };
 
-IMPLEMENT_DYNAMIC_CLASS(TransformPath, StateDrivenTool<TransformPath>);
+wxIMPLEMENT_DYNAMIC_CLASS(TransformPath, StateDrivenTool<TransformPath>);