diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a7d2e2bc..842103da1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -205,6 +205,7 @@ ELSEIF(MSVC)
   # for msvc, tell it to always use 8-byte pointers to member functions to avoid confusion
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /vmg /vmm /MP")
   SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od")
+  STRING(REPLACE "/O2" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
   STRING(REPLACE "/DNDEBUG" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
 ENDIF()
 
diff --git a/build/win64/build-debug.bat b/build/win64/build-debug.bat
index f53df9063..08ef6d3a9 100644
--- a/build/win64/build-debug.bat
+++ b/build/win64/build-debug.bat
@@ -1,4 +1,4 @@
-call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
 cd VC2015
 msbuild /m /p:Platform=x64 /p:Configuration=RelWithDebInfo ALL_BUILD.vcxproj
-cd ..
\ No newline at end of file
+cd ..
diff --git a/build/win64/build-release.bat b/build/win64/build-release.bat
index 551e27b69..dfeb108b3 100644
--- a/build/win64/build-release.bat
+++ b/build/win64/build-release.bat
@@ -1,5 +1,5 @@
-call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
 cd VC2015
 msbuild /m /p:Platform=x64 /p:Configuration=Release ALL_BUILD.vcxproj
 cd ..
-pause
\ No newline at end of file
+pause
diff --git a/build/win64/install-debug.bat b/build/win64/install-debug.bat
index 0b8758461..34668945c 100644
--- a/build/win64/install-debug.bat
+++ b/build/win64/install-debug.bat
@@ -1,4 +1,4 @@
-call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
 cd VC2015
 msbuild /m /p:Platform=x64 /p:Configuration=RelWithDebInfo INSTALL.vcxproj
-cd ..
\ No newline at end of file
+cd ..
diff --git a/build/win64/install-release.bat b/build/win64/install-release.bat
index 8c0b8a83d..24acd5de8 100644
--- a/build/win64/install-release.bat
+++ b/build/win64/install-release.bat
@@ -1,4 +1,4 @@
-call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
 cd VC2015
 msbuild /m /p:Platform=x64 /p:Configuration=Release INSTALL.vcxproj
-cd ..
\ No newline at end of file
+cd ..
diff --git a/depends/protobuf/CMakeLists.txt b/depends/protobuf/CMakeLists.txt
index 206cfc1a9..ce35d25f1 100644
--- a/depends/protobuf/CMakeLists.txt
+++ b/depends/protobuf/CMakeLists.txt
@@ -5,53 +5,13 @@ IF(CMAKE_COMPILER_IS_GNUCC)
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
 ENDIF()
 
-SET(HAVE_HASH_MAP 0)
+SET(HASH_MAP_H <unordered_map>)
+SET(HASH_SET_H <unordered_map>)
+SET(HASH_NAMESPACE std)
 SET(HASH_MAP_CLASS unordered_map)
-
-#Check for all of the possible combinations of unordered_map and hash_map
-
-FOREACH(header tr1/unordered_map unordered_map)
-    FOREACH(namespace std::tr1 std )
-        IF(HAVE_HASH_MAP EQUAL 0 AND NOT STL_HASH_OLD_GCC)
-            CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/testHashMap.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/testHashMap.cpp")
-            IF(CMAKE_CROSSCOMPILING)
-                TRY_COMPILE(HASH_MAP_COMPILE_RESULT ${PROJECT_BINARY_DIR}/CMakeTmp "${CMAKE_CURRENT_BINARY_DIR}/testHashMap.cpp")
-                SET(HASH_MAP_RUN_RESULT ${HASH_MAP_COMPILE_RESULT})
-            ELSE()
-                TRY_RUN(HASH_MAP_RUN_RESULT HASH_MAP_COMPILE_RESULT ${PROJECT_BINARY_DIR}/CMakeTmp "${CMAKE_CURRENT_BINARY_DIR}/testHashMap.cpp")
-            ENDIF()
-            IF (HASH_MAP_COMPILE_RESULT AND HASH_MAP_RUN_RESULT EQUAL 1)
-                SET(HASH_MAP_H <${header}>)
-                STRING(REPLACE "map" "set" HASH_SET_H ${HASH_MAP_H})
-                SET(HASH_NAMESPACE ${namespace})
-                SET(HASH_MAP_CLASS unordered_map)
-                SET(HASH_SET_CLASS unordered_set)
-                SET(HAVE_HASH_MAP 1)
-                SET(HAVE_HASH_SET 1)
-            ENDIF()
-        ENDIF()
-    ENDFOREACH(namespace)
-ENDFOREACH(header)
-IF (HAVE_HASH_MAP EQUAL 0)
-    SET(HASH_MAP_CLASS hash_map)
-    FOREACH(header ext/hash_map hash_map)
-        FOREACH(namespace __gnu_cxx "" std stdext)
-            IF (HAVE_HASH_MAP EQUAL 0)
-                CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/testHashMap.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/testHashMap.cpp")
-                TRY_COMPILE(HASH_MAP_COMPILE_RESULT ${PROJECT_BINARY_DIR}/CMakeTmp "${CMAKE_CURRENT_BINARY_DIR}/testHashMap.cpp")
-                IF (HASH_MAP_COMPILE_RESULT)
-                    SET(HASH_MAP_H <${header}>)
-                    STRING(REPLACE "map" "set" HASH_SET_H ${HASH_MAP_H})
-                    SET(HASH_NAMESPACE ${namespace})
-                    SET(HASH_MAP_CLASS hash_map)
-                    SET(HASH_SET_CLASS hash_set)
-                    SET(HAVE_HASH_MAP 1)
-                    SET(HAVE_HASH_SET 1)
-                ENDIF()
-            ENDIF()
-        ENDFOREACH()
-    ENDFOREACH()
-ENDIF()
+SET(HASH_SET_CLASS unordered_set)
+SET(HAVE_HASH_MAP 1)
+SET(HAVE_HASH_SET 1)
 
 IF (HAVE_HASH_MAP EQUAL 0)
     MESSAGE(SEND_ERROR "Could not find a working hash map implementation. Please install GCC >= 4.4, and all necessary 32-bit C++ development libraries.")
diff --git a/plugins/diggingInvaders/CMakeLists.txt b/plugins/diggingInvaders/CMakeLists.txt
index a88c93ca1..fa4279b0f 100644
--- a/plugins/diggingInvaders/CMakeLists.txt
+++ b/plugins/diggingInvaders/CMakeLists.txt
@@ -15,21 +15,4 @@ SET_SOURCE_FILES_PROPERTIES( ${PROJECT_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE)
 # mash them together (headers are marked as headers and nothing will try to compile them)
 LIST(APPEND PROJECT_SRCS ${PROJECT_HDRS})
 
-#linux
-IF(UNIX)
-    add_definitions(-DLINUX_BUILD)
-    SET(PROJECT_LIBS
-        # add any extra linux libs here
-        ${PROJECT_LIBS}
-    )
-# windows
-ELSE(UNIX)
-    SET(PROJECT_LIBS
-        # add any extra linux libs here
-        ${PROJECT_LIBS}
-        $(NOINHERIT)
-    )
-ENDIF(UNIX)
-# this makes sure all the stuff is put in proper places and linked to dfhack
-
-DFHACK_PLUGIN(diggingInvaders ${PROJECT_SRCS} LINK_LIBRARIES ${PROJECT_LIBS})
+DFHACK_PLUGIN(diggingInvaders ${PROJECT_SRCS})
diff --git a/plugins/embark-assistant/CMakeLists.txt b/plugins/embark-assistant/CMakeLists.txt
index e57561ec1..917d2ec5a 100644
--- a/plugins/embark-assistant/CMakeLists.txt
+++ b/plugins/embark-assistant/CMakeLists.txt
@@ -27,22 +27,4 @@ SET_SOURCE_FILES_PROPERTIES( ${PROJECT_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE)
 # mash them together (headers are marked as headers and nothing will try to compile them)
 LIST(APPEND PROJECT_SRCS ${PROJECT_HDRS})
 
-# option to use a thread for no particular reason
-#OPTION(SKELETON_THREAD "Use threads in the skeleton plugin." ON)
-#linux
-IF(UNIX)
-    add_definitions(-DLINUX_BUILD)
-    SET(PROJECT_LIBS
-        # add any extra linux libs here
-        ${PROJECT_LIBS}
-    )
-# windows
-ELSE(UNIX)
-    SET(PROJECT_LIBS
-        # add any extra windows libs here
-        ${PROJECT_LIBS}
-        $(NOINHERIT)
-    )
-ENDIF(UNIX)
-# this makes sure all the stuff is put in proper places and linked to dfhack
-DFHACK_PLUGIN(embark-assistant ${PROJECT_SRCS} LINK_LIBRARIES ${PROJECT_LIBS})
+DFHACK_PLUGIN(embark-assistant ${PROJECT_SRCS})
diff --git a/plugins/labormanager/CMakeLists.txt b/plugins/labormanager/CMakeLists.txt
index 8e9e28b81..8337ac786 100644
--- a/plugins/labormanager/CMakeLists.txt
+++ b/plugins/labormanager/CMakeLists.txt
@@ -14,21 +14,4 @@ SET_SOURCE_FILES_PROPERTIES( ${PROJECT_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE)
 # mash them together (headers are marked as headers and nothing will try to compile them)
 LIST(APPEND PROJECT_SRCS ${PROJECT_HDRS})
 
-#linux
-IF(UNIX)
-    add_definitions(-DLINUX_BUILD)
-    SET(PROJECT_LIBS
-        # add any extra linux libs here
-        ${PROJECT_LIBS}
-    )
-# windows
-ELSE(UNIX)
-    SET(PROJECT_LIBS
-        # add any extra linux libs here
-        ${PROJECT_LIBS}
-        $(NOINHERIT)
-    )
-ENDIF(UNIX)
-# this makes sure all the stuff is put in proper places and linked to dfhack
-
-DFHACK_PLUGIN(labormanager ${PROJECT_SRCS} LINK_LIBRARIES ${PROJECT_LIBS})
+DFHACK_PLUGIN(labormanager ${PROJECT_SRCS})
diff --git a/plugins/remotefortressreader/CMakeLists.txt b/plugins/remotefortressreader/CMakeLists.txt
index 571098e18..1ff1cac7f 100644
--- a/plugins/remotefortressreader/CMakeLists.txt
+++ b/plugins/remotefortressreader/CMakeLists.txt
@@ -26,23 +26,9 @@ SET_SOURCE_FILES_PROPERTIES( ${PROJECT_PROTO} PROPERTIES GENERATED TRUE)
 # mash them together (headers are marked as headers and nothing will try to compile them)
 LIST(APPEND PROJECT_SRCS ${PROJECT_HDRS};${PROJECT_PROTO})
 
-#linux
-IF(UNIX)
-    add_definitions(-DLINUX_BUILD)
-    SET(PROJECT_LIBS
-        # add any extra linux libs here
-        ${PROJECT_LIBS}
-    )
-    IF(NOT APPLE)
-        SET(PROJECT_LIBS ${PROJECT_LIBS} SDL)
-    ENDIF()
-# windows
-ELSE(UNIX)
-    SET(PROJECT_LIBS
-        # add any extra windows libs here
-        ${PROJECT_LIBS}
-        $(NOINHERIT)
-    )
-ENDIF(UNIX)
+IF(UNIX AND NOT APPLE)
+    SET(PROJECT_LIBS ${PROJECT_LIBS} SDL)
+ENDIF()
+
 # this makes sure all the stuff is put in proper places and linked to dfhack
 DFHACK_PLUGIN(RemoteFortressReader ${PROJECT_SRCS} LINK_LIBRARIES protobuf-lite ${PROJECT_LIBS} COMPILE_FLAGS_MSVC "/FI\"Export.h\"" COMPILE_FLAGS_GCC "-include Export.h -Wno-misleading-indentation" )
diff --git a/plugins/rendermax/CMakeLists.txt b/plugins/rendermax/CMakeLists.txt
index ba589732d..c83790412 100644
--- a/plugins/rendermax/CMakeLists.txt
+++ b/plugins/rendermax/CMakeLists.txt
@@ -15,27 +15,7 @@ SET_SOURCE_FILES_PROPERTIES( ${PROJECT_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE)
 # mash them together (headers are marked as headers and nothing will try to compile them)
 LIST(APPEND PROJECT_SRCS ${PROJECT_HDRS})
 
-
-#linux
-IF(UNIX)
-    add_definitions(-DLINUX_BUILD)
-    SET(PROJECT_LIBS
-        # add any extra linux libs here
-		lua
-		dfhack-tinythread
-        ${PROJECT_LIBS}
-    )
-# windows
-ELSE(UNIX)
-    SET(PROJECT_LIBS
-        # add any extra windows libs here
-		lua
-		dfhack-tinythread
-        ${PROJECT_LIBS}
-        $(NOINHERIT)
-    )
-ENDIF(UNIX)
 # this makes sure all the stuff is put in proper places and linked to dfhack
-DFHACK_PLUGIN(rendermax ${PROJECT_SRCS} LINK_LIBRARIES ${PROJECT_LIBS})
+DFHACK_PLUGIN(rendermax ${PROJECT_SRCS} LINK_LIBRARIES lua dfhack-tinythread)
 install(FILES rendermax.lua
         DESTINATION ${DFHACK_DATA_DESTINATION}/raw)
diff --git a/plugins/skeleton/CMakeLists.txt b/plugins/skeleton/CMakeLists.txt
index 794f4a5d8..69fac825a 100644
--- a/plugins/skeleton/CMakeLists.txt
+++ b/plugins/skeleton/CMakeLists.txt
@@ -14,20 +14,23 @@ LIST(APPEND PROJECT_SRCS ${PROJECT_HDRS})
 
 # option to use a thread for no particular reason
 OPTION(SKELETON_THREAD "Use threads in the skeleton plugin." ON)
-#linux
 IF(UNIX)
-    add_definitions(-DLINUX_BUILD)
+    IF(APPLE)
+        SET(PROJECT_LIBS
+            # add any extra mac libraries here
+            ${PROJECT_LIBS}
+        )
+    ELSE()
+        SET(PROJECT_LIBS
+            # add any extra linux libraries here
+            ${PROJECT_LIBS}
+        )
+    ENDIF()
+ELSE()
     SET(PROJECT_LIBS
-        # add any extra linux libs here
+        # add any extra windows libraries here
         ${PROJECT_LIBS}
     )
-# windows
-ELSE(UNIX)
-    SET(PROJECT_LIBS
-        # add any extra windows libs here
-        ${PROJECT_LIBS}
-        $(NOINHERIT)
-    )
-ENDIF(UNIX)
+ENDIF()
 # this makes sure all the stuff is put in proper places and linked to dfhack
 DFHACK_PLUGIN(skeleton ${PROJECT_SRCS} LINK_LIBRARIES ${PROJECT_LIBS})
diff --git a/plugins/stonesense b/plugins/stonesense
index 2b84dd1f5..164d2cd13 160000
--- a/plugins/stonesense
+++ b/plugins/stonesense
@@ -1 +1 @@
-Subproject commit 2b84dd1f526faf16b2d71c09230a4ddf5a43f43f
+Subproject commit 164d2cd1349c090a91c1c19200ad03df9bb16650