diff --git a/radiant/Makefile.am b/radiant/Makefile.am
index 75c7d37af8..a8dad3e7b8 100644
--- a/radiant/Makefile.am
+++ b/radiant/Makefile.am
@@ -57,6 +57,7 @@ darkradiant_SOURCES = main.cpp \
                       ui/texturebrowser/TextureBrowser.cpp \
                       ui/texturebrowser/TextureBrowserManager.cpp \
                       ui/findshader/FindShader.cpp \
+                      ui/mapselector/MapSelector.cpp \
                       ui/mapinfo/MapInfoDialog.cpp \
                       ui/mapinfo/EntityInfoTab.cpp \
                       ui/mapinfo/ShaderInfoTab.cpp \
diff --git a/radiant/ui/mapselector/MapSelector.cpp b/radiant/ui/mapselector/MapSelector.cpp
index 448bd1ccfe..ec8a14b0b1 100644
--- a/radiant/ui/mapselector/MapSelector.cpp
+++ b/radiant/ui/mapselector/MapSelector.cpp
@@ -1,6 +1,7 @@
 #include "MapSelector.h"
 
 #include "i18n.h"
+#include "ifiletypes.h"
 #include "ifilesystem.h"
 
 #include "string/case_conv.h"
@@ -19,8 +20,13 @@ namespace
 
 MapSelector::MapSelector() :
     DialogBase(_(MAPSELECTOR_TITLE)),
-    _treeView(nullptr),
+    _dialogPanel(nullptr),
     _openButton(nullptr),
+    _reloadButton(nullptr),
+    _treeView(nullptr),
+    _useModPath(nullptr),
+    _useCustomPath(nullptr),
+    _customPath(nullptr),
     _handlingSelectionChange(false)
 {
     SetSizer(new wxBoxSizer(wxVERTICAL));
diff --git a/radiant/ui/mapselector/MapSelector.h b/radiant/ui/mapselector/MapSelector.h
index f780c23588..be8427f7b0 100644
--- a/radiant/ui/mapselector/MapSelector.h
+++ b/radiant/ui/mapselector/MapSelector.h
@@ -7,6 +7,7 @@
 #include "wxutil/WindowPosition.h"
 #include "wxutil/PathEntry.h"
 #include <wx/button.h>
+#include <wx/radiobut.h>
 
 class wxStdDialogButtonSizer;
 
diff --git a/radiantcore/map/MapResourceLoader.cpp b/radiantcore/map/MapResourceLoader.cpp
index 9fc645c738..d6273e2c25 100644
--- a/radiantcore/map/MapResourceLoader.cpp
+++ b/radiantcore/map/MapResourceLoader.cpp
@@ -1,5 +1,6 @@
 #include "MapResourceLoader.h"
 
+#include "i18n.h"
 #include "fmt/format.h"
 #include "scene/ChildPrimitives.h"
 #include "scenelib.h"