diff --git a/library/APIPrivate.cpp b/library/APIPrivate.cpp
index f7c6ff221..768f5bd9e 100644
--- a/library/APIPrivate.cpp
+++ b/library/APIPrivate.cpp
@@ -7,16 +7,16 @@
 #include "dfhack/DFMemInfo.h"
 #include "dfhack/DFProcess.h"
 
-#include "modules/Materials.h"
-#include "modules/Creatures.h"
-#include "modules/Maps.h"
-#include "modules/Position.h"
-#include "modules/Translation.h"
-#include "modules/Vegetation.h"
-#include "modules/Gui.h"
-#include "modules/World.h"
-#include "modules/Buildings.h"
-#include "modules/Constructions.h"
+#include "dfhack/modules/Materials.h"
+#include "dfhack/modules/Creatures.h"
+#include "dfhack/modules/Maps.h"
+#include "dfhack/modules/Position.h"
+#include "dfhack/modules/Translation.h"
+#include "dfhack/modules/Vegetation.h"
+#include "dfhack/modules/Gui.h"
+#include "dfhack/modules/World.h"
+#include "dfhack/modules/Buildings.h"
+#include "dfhack/modules/Constructions.h"
 
 using namespace DFHack;
 
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 7c7460dac..4061c703c 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -64,7 +64,7 @@ SET(PROJECT_HDRS_LINUX
 )
 
 SET(PROJECT_HDRS_WINDOWS
-include/stdint_win.h
+include/dfhack/DFstdint_win.h
 )
 
 SET(PROJECT_SRCS_LINUX
@@ -133,19 +133,60 @@ IF(UNIX)
   install(FILES ${CMAKE_SOURCE_DIR}/output/Memory.xml DESTINATION share/dfhack)
 ENDIF(UNIX)
 
-# SWIG stuff is dead
-# FIND_PACKAGE(SWIG)
-
-#IF(SWIG_FOUND)
-#    INCLUDE(${SWIG_USE_FILE})
-#    FIND_PACKAGE(PythonLibs)
-#    IF(PYTHONLIBS_FOUND)
-#        INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
-#        SET(CMAKE_SWIG_FLAGS "-c++")
-#        SET_SOURCE_FILES_PROPERTIES(pydfhack.i PROPERTIES CPLUSPLUS ON)
-#        SET(CMAKE_DFHACK_SWIG_OUTDIR ${dfhack_SOURCE_DIR}/output CACHE PATH "Directory where Java wrapped libraries will be saved.")
-#        # SET_SOURCE_FILES_PROPERTIES(pydfhack.i PROPERTIES SWIG_FLAGS "-includeall")
-#        SWIG_ADD_MODULE(pydfhack python pydfhack.i)
-#        SWIG_LINK_LIBRARIES(pydfhack ${PYTHON_LIBRARIES} dfhack)
-#    ENDIF(PYTHONLIBS_FOUND)
-#ENDIF(SWIG_FOUND)
+################################################################################
+# DFCONNECT
+###
+
+SET(DFCONNECT_HDRS
+shm/shms.h
+shm/mod-core.h
+shm/mod-maps.h
+)
+
+SET(PROJECT_SRCS
+shm/mod-core.cpp
+shm/mod-maps.cpp
+#mod-creature40d.cpp
+)
+
+SET(PROJECT_HDRS_LINUX
+)
+
+SET(PROJECT_HDRS_WINDOWS
+)
+
+SET(PROJECT_SRCS_LINUX
+shm/shms-linux.cpp
+)
+
+SET(PROJECT_SRCS_WINDOWS
+shm/shms-windows.cpp
+)
+
+IF(UNIX)
+    LIST(APPEND PROJECT_HDRS ${PROJECT_HDRS_LINUX})
+    LIST(APPEND PROJECT_SRCS ${PROJECT_SRCS_LINUX})
+ELSE(UNIX)
+    LIST(APPEND PROJECT_HDRS ${PROJECT_HDRS_WINDOWS})
+    LIST(APPEND PROJECT_SRCS ${PROJECT_SRCS_WINDOWS})
+ENDIF(UNIX)
+
+
+SET_SOURCE_FILES_PROPERTIES( ${PROJECT_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE )
+
+LIST(APPEND PROJECT_SRCS ${PROJECT_HDRS})
+
+#IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
+    IF(UNIX)
+        add_definitions(-DLINUX_BUILD)
+        SET(PROJECT_LIBS rt)
+        SET(CMAKE_CXX_FLAGS "-fvisibility=hidden")
+        ADD_LIBRARY(dfconnect SHARED ${PROJECT_SRCS})
+        TARGET_LINK_LIBRARIES(dfconnect ${PROJECT_LIBS})
+    ELSE(UNIX)
+        #  SET(PROJECT_LIBS psapi)
+        ADD_LIBRARY(SDL SHARED ${PROJECT_SRCS})
+        TARGET_LINK_LIBRARIES(SDL ${PROJECT_LIBS})
+    ENDIF(UNIX)
+#ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 4)
+
diff --git a/library/DFContext.cpp b/library/DFContext.cpp
index 84a08f230..2b339ebed 100644
--- a/library/DFContext.cpp
+++ b/library/DFContext.cpp
@@ -36,17 +36,17 @@ distribution.
 #include <mod-creature40d.h>
 #include "private/APIPrivate.h"
 
-#include "modules/Maps.h"
-#include "modules/Materials.h"
-#include "modules/Items.h"
-#include "modules/Position.h"
-#include "modules/Gui.h"
-#include "modules/World.h"
-#include "modules/Creatures.h"
-#include "modules/Translation.h"
-#include "modules/Vegetation.h"
-#include "modules/Buildings.h"
-#include "modules/Constructions.h"
+#include "dfhack/modules/Maps.h"
+#include "dfhack/modules/Materials.h"
+#include "dfhack/modules/Items.h"
+#include "dfhack/modules/Position.h"
+#include "dfhack/modules/Gui.h"
+#include "dfhack/modules/World.h"
+#include "dfhack/modules/Creatures.h"
+#include "dfhack/modules/Translation.h"
+#include "dfhack/modules/Vegetation.h"
+#include "dfhack/modules/Buildings.h"
+#include "dfhack/modules/Constructions.h"
 
 using namespace DFHack;
 
diff --git a/library/DFProcess-windows-SHM.cpp b/library/DFProcess-windows-SHM.cpp
index c0cc927f4..c86e045a1 100644
--- a/library/DFProcess-windows-SHM.cpp
+++ b/library/DFProcess-windows-SHM.cpp
@@ -21,11 +21,11 @@ must not be misrepresented as being the original software.
 3. This notice may not be removed or altered from any source
 distribution.
 */
-#include "DFCommonInternal.h"
-#include "DFProcess.h"
-#include "DFWindow.h"
-#include "DFMemInfo.h"
-#include "DFError.h"
+#include "dfhack/DFCommonInternal.h"
+#include "dfhack/DFProcess.h"
+#include "dfhack/DFWindow.h"
+#include "dfhack/DFMemInfo.h"
+#include "dfhack/DFError.h"
 #include "shms.h"
 #include "mod-core.h"
 using namespace DFHack;
diff --git a/library/DFProcess-windows.cpp b/library/DFProcess-windows.cpp
index ae0e688ef..a9d4834ed 100644
--- a/library/DFProcess-windows.cpp
+++ b/library/DFProcess-windows.cpp
@@ -21,11 +21,11 @@ must not be misrepresented as being the original software.
 3. This notice may not be removed or altered from any source
 distribution.
 */
-#include "DFCommonInternal.h"
-#include "DFProcess.h"
-#include "DFWindow.h"
-#include "DFMemInfo.h"
-#include "DFError.h"
+#include "dfhack/DFCommonInternal.h"
+#include "dfhack/DFProcess.h"
+#include "dfhack/DFWindow.h"
+#include "dfhack/DFMemInfo.h"
+#include "dfhack/DFError.h"
 using namespace DFHack;
 
 class NormalProcess::Private
diff --git a/library/DFProcessEnumerator-windows.cpp b/library/DFProcessEnumerator-windows.cpp
index 4d078e2e3..27bf78323 100644
--- a/library/DFProcessEnumerator-windows.cpp
+++ b/library/DFProcessEnumerator-windows.cpp
@@ -22,11 +22,11 @@ must not be misrepresented as being the original software.
 distribution.
 */
 
-#include "DFCommonInternal.h"
-#include "DFProcessEnumerator.h"
-#include "DFProcess.h"
-#include "DFMemInfo.h"
-#include "DFMemInfoManager.h"
+#include "dfhack/DFCommonInternal.h"
+#include "dfhack/DFProcessEnumerator.h"
+#include "dfhack/DFProcess.h"
+#include "dfhack/DFMemInfo.h"
+#include "dfhack/DFMemInfoManager.h"
 using namespace DFHack;
 
 class DFHack::ProcessEnumerator::Private
diff --git a/library/DFTypes_C.cpp b/library/DFTypes_C.cpp
index 1ffa69008..8f953e7e4 100644
--- a/library/DFTypes_C.cpp
+++ b/library/DFTypes_C.cpp
@@ -33,7 +33,7 @@ using namespace std;
 #include "dfhack/DFCommonInternal.h"
 #include "dfhack/DFTypes.h"
 #include "dfhack-c/DFTypes_C.h"
-#include "modules/Materials.h"
+#include "dfhack/modules/Materials.h"
 
 using namespace DFHack;
 
diff --git a/library/DFWindow-windows.cpp b/library/DFWindow-windows.cpp
index 78e4ffc62..f7164fa64 100644
--- a/library/DFWindow-windows.cpp
+++ b/library/DFWindow-windows.cpp
@@ -22,9 +22,9 @@ must not be misrepresented as being the original software.
 distribution.
 */
 
-#include "DFCommonInternal.h"
-#include "DFWindow.h"
-#include "DFProcess.h"
+#include "dfhack/DFCommonInternal.h"
+#include "dfhack/DFWindow.h"
+#include "dfhack/DFProcess.h"
 using namespace DFHack;
 
 // should always reflect the enum in DFkeys.h
diff --git a/library/include/DFHack.h b/library/include/DFHack.h
index 5dea35f19..c2dd3f711 100644
--- a/library/include/DFHack.h
+++ b/library/include/DFHack.h
@@ -12,16 +12,16 @@
 #include "dfhack/DFTypes.h"
 
 
-#include "modules/Buildings.h"
-#include "modules/Materials.h"
-#include "modules/Position.h"
-#include "modules/Constructions.h"
-#include "modules/Creatures.h"
-#include "modules/Translation.h"
-#include "modules/World.h"
-#include "modules/Items.h"
-#include "modules/Vegetation.h"
-#include "modules/Maps.h"
+#include "dfhack/modules/Buildings.h"
+#include "dfhack/modules/Materials.h"
+#include "dfhack/modules/Position.h"
+#include "dfhack/modules/Constructions.h"
+#include "dfhack/modules/Creatures.h"
+#include "dfhack/modules/Translation.h"
+#include "dfhack/modules/World.h"
+#include "dfhack/modules/Items.h"
+#include "dfhack/modules/Vegetation.h"
+#include "dfhack/modules/Maps.h"
 
 #include "dfhack/DFMiscUtils.h"
 #endif
\ No newline at end of file
diff --git a/library/include/dfhack-c/DFTypes_C.h b/library/include/dfhack-c/DFTypes_C.h
index 8443f146e..18c8de3b3 100644
--- a/library/include/dfhack-c/DFTypes_C.h
+++ b/library/include/dfhack-c/DFTypes_C.h
@@ -28,7 +28,7 @@ distribution.
 #include "dfhack/DFExport.h"
 #include "dfhack/DFIntegers.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Materials.h"
+#include "dfhack/modules/Materials.h"
 
 using namespace DFHack;
 
diff --git a/library/include/modules/Buildings_C.h b/library/include/dfhack-c/modules/Buildings_C.h
similarity index 97%
rename from library/include/modules/Buildings_C.h
rename to library/include/dfhack-c/modules/Buildings_C.h
index d3c7a67b3..c69da83e0 100644
--- a/library/include/modules/Buildings_C.h
+++ b/library/include/dfhack-c/modules/Buildings_C.h
@@ -28,7 +28,7 @@ distribution.
 #include "dfhack/DFExport.h"
 #include "dfhack/DFIntegers.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Buildings.h"
+#include "dfhack/modules/Buildings.h"
 #include "DFHack_C.h"
 
 using namespace DFHack;
diff --git a/library/include/modules/Constructions_C.h b/library/include/dfhack-c/modules/Constructions_C.h
similarity index 97%
rename from library/include/modules/Constructions_C.h
rename to library/include/dfhack-c/modules/Constructions_C.h
index a859ec13d..c34527b1d 100644
--- a/library/include/modules/Constructions_C.h
+++ b/library/include/dfhack-c/modules/Constructions_C.h
@@ -28,7 +28,7 @@ distribution.
 #include "dfhack/DFExport.h"
 #include "dfhack/DFIntegers.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Constructions.h"
+#include "dfhack/modules/Constructions.h"
 #include "DFHack_C.h"
 
 using namespace DFHack;
diff --git a/library/include/modules/Creatures_C.h b/library/include/dfhack-c/modules/Creatures_C.h
similarity index 96%
rename from library/include/modules/Creatures_C.h
rename to library/include/dfhack-c/modules/Creatures_C.h
index 81948f2db..93502ffe6 100644
--- a/library/include/modules/Creatures_C.h
+++ b/library/include/dfhack-c/modules/Creatures_C.h
@@ -29,8 +29,8 @@ distribution.
 #include "dfhack/DFIntegers.h"
 #include "DFHack_C.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Materials.h"
-#include "modules/Creatures.h"
+#include "dfhack/modules/Materials.h"
+#include "dfhack/modules/Creatures.h"
 
 using namespace DFHack;
 
diff --git a/library/include/modules/Gui_C.h b/library/include/dfhack-c/modules/Gui_C.h
similarity index 100%
rename from library/include/modules/Gui_C.h
rename to library/include/dfhack-c/modules/Gui_C.h
diff --git a/library/include/modules/Items_C.h b/library/include/dfhack-c/modules/Items_C.h
similarity index 97%
rename from library/include/modules/Items_C.h
rename to library/include/dfhack-c/modules/Items_C.h
index 23a1265b7..d2c737e2d 100644
--- a/library/include/modules/Items_C.h
+++ b/library/include/dfhack-c/modules/Items_C.h
@@ -32,7 +32,7 @@ distribution.
 using namespace DFHack;
 
 #include "dfhack/DFTypes.h"
-#include "modules/Items.h"
+#include "dfhack/modules/Items.h"
 #include "DFHack_C.h"
 
 #ifdef __cplusplus
diff --git a/library/include/modules/Maps_C.h b/library/include/dfhack-c/modules/Maps_C.h
similarity index 99%
rename from library/include/modules/Maps_C.h
rename to library/include/dfhack-c/modules/Maps_C.h
index be66a45b2..e37d3640a 100644
--- a/library/include/modules/Maps_C.h
+++ b/library/include/dfhack-c/modules/Maps_C.h
@@ -34,7 +34,7 @@ distribution.
 using namespace std;
 
 #include "dfhack/DFTypes.h"
-#include "modules/Maps.h"
+#include "dfhack/modules/Maps.h"
 #include "DFHack_C.h"
 
 using namespace DFHack;
diff --git a/library/include/modules/Materials_C.h b/library/include/dfhack-c/modules/Materials_C.h
similarity index 98%
rename from library/include/modules/Materials_C.h
rename to library/include/dfhack-c/modules/Materials_C.h
index 0bac48f81..ef56ac627 100644
--- a/library/include/modules/Materials_C.h
+++ b/library/include/dfhack-c/modules/Materials_C.h
@@ -28,7 +28,7 @@ distribution.
 #include "dfhack/DFExport.h"
 #include "dfhack/DFIntegers.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Materials.h"
+#include "dfhack/modules/Materials.h"
 #include "DFHack_C.h"
 #include "dfhack-c/DFTypes_C.h"
 
diff --git a/library/include/modules/Position_C.h b/library/include/dfhack-c/modules/Position_C.h
similarity index 100%
rename from library/include/modules/Position_C.h
rename to library/include/dfhack-c/modules/Position_C.h
diff --git a/library/include/modules/Translation_C.h b/library/include/dfhack-c/modules/Translation_C.h
similarity index 97%
rename from library/include/modules/Translation_C.h
rename to library/include/dfhack-c/modules/Translation_C.h
index 067df25fa..2e1aaf457 100644
--- a/library/include/modules/Translation_C.h
+++ b/library/include/dfhack-c/modules/Translation_C.h
@@ -28,7 +28,7 @@ distribution.
 #include "dfhack/DFExport.h"
 #include "dfhack/DFIntegers.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Translation.h"
+#include "dfhack/modules/Translation.h"
 #include "DFHack_C.h"
 
 using namespace DFHack;
diff --git a/library/include/modules/Vegetation_C.h b/library/include/dfhack-c/modules/Vegetation_C.h
similarity index 97%
rename from library/include/modules/Vegetation_C.h
rename to library/include/dfhack-c/modules/Vegetation_C.h
index 8a3417016..c57c3948a 100644
--- a/library/include/modules/Vegetation_C.h
+++ b/library/include/dfhack-c/modules/Vegetation_C.h
@@ -28,7 +28,7 @@ distribution.
 #include "dfhack/DFExport.h"
 #include "dfhack/DFIntegers.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Vegetation.h"
+#include "dfhack/modules/Vegetation.h"
 #include "DFHack_C.h"
 
 using namespace DFHack;
diff --git a/library/include/dfhack/DFIntegers.h b/library/include/dfhack/DFIntegers.h
index 6cc2396c4..cb745b251 100644
--- a/library/include/dfhack/DFIntegers.h
+++ b/library/include/dfhack/DFIntegers.h
@@ -11,6 +11,6 @@ You can turn off the include by defining SKIP_DFHACK_STDINT
     #ifndef _MSC_VER
         #include <stdint.h>
     #else
-        #include "stdint_win.h"
+        #include "DFstdint_win.h"
     #endif
 #endif
diff --git a/library/include/modules/Buildings.h b/library/include/dfhack/modules/Buildings.h
similarity index 100%
rename from library/include/modules/Buildings.h
rename to library/include/dfhack/modules/Buildings.h
diff --git a/library/include/modules/Constructions.h b/library/include/dfhack/modules/Constructions.h
similarity index 100%
rename from library/include/modules/Constructions.h
rename to library/include/dfhack/modules/Constructions.h
diff --git a/library/include/modules/Creatures.h b/library/include/dfhack/modules/Creatures.h
similarity index 100%
rename from library/include/modules/Creatures.h
rename to library/include/dfhack/modules/Creatures.h
diff --git a/library/include/modules/Gui.h b/library/include/dfhack/modules/Gui.h
similarity index 100%
rename from library/include/modules/Gui.h
rename to library/include/dfhack/modules/Gui.h
diff --git a/library/include/modules/Items.h b/library/include/dfhack/modules/Items.h
similarity index 100%
rename from library/include/modules/Items.h
rename to library/include/dfhack/modules/Items.h
diff --git a/library/include/modules/Maps.h b/library/include/dfhack/modules/Maps.h
similarity index 100%
rename from library/include/modules/Maps.h
rename to library/include/dfhack/modules/Maps.h
diff --git a/library/include/modules/Materials.h b/library/include/dfhack/modules/Materials.h
similarity index 100%
rename from library/include/modules/Materials.h
rename to library/include/dfhack/modules/Materials.h
diff --git a/library/include/modules/Position.h b/library/include/dfhack/modules/Position.h
similarity index 100%
rename from library/include/modules/Position.h
rename to library/include/dfhack/modules/Position.h
diff --git a/library/include/modules/Translation.h b/library/include/dfhack/modules/Translation.h
similarity index 100%
rename from library/include/modules/Translation.h
rename to library/include/dfhack/modules/Translation.h
diff --git a/library/include/modules/Vegetation.h b/library/include/dfhack/modules/Vegetation.h
similarity index 100%
rename from library/include/modules/Vegetation.h
rename to library/include/dfhack/modules/Vegetation.h
diff --git a/library/include/modules/World.h b/library/include/dfhack/modules/World.h
similarity index 100%
rename from library/include/modules/World.h
rename to library/include/dfhack/modules/World.h
diff --git a/library/modules/Buildings.cpp b/library/modules/Buildings.cpp
index 93e72578b..3452ba220 100644
--- a/library/modules/Buildings.cpp
+++ b/library/modules/Buildings.cpp
@@ -24,12 +24,13 @@ distribution.
 
 #include "dfhack/DFCommonInternal.h"
 #include "../private/APIPrivate.h"
-#include "modules/Translation.h"
+
 #include "dfhack/DFMemInfo.h"
 #include "dfhack/DFProcess.h"
 #include "dfhack/DFVector.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Buildings.h"
+//#include "dfhack/modules/Translation.h"
+#include "dfhack/modules/Buildings.h"
 
 using namespace DFHack;
 
diff --git a/library/modules/Buildings_C.cpp b/library/modules/Buildings_C.cpp
index 4136a7e3d..5d0a8fb30 100644
--- a/library/modules/Buildings_C.cpp
+++ b/library/modules/Buildings_C.cpp
@@ -31,8 +31,8 @@ using namespace std;
 
 #include "dfhack/DFCommonInternal.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Buildings.h"
-#include "modules/Buildings_C.h"
+#include "dfhack/modules/Buildings.h"
+#include "dfhack-c/modules/Buildings_C.h"
 
 using namespace DFHack;
 
diff --git a/library/modules/Constructions.cpp b/library/modules/Constructions.cpp
index b8f06583f..ff4230b5b 100644
--- a/library/modules/Constructions.cpp
+++ b/library/modules/Constructions.cpp
@@ -24,12 +24,12 @@ distribution.
 
 #include "dfhack/DFCommonInternal.h"
 #include "../private/APIPrivate.h"
-#include "modules/Translation.h"
+//#include "modules/Translation.h"
 #include "dfhack/DFMemInfo.h"
 #include "dfhack/DFProcess.h"
 #include "dfhack/DFVector.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Constructions.h"
+#include "dfhack/modules/Constructions.h"
 
 using namespace DFHack;
 
diff --git a/library/modules/Constructions_C.cpp b/library/modules/Constructions_C.cpp
index 4adec6844..3fdcca5a4 100644
--- a/library/modules/Constructions_C.cpp
+++ b/library/modules/Constructions_C.cpp
@@ -26,8 +26,8 @@ distribution.
 
 #include "dfhack/DFCommonInternal.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Constructions.h"
-#include "modules/Constructions_C.h"
+#include "dfhack/modules/Constructions.h"
+#include "dfhack-c/modules/Constructions_C.h"
 
 using namespace DFHack;
 
diff --git a/library/modules/Creatures.cpp b/library/modules/Creatures.cpp
index 5e514d063..15b1f6b6b 100644
--- a/library/modules/Creatures.cpp
+++ b/library/modules/Creatures.cpp
@@ -35,8 +35,8 @@ distribution.
 #include <shms.h>
 #include <mod-core.h>
 #include <mod-creature2010.h>
-#include "modules/Materials.h"
-#include "modules/Creatures.h"
+#include "dfhack/modules/Materials.h"
+#include "dfhack/modules/Creatures.h"
 
 
 #define SHMCREATURESHDR ((Creatures2010::shm_creature_hdr *)d->d->shm_start)
diff --git a/library/modules/Creatures_C.cpp b/library/modules/Creatures_C.cpp
index e26198906..1aac93110 100644
--- a/library/modules/Creatures_C.cpp
+++ b/library/modules/Creatures_C.cpp
@@ -31,9 +31,9 @@ distribution.
 using namespace std;
 
 #include "dfhack/DFTypes.h"
-#include "modules/Materials.h"
-#include "modules/Creatures.h"
-#include "modules/Creatures_C.h"
+#include "dfhack/modules/Materials.h"
+#include "dfhack/modules/Creatures.h"
+#include "dfhack-c/modules/Creatures_C.h"
 #include "DFHack_C.h"
 
 using namespace DFHack;
diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp
index 434f28b6c..c49e7a6eb 100644
--- a/library/modules/Gui.cpp
+++ b/library/modules/Gui.cpp
@@ -24,7 +24,7 @@ distribution.
 
 #include "dfhack/DFCommonInternal.h"
 #include "../private/APIPrivate.h"
-#include "modules/Gui.h"
+#include "dfhack/modules/Gui.h"
 #include "dfhack/DFProcess.h"
 #include "dfhack/DFMemInfo.h"
 #include "dfhack/DFTypes.h"
diff --git a/library/modules/Gui_C.cpp b/library/modules/Gui_C.cpp
index 347fb42e8..efb66ffcf 100644
--- a/library/modules/Gui_C.cpp
+++ b/library/modules/Gui_C.cpp
@@ -24,11 +24,11 @@ distribution.
 #include <vector>
 #include <string>
 #include "DFHack_C.h"
-#include "modules/Gui_C.h"
+#include "dfhack-c/modules/Gui_C.h"
 #include "dfhack/DFIntegers.h"
 
 #include "dfhack/DFCommonInternal.h"
-#include "modules/Gui.h"
+#include "dfhack/modules/Gui.h"
 
 using namespace DFHack;
 
diff --git a/library/modules/Items.cpp b/library/modules/Items.cpp
index 1e494720c..6fc0d9b2c 100644
--- a/library/modules/Items.cpp
+++ b/library/modules/Items.cpp
@@ -28,8 +28,8 @@ distribution.
 #include "dfhack/DFMemInfo.h"
 #include "dfhack/DFProcess.h"
 #include "dfhack/DFVector.h"
-#include "modules/Materials.h"
-#include "modules/Items.h"
+#include "dfhack/modules/Materials.h"
+#include "dfhack/modules/Items.h"
 
 using namespace DFHack;
 
diff --git a/library/modules/Items_C.cpp b/library/modules/Items_C.cpp
index a8dcdfe4a..3ac54c46a 100644
--- a/library/modules/Items_C.cpp
+++ b/library/modules/Items_C.cpp
@@ -35,10 +35,10 @@ using namespace std;
 using namespace DFHack;
 
 #include "dfhack/DFProcess.h"
-#include "modules/Materials.h"
-#include "modules/Items.h"
+#include "dfhack/modules/Materials.h"
+#include "dfhack/modules/Items.h"
 #include "dfhack-c/DFTypes_C.h"
-#include "modules/Items_C.h"
+#include "dfhack-c/modules/Items_C.h"
 
 
 #ifdef __cplusplus
diff --git a/library/modules/Maps.cpp b/library/modules/Maps.cpp
index 156464afa..474de769a 100644
--- a/library/modules/Maps.cpp
+++ b/library/modules/Maps.cpp
@@ -27,7 +27,7 @@ distribution.
 #include <mod-core.h>
 #include <mod-maps.h>
 #include "../private/APIPrivate.h"
-#include "modules/Maps.h"
+#include "dfhack/modules/Maps.h"
 #include "dfhack/DFError.h"
 #include "dfhack/DFMemInfo.h"
 #include "dfhack/DFProcess.h"
diff --git a/library/modules/Maps_C.cpp b/library/modules/Maps_C.cpp
index 1113c7ca1..effc188b5 100644
--- a/library/modules/Maps_C.cpp
+++ b/library/modules/Maps_C.cpp
@@ -31,8 +31,8 @@ using namespace std;
 
 #include "dfhack/DFCommonInternal.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Maps.h"
-#include "modules/Maps_C.h"
+#include "dfhack/modules/Maps.h"
+#include "dfhack-c/modules/Maps_C.h"
 
 using namespace DFHack;
 
diff --git a/library/modules/Materials.cpp b/library/modules/Materials.cpp
index 6b815b925..f73beac37 100644
--- a/library/modules/Materials.cpp
+++ b/library/modules/Materials.cpp
@@ -25,7 +25,7 @@ distribution.
 #include "dfhack/DFCommonInternal.h"
 #include "../private/APIPrivate.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Materials.h"
+#include "dfhack/modules/Materials.h"
 #include "dfhack/DFMemInfo.h"
 #include "dfhack/DFProcess.h"
 #include "dfhack/DFVector.h"
diff --git a/library/modules/Materials_C.cpp b/library/modules/Materials_C.cpp
index 206c300f8..135878276 100644
--- a/library/modules/Materials_C.cpp
+++ b/library/modules/Materials_C.cpp
@@ -31,9 +31,9 @@ using namespace std;
 
 #include "dfhack/DFCommonInternal.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Materials.h"
+#include "dfhack/modules/Materials.h"
 #include "dfhack-c/DFTypes_C.h"
-#include "modules/Materials_C.h"
+#include "dfhack-c/modules/Materials_C.h"
 
 using namespace DFHack;
 
diff --git a/library/modules/Position.cpp b/library/modules/Position.cpp
index 3525e7a97..4ecf8dd56 100644
--- a/library/modules/Position.cpp
+++ b/library/modules/Position.cpp
@@ -24,7 +24,7 @@ distribution.
 
 #include "dfhack/DFCommonInternal.h"
 #include "../private/APIPrivate.h"
-#include "modules/Position.h"
+#include "dfhack/modules/Position.h"
 #include "dfhack/DFMemInfo.h"
 #include "dfhack/DFProcess.h"
 using namespace DFHack;
diff --git a/library/modules/Position_C.cpp b/library/modules/Position_C.cpp
index ff617ce23..04f76fbde 100644
--- a/library/modules/Position_C.cpp
+++ b/library/modules/Position_C.cpp
@@ -24,11 +24,11 @@ distribution.
 
 #include <vector>
 #include <string>
-#include "modules/Position_C.h"
+#include "dfhack-c/modules/Position_C.h"
 #include "dfhack/DFIntegers.h"
 
 #include "dfhack/DFCommonInternal.h"
-#include "modules/Position.h"
+#include "dfhack/modules/Position.h"
 
 using namespace DFHack;
 
diff --git a/library/modules/Translation.cpp b/library/modules/Translation.cpp
index ae2215223..6528d1c5c 100644
--- a/library/modules/Translation.cpp
+++ b/library/modules/Translation.cpp
@@ -24,12 +24,11 @@ distribution.
 
 #include "dfhack/DFCommonInternal.h"
 #include "../private/APIPrivate.h"
-#include "modules/Translation.h"
+#include "dfhack/modules/Translation.h"
 #include "dfhack/DFMemInfo.h"
 #include "dfhack/DFProcess.h"
 #include "dfhack/DFVector.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Translation.h"
 
 using namespace DFHack;
 
diff --git a/library/modules/Translation_C.cpp b/library/modules/Translation_C.cpp
index 336db5b3c..50dd51411 100644
--- a/library/modules/Translation_C.cpp
+++ b/library/modules/Translation_C.cpp
@@ -29,8 +29,8 @@ using namespace std;
 
 #include "dfhack/DFCommonInternal.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Translation.h"
-#include "modules/Translation_C.h"
+#include "dfhack/modules/Translation.h"
+#include "dfhack-c/modules/Translation_C.h"
 
 using namespace DFHack;
 
diff --git a/library/modules/Vegetation.cpp b/library/modules/Vegetation.cpp
index 1a5909557..f5f20794f 100644
--- a/library/modules/Vegetation.cpp
+++ b/library/modules/Vegetation.cpp
@@ -24,12 +24,13 @@ distribution.
 
 #include "dfhack/DFCommonInternal.h"
 #include "../private/APIPrivate.h"
-#include "modules/Translation.h"
+
 #include "dfhack/DFMemInfo.h"
 #include "dfhack/DFProcess.h"
 #include "dfhack/DFVector.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Vegetation.h"
+#include "dfhack/modules/Vegetation.h"
+#include "dfhack/modules/Translation.h"
 
 using namespace DFHack;
 
diff --git a/library/modules/Vegetation_C.cpp b/library/modules/Vegetation_C.cpp
index 8a809a42a..0153e1a7e 100644
--- a/library/modules/Vegetation_C.cpp
+++ b/library/modules/Vegetation_C.cpp
@@ -25,8 +25,8 @@ distribution.
 #include "dfhack/DFIntegers.h"
 #include "dfhack/DFCommonInternal.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Vegetation.h"
-#include "modules/Vegetation_C.h"
+#include "dfhack/modules/Vegetation.h"
+#include "dfhack-c/modules/Vegetation_C.h"
 
 using namespace DFHack;
 
diff --git a/library/modules/World.cpp b/library/modules/World.cpp
index a281c5974..00aa67a6a 100644
--- a/library/modules/World.cpp
+++ b/library/modules/World.cpp
@@ -36,7 +36,7 @@ FIXME: Japa said that he had to do this with the time stuff he got from here
 
 #include "dfhack/DFCommonInternal.h"
 #include "../private/APIPrivate.h"
-#include "modules/World.h"
+#include "dfhack/modules/World.h"
 #include "dfhack/DFProcess.h"
 #include "dfhack/DFMemInfo.h"
 #include "dfhack/DFTypes.h"
diff --git a/library/shm/mod-core.cpp b/library/shm/mod-core.cpp
index db74b9eae..2fd54d6e9 100644
--- a/library/shm/mod-core.cpp
+++ b/library/shm/mod-core.cpp
@@ -27,7 +27,7 @@ distribution.
  */
 
 #include <stdio.h>
-#include "../include/DFIntegers.h"
+#include "dfhack/DFIntegers.h"
 #include <stdlib.h>
 #include <string.h>
 #include <string>
diff --git a/library/shm/mod-maps.cpp b/library/shm/mod-maps.cpp
index e0bacd2e1..4274b47a2 100644
--- a/library/shm/mod-maps.cpp
+++ b/library/shm/mod-maps.cpp
@@ -1,13 +1,13 @@
 #include <string>
 #include <vector>
 #include <map>
-#include <DFIntegers.h>
+#include <dfhack/DFIntegers.h>
 
 #include "shms.h"
 #include "mod-core.h"
 #include "mod-maps.h"
-#include <DFTypes.h>
-#include <modules/Maps.h>
+#include <dfhack/DFTypes.h>
+#include <dfhack/modules/Maps.h>
 using namespace DFHack;
 using namespace DFHack::Server::Maps;
 
diff --git a/library/shm/shms-windows.cpp b/library/shm/shms-windows.cpp
index a2fb46ac0..007612438 100644
--- a/library/shm/shms-windows.cpp
+++ b/library/shm/shms-windows.cpp
@@ -33,7 +33,7 @@ distribution.
 
 #define DFhackCExport extern "C" __declspec(dllexport)
 
-#include "../include/DFIntegers.h"
+#include "dfhack/DFIntegers.h"
 #include <vector>
 #include <string>
 #include "shms.h"