diff --git a/src/MainEditor/UI/TextureXEditor/TextureXEditor.h b/src/MainEditor/UI/TextureXEditor/TextureXEditor.h
index e18f12179..f0b1f9255 100644
--- a/src/MainEditor/UI/TextureXEditor/TextureXEditor.h
+++ b/src/MainEditor/UI/TextureXEditor/TextureXEditor.h
@@ -52,7 +52,7 @@ class TextureXEditor : public wxPanel
 	PatchTable              patch_table_;             // The patch table for TEXTURE1/2 (ie PNAMES)
 	vector<TextureXPanel*>  texture_editors_;         // One panel per TEXTUREX list (ie TEXTURE1/TEXTURE2)
 	PatchBrowser*           patch_browser_ = nullptr; // The patch browser window
-	unique_ptr<UndoManager> undo_manager_  = nullptr;
+	unique_ptr<UndoManager> undo_manager_;
 
 	// UI Stuff
 	TabControl* tabs_         = nullptr;
diff --git a/src/MapEditor/MapEditContext.cpp b/src/MapEditor/MapEditContext.cpp
index fe1c9e4aa..db68b9d9e 100644
--- a/src/MapEditor/MapEditContext.cpp
+++ b/src/MapEditor/MapEditContext.cpp
@@ -137,6 +137,11 @@ MapEditContext::MapEditContext() :
 	undo_manager_ = std::make_unique<UndoManager>(map_.get());
 }
 
+// -----------------------------------------------------------------------------
+// MapEditContext class destructor
+// -----------------------------------------------------------------------------
+MapEditContext::~MapEditContext() = default;
+
 // -----------------------------------------------------------------------------
 // Changes the current edit mode to [mode]
 // -----------------------------------------------------------------------------
diff --git a/src/MapEditor/MapEditContext.h b/src/MapEditor/MapEditContext.h
index 8360b8dd8..09fecd71e 100644
--- a/src/MapEditor/MapEditContext.h
+++ b/src/MapEditor/MapEditContext.h
@@ -57,7 +57,7 @@ class MapEditContext : public SActionHandler
 	};
 
 	MapEditContext();
-	~MapEditContext() override = default;
+	~MapEditContext() override;
 
 	SLADEMap&           map() const { return *map_; }
 	Mode                editMode() const { return edit_mode_; }
diff --git a/src/SLADEMap/MapObject/MapSector.cpp b/src/SLADEMap/MapObject/MapSector.cpp
index 1beb9ef03..4057a03d1 100644
--- a/src/SLADEMap/MapObject/MapSector.cpp
+++ b/src/SLADEMap/MapObject/MapSector.cpp
@@ -111,6 +111,11 @@ MapSector::MapSector(string_view f_tex, string_view c_tex, const ParseTreeNode*
 	}
 }
 
+// -----------------------------------------------------------------------------
+// MapSector class destructor
+// -----------------------------------------------------------------------------
+MapSector::~MapSector() = default;
+
 // -----------------------------------------------------------------------------
 // Copies another map object [s]
 // -----------------------------------------------------------------------------
diff --git a/src/SLADEMap/MapObject/MapSector.h b/src/SLADEMap/MapObject/MapSector.h
index 8722138ee..d9a42e4bb 100644
--- a/src/SLADEMap/MapObject/MapSector.h
+++ b/src/SLADEMap/MapObject/MapSector.h
@@ -91,7 +91,7 @@ class MapSector : public MapObject
 		short       special  = 0,
 		short       id       = 0);
 	MapSector(string_view f_tex, string_view c_tex, const ParseTreeNode* udmf_def);
-	~MapSector() override = default;
+	~MapSector() override;
 
 	void copy(MapObject* obj) override;