diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 15abe7cce..b9f41fda2 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -27,9 +27,11 @@ include_directories (${CMAKE_SOURCE_DIR}/library/depends/argstream/)
 include_directories (${CMAKE_SOURCE_DIR}/library/private/)
 
 SET(PROJECT_HDRS
+private/DFMemInfoManager.h
+private/ContextShared.h
+private/Internal.h
 include/dfhack/DFError.h
 include/dfhack/DFMemInfo.h
-include/dfhack/DFMemInfoManager.h
 include/dfhack/DFProcessEnumerator.h
 include/dfhack/DFProcess.h
 include/dfhack/DFTileTypes.h
diff --git a/library/DFProcessEnumerator.cpp b/library/DFProcessEnumerator.cpp
index 839b59e44..94eb2d804 100644
--- a/library/DFProcessEnumerator.cpp
+++ b/library/DFProcessEnumerator.cpp
@@ -137,8 +137,8 @@ Process *ProcessEnumerator::Private::GetProcessObject(ProcessID ID)
         return p3;
     else
         delete p3;
-    return 0;
 #endif
+    return 0;
 }
 
 #ifdef LINUX_BUILD
diff --git a/library/modules/WindowIO_C.cpp b/library/modules/WindowIO_C.cpp
index b404736ec..31c6e4739 100644
--- a/library/modules/WindowIO_C.cpp
+++ b/library/modules/WindowIO_C.cpp
@@ -22,6 +22,9 @@ must not be misrepresented as being the original software.
 distribution.
 */
 
+#include <vector>
+#include <map>
+#include <string>
 using namespace std;
 
 #include "dfhack/DFIntegers.h"
diff --git a/precompiled/linux/libdfconnect.so b/precompiled/linux/libdfconnect.so
index 633f5c5e5..4b3a2a846 100755
Binary files a/precompiled/linux/libdfconnect.so and b/precompiled/linux/libdfconnect.so differ
diff --git a/precompiled/windows/SDL.dll b/precompiled/windows/SDL.dll
index 4b9815255..e436f4e9e 100644
Binary files a/precompiled/windows/SDL.dll and b/precompiled/windows/SDL.dll differ