diff --git a/dlls/geoip/AMBuilder b/dlls/geoip/AMBuilder
index ea606dad..4d0bc7b7 100644
--- a/dlls/geoip/AMBuilder
+++ b/dlls/geoip/AMBuilder
@@ -3,13 +3,17 @@ import os.path
 
 binary = AMXX.MetaModule(builder, 'geoip')
 
+binary.compiler.cxxincludes += [
+  os.path.join(builder.currentSourcePath, '..', '..', 'third_party', 'libmaxminddb')
+]
+
 binary.compiler.defines += [
   'HAVE_STDINT_H'
 ]
 
 binary.sources = [
   '../../public/sdk/amxxmodule.cpp',
-  'GeoIP2/maxminddb.c',
+  '../../third_party/libmaxminddb/maxminddb.c',
   'geoip_main.cpp',
   'geoip_natives.cpp',
   'geoip_util.cpp',
@@ -20,6 +24,5 @@ if builder.target_platform == 'windows':
     
 if builder.target_platform == 'windows':
   binary.compiler.postlink += ['ws2_32.lib']
-  binary.compiler.includes += [os.path.join(builder.sourcePath, 'dlls', 'geoip', 'GeoIP2')]
 
 AMXX.modules += [builder.Add(binary)]
diff --git a/dlls/geoip/Makefile b/dlls/geoip/Makefile
index 2decbcb3..69655260 100755
--- a/dlls/geoip/Makefile
+++ b/dlls/geoip/Makefile
@@ -8,6 +8,8 @@
 HLSDK = ../../../hlsdk
 MM_ROOT = ../../../metamod/metamod
 PUBLIC_ROOT = ../../public
+THIRD_PARTY = $(PUBLIC_ROOT)/third_party
+GEOIP = $(THIRD_PARTY)/libmaxminddb
 
 #####################################
 ### EDIT BELOW FOR OTHER PROJECTS ###
@@ -15,7 +17,7 @@ PUBLIC_ROOT = ../../public
 
 PROJECT = geoip
 
-OBJECTS = amxxmodule.cpp GeoIP2/maxminddb.c geoip_main.cpp geoip_natives.cpp geoip_util.cpp
+OBJECTS = amxxmodule.cpp $(GEOIP)/maxminddb.c geoip_main.cpp geoip_natives.cpp geoip_util.cpp
 
 ##############################################
 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
diff --git a/dlls/geoip/geoip_main.h b/dlls/geoip/geoip_main.h
index 6d9f58fb..c9dc46a1 100644
--- a/dlls/geoip/geoip_main.h
+++ b/dlls/geoip/geoip_main.h
@@ -14,7 +14,7 @@
 #ifndef _INCLUDE_GEOIPMAIN_H
 #define _INCLUDE_GEOIPMAIN_H
 
-#include "GeoIP2/maxminddb.h"
+#include "maxminddb.h"
 #include "amxxmodule.h"
 
 bool loadDatabase();
diff --git a/dlls/geoip/msvc12/geoip.vcxproj b/dlls/geoip/msvc12/geoip.vcxproj
index ab8ec0a8..cf2d7be6 100644
--- a/dlls/geoip/msvc12/geoip.vcxproj
+++ b/dlls/geoip/msvc12/geoip.vcxproj
@@ -54,7 +54,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\;..\sdk;..\..\..\public;..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;..\..\..\public\sdk;..\GeoIP2;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\sdk;..\..\..\public;..\..\..\public\amtl\include;..\..\..\third_party\libmaxminddb;..\..\third_party\hashing;..\..\..\public\sdk;..\GeoIP2;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GEOIP_EXPORTS;HAVE_STDINT_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -78,7 +78,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\;..\sdk;..\..\..\public;..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;..\..\..\public\sdk;..\GeoIP2;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\sdk;..\..\..\public;..\..\..\public\amtl\include;..\..\..\third_party\libmaxminddb;..\..\third_party\hashing;..\..\..\public\sdk;..\GeoIP2;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GEOIP_EXPORTS;HAVE_STDINT_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
@@ -98,16 +98,16 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\GeoIP2\maxminddb.c" />
+    <ClCompile Include="..\..\..\third_party\libmaxminddb\maxminddb.c" />
     <ClCompile Include="..\geoip_main.cpp" />
     <ClCompile Include="..\geoip_natives.cpp" />
     <ClCompile Include="..\geoip_util.cpp" />
     <ClCompile Include="..\..\..\public\sdk\amxxmodule.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\GeoIP2\maxminddb-compat-util.h" />
-    <ClInclude Include="..\GeoIP2\maxminddb.h" />
-    <ClInclude Include="..\GeoIP2\maxminddb_config.h" />
+    <ClInclude Include="..\..\..\third_party\libmaxminddb\maxminddb-compat-util.h" />
+    <ClInclude Include="..\..\..\third_party\libmaxminddb\maxminddb.h" />
+    <ClInclude Include="..\..\..\third_party\libmaxminddb\maxminddb_config.h" />
     <ClInclude Include="..\geoip_main.h" />
     <ClInclude Include="..\geoip_natives.h" />
     <ClInclude Include="..\geoip_util.h" />
diff --git a/dlls/geoip/msvc12/geoip.vcxproj.filters b/dlls/geoip/msvc12/geoip.vcxproj.filters
index 55581204..ee2e53ea 100644
--- a/dlls/geoip/msvc12/geoip.vcxproj.filters
+++ b/dlls/geoip/msvc12/geoip.vcxproj.filters
@@ -35,20 +35,11 @@
     <ClCompile Include="..\..\..\public\sdk\amxxmodule.cpp">
       <Filter>Module SDK\SDK Base</Filter>
     </ClCompile>
-    <ClCompile Include="..\GeoIP2\maxminddb.c">
+    <ClCompile Include="..\..\..\third_party\libmaxminddb\maxminddb.c">
       <Filter>GeoIP2</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\GeoIP2\maxminddb.h">
-      <Filter>GeoIP2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\GeoIP2\maxminddb_config.h">
-      <Filter>GeoIP2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\GeoIP2\maxminddb-compat-util.h">
-      <Filter>GeoIP2</Filter>
-    </ClInclude>
     <ClInclude Include="..\geoip_util.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -64,6 +55,15 @@
     <ClInclude Include="..\..\..\public\sdk\amxxmodule.h">
       <Filter>Module SDK\SDK Base</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\third_party\libmaxminddb\maxminddb.h">
+      <Filter>GeoIP2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\third_party\libmaxminddb\maxminddb_config.h">
+      <Filter>GeoIP2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\third_party\libmaxminddb\maxminddb-compat-util.h">
+      <Filter>GeoIP2</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\plugins\include\geoip.inc">
diff --git a/dlls/sqlite/AMBuilder b/dlls/sqlite/AMBuilder
index f1172888..71af9f55 100644
--- a/dlls/sqlite/AMBuilder
+++ b/dlls/sqlite/AMBuilder
@@ -5,7 +5,7 @@ binary = AMXX.MetaModule(builder, 'sqlite')
 binary.compiler.cxxincludes += [
   os.path.join(builder.currentSourcePath, 'sqlitepp'),
   os.path.join(builder.currentSourcePath, 'thread'),
-  os.path.join(builder.currentSourcePath, 'sqlite-source'),
+  os.path.join(builder.currentSourcePath, '..', '..', 'third_party', 'sqlite'),
 ]
 binary.compiler.defines += [
   'SM_DEFAULT_THREADER',
@@ -29,7 +29,7 @@ binary.sources += [
   'sqlitepp/SqliteResultSet.cpp',
   'sqlitepp/SqliteDatabase.cpp',
   'sqlitepp/SqliteDriver.cpp',
-  'sqlite-source/sqlite3.c',
+  '../../third_party/sqlite/sqlite3.c',
 ]
 
 if builder.target_platform == 'windows':
diff --git a/dlls/sqlite/Makefile b/dlls/sqlite/Makefile
index eb5a1b11..95c6b56d 100755
--- a/dlls/sqlite/Makefile
+++ b/dlls/sqlite/Makefile
@@ -8,7 +8,8 @@
 HLSDK = ../../../hlsdk
 MM_ROOT = ../../../metamod/metamod
 PUBLIC_ROOT = ../../public
-SQL = sqlite-source
+THIRD_PARTY = $(PUBLIC_ROOT)/third_party
+SQL = $(THIRD_PARTY)/sqlite
 
 #####################################
 ### EDIT BELOW FOR OTHER PROJECTS ###
diff --git a/dlls/sqlite/msvc12/sqlite.vcxproj b/dlls/sqlite/msvc12/sqlite.vcxproj
index b9e04458..2f62fbc7 100644
--- a/dlls/sqlite/msvc12/sqlite.vcxproj
+++ b/dlls/sqlite/msvc12/sqlite.vcxproj
@@ -55,7 +55,7 @@
     <ClCompile>
       <AdditionalOptions>/D "NO_TCL" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;..\sqlite-source;..\sqlitepp;..\thread;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;..\..\..\third_party\sqlite;..\sqlitepp;..\thread;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;sqlite_EXPORTS;SM_DEFAULT_THREADER;HAVE_STDINT_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -85,7 +85,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;..\sqlite-source;..\sqlitepp;..\thread;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\..\public;..\..\..\public\sdk; ..\..\..\public\amtl\include;..\..\third_party;..\..\third_party\hashing;..\..\..\third_party\sqlite;..\sqlitepp;..\thread;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;sqlite_EXPORTS;SM_DEFAULT_THREADER;HAVE_STDINT_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -111,7 +111,7 @@
     <ClCompile Include="..\handles.cpp" />
     <ClCompile Include="..\module.cpp" />
     <ClCompile Include="..\oldcompat_sql.cpp" />
-    <ClCompile Include="..\sqlite-source\sqlite3.c" />
+    <ClCompile Include="..\..\..\third_party\sqlite\sqlite3.c" />
     <ClCompile Include="..\threading.cpp" />
     <ClCompile Include="..\sqlitepp\SqliteDatabase.cpp" />
     <ClCompile Include="..\sqlitepp\SqliteDriver.cpp" />
@@ -124,7 +124,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\sqlheaders.h" />
-    <ClInclude Include="..\sqlite-source\sqlite3.h" />
+    <ClInclude Include="..\..\..\third_party\sqlite\sqlite3.h" />
     <ClInclude Include="..\sqlite_header.h" />
     <ClInclude Include="..\threading.h" />
     <ClInclude Include="..\sqlitepp\ISQLDriver.h" />