diff --git a/core/msvc8/sourcemod_mm.vcproj b/core/msvc8/sourcemod_mm.vcproj
index f2f0ef45..b40d716c 100644
--- a/core/msvc8/sourcemod_mm.vcproj
+++ b/core/msvc8/sourcemod_mm.vcproj
@@ -294,7 +294,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\sm_platform.h"
+				RelativePath="..\..\public\sm_platform.h"
 				>
 			</File>
 			<File
@@ -326,15 +326,43 @@
 			Name="Interfaces"
 			>
 			<File
-				RelativePath="..\interfaces\IRootConsoleMenu.h"
+				RelativePath="..\..\public\IExtensionSys.h"
 				>
 			</File>
 			<File
-				RelativePath="..\interfaces\ISourceMod.h"
+				RelativePath="..\..\public\IForwardSys.h"
 				>
 			</File>
 			<File
-				RelativePath="..\interfaces\ITextParsers.h"
+				RelativePath="..\..\public\IHandleSys.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\public\ILibrarySys.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\public\IPluginFunction.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\public\IPluginSys.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\public\IRootConsoleMenu.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\public\IShareSys.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\public\ISourceMod.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\public\ITextParsers.h"
 				>
 			</File>
 		</Filter>
@@ -413,38 +441,6 @@
 					>
 				</File>
 			</Filter>
-			<Filter
-				Name="Interfaces"
-				>
-				<File
-					RelativePath="..\interfaces\IExtensionSys.h"
-					>
-				</File>
-				<File
-					RelativePath="..\interfaces\IForwardSys.h"
-					>
-				</File>
-				<File
-					RelativePath="..\interfaces\IHandleSys.h"
-					>
-				</File>
-				<File
-					RelativePath="..\interfaces\ILibrarySys.h"
-					>
-				</File>
-				<File
-					RelativePath="..\interfaces\IPluginFunction.h"
-					>
-				</File>
-				<File
-					RelativePath="..\interfaces\IPluginSys.h"
-					>
-				</File>
-				<File
-					RelativePath="..\interfaces\IShareSys.h"
-					>
-				</File>
-			</Filter>
 		</Filter>
 		<Filter
 			Name="SourcePawn"
diff --git a/core/sm_platform.h b/core/sm_platform.h
deleted file mode 100644
index 05171cd8..00000000
--- a/core/sm_platform.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef _INCLUDE_SOURCEMOD_PLATFORM_H_
-#define _INCLUDE_SOURCEMOD_PLATFORM_H_
-
-/**
- * @file Contains platform-specific macros for abstraction.
- */
-
-#if defined WIN32 || defined WIN64
-#define PLATFORM_WINDOWS
-#if !defined WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#if !defined snprintf
-#define snprintf _snprintf
-#endif
-#if !defined stat
-#define stat _stat
-#endif
-#define strcasecmp strcmpi
-#include <windows.h>
-#include <direct.h>
-#define PLATFORM_LIB_EXT		"dll"
-#define PLATFORM_MAX_PATH		MAX_PATH
-#define PLATFORM_SEP_CHAR		'\\'
-#define PLATFORM_SEP_ALTCHAR	'/'
-#define PLATFORM_EXTERN_C		extern "C" __declspec(dllexport)
-#else if defined __linux__
-#define PLATFORM_LINUX
-#define PLATFORM_POSIX
-#include <dirent.h>
-#include <errno.h>
-#define PLATFORM_MAX_PATH		PATH_MAX
-#define PLATFORM_LIB_EXT		"so"
-#define PLATFORM_SEP_CHAR		'/'
-#define PLATFORM_SEP_ALTCHAR	'\\'
-#define PLATFORM_EXTERN_C		extern "C" __attribute__((visibility("default")))
-#endif
-
-#endif //_INCLUDE_SOURCEMOD_PLATFORM_H_
diff --git a/extensions/threader/thread/IThreader.h b/public/extensions/IThreader.h
similarity index 100%
rename from extensions/threader/thread/IThreader.h
rename to public/extensions/IThreader.h