diff --git a/platform/Windows/eduke32.vcxproj b/platform/Windows/eduke32.vcxproj
index 622454ea8..8f164a390 100644
--- a/platform/Windows/eduke32.vcxproj
+++ b/platform/Windows/eduke32.vcxproj
@@ -107,6 +107,7 @@
     <ClInclude Include="..\..\source\build\include\fix16.hpp" />
     <ClInclude Include="..\..\source\build\include\fix16_int64.h" />
     <ClInclude Include="..\..\source\build\include\glbuild.h" />
+    <ClInclude Include="..\..\source\build\include\glsurface.h" />
     <ClInclude Include="..\..\source\build\include\gtkbits.h" />
     <ClInclude Include="..\..\source\build\include\hash.h" />
     <ClInclude Include="..\..\source\build\include\hightile.h" />
@@ -142,6 +143,7 @@
     <ClInclude Include="..\..\source\build\include\sdl_inc.h" />
     <ClInclude Include="..\..\source\build\include\startwin.editor.h" />
     <ClInclude Include="..\..\source\build\include\texcache.h" />
+    <ClInclude Include="..\..\source\build\include\tilepacker.h" />
     <ClInclude Include="..\..\source\build\include\tracker.hpp" />
     <ClInclude Include="..\..\source\build\include\tracker_operator.hpp" />
     <ClInclude Include="..\..\source\build\include\tracker_operators.hpp" />
@@ -269,6 +271,7 @@
     <ClCompile Include="..\..\source\build\src\fix16.c" />
     <ClCompile Include="..\..\source\build\src\fix16_str.c" />
     <ClCompile Include="..\..\source\build\src\glbuild.cpp" />
+    <ClCompile Include="..\..\source\build\src\glsurface.cpp" />
     <ClCompile Include="..\..\source\build\src\gtkbits.cpp" />
     <ClCompile Include="..\..\source\build\src\hash.cpp" />
     <ClCompile Include="..\..\source\build\src\hightile.cpp" />
@@ -301,6 +304,7 @@
     <ClCompile Include="..\..\source\build\src\startwin.editor.cpp" />
     <ClCompile Include="..\..\source\build\src\texcache.cpp" />
     <ClCompile Include="..\..\source\build\src\textfont.cpp" />
+    <ClCompile Include="..\..\source\build\src\tilepacker.cpp" />
     <ClCompile Include="..\..\source\build\src\tiles.cpp" />
     <ClCompile Include="..\..\source\build\src\voxmodel.cpp" />
     <ClCompile Include="..\..\source\build\src\wiibits.cpp" />
diff --git a/platform/Windows/eduke32.vcxproj.filters b/platform/Windows/eduke32.vcxproj.filters
index af45d9a35..6b4645bc8 100644
--- a/platform/Windows/eduke32.vcxproj.filters
+++ b/platform/Windows/eduke32.vcxproj.filters
@@ -573,6 +573,12 @@
     <ClInclude Include="..\..\source\build\include\fix16_int64.h">
       <Filter>build\headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\source\build\include\glsurface.h">
+      <Filter>build\headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\tilepacker.h">
+      <Filter>build\headers</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\source\build\src\a-c.cpp">
@@ -1019,6 +1025,12 @@
     <ClCompile Include="..\..\source\audiolib\src\xmp.cpp">
       <Filter>audiolib\source</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\source\build\src\glsurface.cpp">
+      <Filter>build\source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\tilepacker.cpp">
+      <Filter>build\source</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="msvc.mak">
diff --git a/platform/Windows/msvc.mak b/platform/Windows/msvc.mak
index e4075d5f9..2b78ccc86 100644
--- a/platform/Windows/msvc.mak
+++ b/platform/Windows/msvc.mak
@@ -161,6 +161,7 @@ ENGINE_OBJS= \
 	$(ENGINE_OBJ)\hash.$o \
 	$(ENGINE_OBJ)\palette.$o \
         $(ENGINE_OBJ)\glbuild.$o \
+	$(ENGINE_OBJ)\glsurface.$o \
         $(ENGINE_OBJ)\texcache.$o \
         $(ENGINE_OBJ)\kplib.$o \
         $(ENGINE_OBJ)\hightile.$o \
@@ -168,6 +169,7 @@ ENGINE_OBJS= \
         $(ENGINE_OBJ)\polymer.$o \
         $(ENGINE_OBJ)\mdsprite.$o \
         $(ENGINE_OBJ)\voxmodel.$o \
+	$(ENGINE_OBJ)\tilepacker.$o \
 	$(ENGINE_OBJ)\dxtfilter.$o \
 	$(ENGINE_OBJ)\textfont.$o \
 	$(ENGINE_OBJ)\smalltextfont.$o \
diff --git a/source/build/Dependencies.mak b/source/build/Dependencies.mak
index a2f7fb874..6e7f8bc4c 100644
--- a/source/build/Dependencies.mak
+++ b/source/build/Dependencies.mak
@@ -21,6 +21,7 @@ $(ENGINE_OBJ)/mhk.$o: $(ENGINE_SRC)/mhk.cpp
 $(ENGINE_OBJ)/palette.$o: $(ENGINE_SRC)/palette.cpp $(ENGINE_INC)/palette.h
 $(ENGINE_OBJ)/polymost.$o: $(ENGINE_SRC)/polymost.cpp $(ENGINE_INC)/lz4.h $(ENGINE_INC)/compat.h $(ENGINE_INC)/build.h $(ENGINE_INC)/buildtypes.h $(ENGINE_SRC)/engine_priv.h $(ENGINE_INC)/polymost.h $(ENGINE_INC)/hightile.h $(ENGINE_INC)/mdsprite.h $(ENGINE_INC)/texcache.h
 $(ENGINE_OBJ)/texcache.$o: $(ENGINE_SRC)/texcache.cpp $(ENGINE_INC)/texcache.h $(ENGINE_INC)/polymost.h $(ENGINE_INC)/dxtfilter.h $(ENGINE_INC)/kplib.h
+$(ENGINE_OBJ)/tilepacker.$o: $(ENGINE_SRC)/tilepacker.cpp  $(ENGINE_INC)/compat.h $(ENGINE_INC)/build.h $(ENGINE_INC)/tilepacker.h
 $(ENGINE_OBJ)/dxtfilter.$o: $(ENGINE_SRC)/dxtfilter.cpp $(ENGINE_INC)/dxtfilter.h $(ENGINE_INC)/texcache.h
 $(ENGINE_OBJ)/hightile.$o: $(ENGINE_SRC)/hightile.cpp $(ENGINE_INC)/kplib.h $(ENGINE_INC)/hightile.h
 $(ENGINE_OBJ)/voxmodel.$o: $(ENGINE_SRC)/voxmodel.cpp $(ENGINE_SRC)/engine_priv.h $(ENGINE_INC)/polymost.h $(ENGINE_INC)/hightile.h $(ENGINE_INC)/mdsprite.h $(ENGINE_INC)/texcache.h
@@ -28,6 +29,7 @@ $(ENGINE_OBJ)/mdsprite.$o: $(ENGINE_SRC)/mdsprite.cpp $(ENGINE_SRC)/engine_priv.
 $(ENGINE_OBJ)/textfont.$o: $(ENGINE_SRC)/textfont.cpp
 $(ENGINE_OBJ)/smalltextfont.$o: $(ENGINE_SRC)/smalltextfont.cpp
 $(ENGINE_OBJ)/glbuild.$o: $(ENGINE_SRC)/glbuild.cpp $(ENGINE_INC)/glbuild.h $(ENGINE_INC)/baselayer.h $(GLAD_INC)/glad/glad.h
+$(ENGINE_OBJ)/glsurface.$o: $(ENGINE_SRC)/glsurface.cpp $(ENGINE_INC)/compat.h $(ENGINE_INC)/palette.h $(ENGINE_INC)/glsurface.h $(GLAD_INC)/glad/glad.h $(ENGINE_INC)/baselayer.h $(ENGINE_INC)/build.h
 $(ENGINE_OBJ)/kplib.$o: $(ENGINE_SRC)/kplib.cpp $(ENGINE_INC)/compat.h $(ENGINE_INC)/kplib.h
 $(ENGINE_OBJ)/md4.$o: $(ENGINE_SRC)/md4.cpp $(ENGINE_INC)/md4.h
 $(ENGINE_OBJ)/lz4.$o: $(ENGINE_SRC)/lz4.c $(ENGINE_INC)/lz4.h