diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index e82f885a2..a74193fe6 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -23,4 +23,7 @@ ELSE(UNIX)
 ENDIF(UNIX)
 
 ADD_LIBRARY(dfhack SHARED ${PROJECT_SRCS})
+
+SET_TARGET_PROPERTIES( dfhack  PROPERTIES DEBUG_POSTFIX "-debug" )
+
 TARGET_LINK_LIBRARIES(dfhack ${PROJECT_LIBS})
\ No newline at end of file
diff --git a/library/DFCommon.h b/library/DFCommon.h
index 29451ca7b..37a925e6e 100644
--- a/library/DFCommon.h
+++ b/library/DFCommon.h
@@ -35,7 +35,7 @@ distribution.
 
 #include <fstream>
 using namespace std;
-#include <integers.h>
+#include "integers.h"
 #include <assert.h>
 #include <string.h>
 
diff --git a/library/DFHackAPI.h b/library/DFHackAPI.h
index 3d42b5238..8eb052dcd 100644
--- a/library/DFHackAPI.h
+++ b/library/DFHackAPI.h
@@ -43,7 +43,7 @@ distribution.
 
 #include <string>
 #include <vector>
-#include <integers.h>
+#include "integers.h"
 using namespace std;
 
 class DFHackAPI;
diff --git a/library/DFHackAPIc.h b/library/DFHackAPIc.h
index 346387765..245d349fa 100644
--- a/library/DFHackAPIc.h
+++ b/library/DFHackAPIc.h
@@ -41,7 +41,7 @@ distribution.
 # endif
 #endif
 
-#include <integers.h>
+#include "integers.h"
 
 #ifdef __cplusplus
 # include <vector>
diff --git a/library/integers.h b/library/integers.h
index 3e43ad442..e5297c67b 100644
--- a/library/integers.h
+++ b/library/integers.h
@@ -4,10 +4,13 @@ This file is a wrapper for stdint.h
 Visual Studio doesn't have stdint.h
 
 stdint.h is part of the C99 standard. It's ancient and simply should be there. FAIL
-*/
 
-#ifndef _MSC_VER
-#include <stdint.h>
-#else
-#include <stdint_win.h>
+You can turn off the include by defining SKIP_DFHACK_STDINT
+*/
+#ifndef SKIP_DFHACK_STDINT
+    #ifndef _MSC_VER
+        #include <stdint.h>
+    #else
+        #include "stdint_win.h"
+    #endif
 #endif
\ No newline at end of file
diff --git a/library/md5/md5.h b/library/md5/md5.h
index 91b43b861..b01e0ff34 100644
--- a/library/md5/md5.h
+++ b/library/md5/md5.h
@@ -45,7 +45,7 @@
 //----------------------------------------------------------------------
 //STL includes
 #include <string>
-#include <integers.h>
+#include "integers.h"
 //----------------------------------------------------------------------
 //typedefs
 typedef unsigned char *POINTER;