diff --git a/plugins/dm.gui/ReadableEditorDialog.cpp b/plugins/dm.gui/ReadableEditorDialog.cpp
index af5d81fced..30d7802346 100644
--- a/plugins/dm.gui/ReadableEditorDialog.cpp
+++ b/plugins/dm.gui/ReadableEditorDialog.cpp
@@ -11,9 +11,6 @@
 #include "selectionlib.h"
 #include "wxutil/dialog/MessageBox.h"
 
-#include <boost/filesystem/fstream.hpp>
-#include <boost/filesystem.hpp>
-
 #include "registry/registry.h"
 #include "string/string.h"
 #include "os/file.h"
diff --git a/plugins/particles/editor/ParticleEditor.cpp b/plugins/particles/editor/ParticleEditor.cpp
index 580c738822..d934b6e6d8 100644
--- a/plugins/particles/editor/ParticleEditor.cpp
+++ b/plugins/particles/editor/ParticleEditor.cpp
@@ -26,11 +26,11 @@
 
 #include "../ParticlesManager.h"
 
+#include "os/fs.h"
 #include "os/file.h"
 #include "os/path.h"
 #include "util/ScopedBoolLock.h"
 
-#include <boost/filesystem.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 
 namespace ui
@@ -1026,7 +1026,7 @@ void ParticleEditor::updateWidgetsFromParticle()
     updateWidgetsFromStage();
 
     // Update outfile label
-    boost::filesystem::path outFile = GlobalGameManager().getModPath();
+    fs::path outFile = GlobalGameManager().getModPath();
     outFile /= PARTICLES_DIR;
     outFile /= _currentDef->getFilename();
 
@@ -1504,13 +1504,13 @@ std::string ParticleEditor::queryParticleFile()
     // Get the filename we should save this particle into
     wxutil::FileChooser chooser(this, _("Select .prt file"), false, "particle", ".prt");
 
-    boost::filesystem::path modParticlesPath = GlobalGameManager().getModPath();
+    fs::path modParticlesPath = GlobalGameManager().getModPath();
     modParticlesPath /= "particles";
 
     if (!os::fileOrDirExists(modParticlesPath.string()))
     {
         rMessage() << "Ensuring mod particles path: " << modParticlesPath << std::endl;
-        boost::filesystem::create_directories(modParticlesPath);
+        fs::create_directories(modParticlesPath);
     }
 
     // Point the file chooser to that new file
diff --git a/plugins/vfspk3/SortedFilenames.h b/plugins/vfspk3/SortedFilenames.h
index 0a2e879ea7..a8c4683ac4 100644
--- a/plugins/vfspk3/SortedFilenames.h
+++ b/plugins/vfspk3/SortedFilenames.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <boost/filesystem.hpp>
-
 /**
  * greebo: SortedFilenames is based on a std::set
  *         container with special sorting.
diff --git a/radiant/log/PIDFile.h b/radiant/log/PIDFile.h
index 6d68675e0d..30e697077a 100644
--- a/radiant/log/PIDFile.h
+++ b/radiant/log/PIDFile.h
@@ -1,11 +1,10 @@
-#ifndef _PID_FILE_H_
-#define _PID_FILE_H_
+#pragma once
 
 #include "wxutil/dialog/MessageBox.h"
 #include "settings/PreferenceSystem.h"
 #include "modulesystem/ModuleRegistry.h"
 
-#include <boost/filesystem.hpp>
+#include "os/file.h"
 #include <boost/algorithm/string/replace.hpp>
 
 #define PID_FILENAME "darkradiant.pid"
@@ -37,7 +36,7 @@ class PIDFile
 			removePIDFile();
 
 #ifndef _DEBUG
-			boost::filesystem::path path = registry.getApplicationContext().getSettingsPath();
+			fs::path path = registry.getApplicationContext().getSettingsPath();
 			path /= "darkradiant.log";
 			std::string logPath = path.string();
 			boost::algorithm::replace_all(logPath, "\\\\", "\\");
@@ -77,5 +76,3 @@ class PIDFile
 };
 
 } // namespace applog
-
-#endif /* _PID_FILE_H_ */
diff --git a/radiant/map/MapResource.cpp b/radiant/map/MapResource.cpp
index 0e4144f033..d467bd57b9 100644
--- a/radiant/map/MapResource.cpp
+++ b/radiant/map/MapResource.cpp
@@ -28,7 +28,6 @@
 
 #include <functional>
 #include <boost/format.hpp>
-#include <boost/filesystem.hpp>
 
 #include "infofile/InfoFile.h"
 #include "string/string.h"
diff --git a/radiant/map/StartupMapLoader.cpp b/radiant/map/StartupMapLoader.cpp
index dc82f0b477..b6b713cbce 100644
--- a/radiant/map/StartupMapLoader.cpp
+++ b/radiant/map/StartupMapLoader.cpp
@@ -11,7 +11,6 @@
 
 #include "os/path.h"
 #include "os/file.h"
-#include <boost/filesystem.hpp>
 
 namespace map 
 {
@@ -47,9 +46,9 @@ void StartupMapLoader::onRadiantStartup()
 			break;
 		}
 
-		boost::filesystem::path mapsPath = GlobalRegistry().get(RKEY_MAP_PATH);
+		fs::path mapsPath = GlobalRegistry().get(RKEY_MAP_PATH);
 
-		boost::filesystem::path fullMapPath = mapsPath / candidate;
+		fs::path fullMapPath = mapsPath / candidate;
 
 		// Next, look in the regular maps path
 		if (os::fileOrDirExists(fullMapPath.string()))
@@ -57,15 +56,6 @@ void StartupMapLoader::onRadiantStartup()
 			mapToLoad = fullMapPath.string();
 			break;
 		}
-
-		// Check for mod-relative paths too
-		fullMapPath = mapsPath.remove_leaf().remove_leaf() / candidate;
-
-		if (os::fileOrDirExists(fullMapPath.string()))
-		{
-			mapToLoad = fullMapPath.string();
-			break;
-		}
 	}
 
 	if (!mapToLoad.empty())
diff --git a/radiant/model/ScaledModelExporter.cpp b/radiant/model/ScaledModelExporter.cpp
index 91d4de3f8e..1a5d29cb21 100644
--- a/radiant/model/ScaledModelExporter.cpp
+++ b/radiant/model/ScaledModelExporter.cpp
@@ -8,7 +8,6 @@
 #include "iscenegraph.h"
 #include "os/fs.h"
 #include "os/path.h"
-#include <boost/filesystem.hpp>
 #include <boost/format.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <regex>
diff --git a/radiant/modulesystem/ApplicationContextImpl.cpp b/radiant/modulesystem/ApplicationContextImpl.cpp
index 038bbcefde..760df42e33 100644
--- a/radiant/modulesystem/ApplicationContextImpl.cpp
+++ b/radiant/modulesystem/ApplicationContextImpl.cpp
@@ -5,13 +5,13 @@
 #include "debugging/debugging.h"
 #include "itextstream.h"
 #include "iregistry.h"
+#include "os/fs.h"
 #include "os/path.h"
 #include "os/dir.h"
 #include "log/PopupErrorHandler.h"
 #include "log/LogStream.h"
 
 #include <boost/algorithm/string/predicate.hpp>
-#include <boost/filesystem.hpp>
 
 #if defined(WIN32)
 #include <windows.h>
@@ -110,8 +110,8 @@ std::string getExecutablePath(char* argv[])
     if (ret > 0)
     {
         // Success
-        boost::filesystem::path execPath = std::string(pathBuf);
-        boost::filesystem::path appPath = execPath.remove_leaf();
+        fs::path execPath = std::string(pathBuf);
+        fs::path appPath = execPath.remove_leaf();
 
         rConsole() << "Application path: " << appPath << std::endl;