10 files changed, 23 insertions, 7 deletions
diff --git a/NorthstarDLL/NorthstarDLL.vcxproj b/NorthstarDLL/NorthstarDLL.vcxproj
index 7a57fce9..e9f8eb57 100644
--- a/NorthstarDLL/NorthstarDLL.vcxproj
+++ b/NorthstarDLL/NorthstarDLL.vcxproj
@@ -406,6 +406,7 @@
     <ClInclude Include="core\math\vector.h" />
     <ClInclude Include="core\memalloc.h" />
     <ClInclude Include="core\memory.h" />
+    <ClInclude Include="core\sourceinterface.h" />
     <ClInclude Include="core\structs.h" />
     <ClInclude Include="core\tier0.h" />
     <ClInclude Include="dedicated\dedicated.h" />
@@ -436,6 +437,8 @@
     <ClInclude Include="server\serverchathooks.h" />
     <ClInclude Include="server\serverpresence.h" />
     <ClInclude Include="shared\keyvalues.h" />
+    <ClInclude Include="shared\maxplayers.h" />
+    <ClInclude Include="shared\misccommands.h" />
     <ClInclude Include="shared\playlist.h" />
     <ClInclude Include="squirrel\squirrel.h" />
     <ClInclude Include="squirrel\squirrelautobind.h" />
@@ -471,6 +474,7 @@
     <ClCompile Include="core\math\color.cpp" />
     <ClCompile Include="core\memalloc.cpp" />
     <ClCompile Include="core\memory.cpp" />
+    <ClCompile Include="core\sourceinterface.cpp" />
     <ClCompile Include="core\tier0.cpp" />
     <ClCompile Include="dedicated\dedicated.cpp" />
     <ClCompile Include="dedicated\dedicatedmaterialsystem.cpp" />
diff --git a/NorthstarDLL/NorthstarDLL.vcxproj.filters b/NorthstarDLL/NorthstarDLL.vcxproj.filters
index 5eb2d429..cb86a077 100644
--- a/NorthstarDLL/NorthstarDLL.vcxproj.filters
+++ b/NorthstarDLL/NorthstarDLL.vcxproj.filters
@@ -1161,6 +1161,15 @@
     <ClInclude Include="scripts\scripthttprequesthandler.h">
       <Filter>Header Files\scripts</Filter>
     </ClInclude>
+    <ClInclude Include="shared\maxplayers.h">
+      <Filter>Header Files\shared</Filter>
+    </ClInclude>
+    <ClInclude Include="shared\misccommands.h">
+      <Filter>Header Files\shared</Filter>
+    </ClInclude>
+    <ClInclude Include="core\sourceinterface.h">
+      <Filter>Header Files\core</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\include\spdlog\fmt\bundled\LICENSE.rst">
@@ -1396,6 +1405,9 @@
     <ClCompile Include="scripts\scripthttprequesthandler.cpp">
       <Filter>Source Files\scripts</Filter>
     </ClCompile>
+    <ClCompile Include="core\sourceinterface.cpp">
+      <Filter>Source Files\core</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <MASM Include="audio_asm.asm">
diff --git a/NorthstarDLL/core/convar/convar.cpp b/NorthstarDLL/core/convar/convar.cpp
index eaa988dc..5ff0e4c1 100644
--- a/NorthstarDLL/core/convar/convar.cpp
+++ b/NorthstarDLL/core/convar/convar.cpp
@@ -2,7 +2,7 @@
 #include "bits.h"
 #include "cvar.h"
 #include "convar.h"
-#include "shared/sourceinterface.h"
+#include "core/sourceinterface.h"
 
 #include <float.h>
 
diff --git a/NorthstarDLL/core/convar/convar.h b/NorthstarDLL/core/convar/convar.h
index 86ec64e6..edc6ac97 100644
--- a/NorthstarDLL/core/convar/convar.h
+++ b/NorthstarDLL/core/convar/convar.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "shared/sourceinterface.h"
+#include "core/sourceinterface.h"
 #include "core/math/color.h"
 #include "cvar.h"
 #include "concommand.h"
diff --git a/NorthstarDLL/core/filesystem/filesystem.cpp b/NorthstarDLL/core/filesystem/filesystem.cpp
index 230c9161..ac42d00f 100644
--- a/NorthstarDLL/core/filesystem/filesystem.cpp
+++ b/NorthstarDLL/core/filesystem/filesystem.cpp
@@ -1,6 +1,6 @@
 #include "pch.h"
 #include "filesystem.h"
-#include "shared/sourceinterface.h"
+#include "core/sourceinterface.h"
 #include "mods/modmanager.h"
 
 #include <iostream>
diff --git a/NorthstarDLL/core/filesystem/filesystem.h b/NorthstarDLL/core/filesystem/filesystem.h
index 8739d342..560b8c2c 100644
--- a/NorthstarDLL/core/filesystem/filesystem.h
+++ b/NorthstarDLL/core/filesystem/filesystem.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "shared/sourceinterface.h"
+#include "core/sourceinterface.h"
 
 // taken from ttf2sdk
 typedef void* FileHandle_t;
diff --git a/NorthstarDLL/shared/sourceinterface.cpp b/NorthstarDLL/core/sourceinterface.cpp
index ed95de50..f9ad694c 100644
--- a/NorthstarDLL/shared/sourceinterface.cpp
+++ b/NorthstarDLL/core/sourceinterface.cpp
@@ -1,6 +1,6 @@
 #include "pch.h"
 #include "sourceinterface.h"
-#include "console/sourceconsole.h"
+#include "logging/sourceconsole.h"
 
 AUTOHOOK_INIT()
 
diff --git a/NorthstarDLL/shared/sourceinterface.h b/NorthstarDLL/core/sourceinterface.h
index 474e961b..474e961b 100644
--- a/NorthstarDLL/shared/sourceinterface.h
+++ b/NorthstarDLL/core/sourceinterface.h
diff --git a/NorthstarDLL/logging/sourceconsole.cpp b/NorthstarDLL/logging/sourceconsole.cpp
index 62b41e1a..775caa49 100644
--- a/NorthstarDLL/logging/sourceconsole.cpp
+++ b/NorthstarDLL/logging/sourceconsole.cpp
@@ -1,7 +1,7 @@
 #include "pch.h"
 #include "core/convar/convar.h"
 #include "sourceconsole.h"
-#include "shared/sourceinterface.h"
+#include "core/sourceinterface.h"
 #include "core/convar/concommand.h"
 #include "util/printcommands.h"
 
diff --git a/NorthstarDLL/logging/sourceconsole.h b/NorthstarDLL/logging/sourceconsole.h
index 00498054..cf7027df 100644
--- a/NorthstarDLL/logging/sourceconsole.h
+++ b/NorthstarDLL/logging/sourceconsole.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "pch.h"
-#include "shared/sourceinterface.h"
+#include "core/sourceinterface.h"
 #include "spdlog/sinks/base_sink.h"
 #include <map>