diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43899611f..a8402f3d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,7 +75,6 @@ set(OBSIDIAN_SOURCE_FILES
     source/m_options.cc
     source/m_trans.cc
     source/main.cc
-    source/obsidian.rc
     source/poly_map.cc
     source/poly.cc
     source/poly_util.cc
@@ -108,6 +107,13 @@ if (NOT CONSOLE_ONLY)
   )
 endif()
 
+if (WIN32)
+  set(OBSIDIAN_SOURCE_FILES
+    ${OBSIDIAN_SOURCE_FILES}
+    source/obsidian.rc
+  )
+endif()
+
 add_executable(
   obsidian
   ${OBSIDIAN_SOURCE_FILES}
diff --git a/source/bsp.cc b/source/bsp.cc
index 484c4f4dc..98bb162a5 100644
--- a/source/bsp.cc
+++ b/source/bsp.cc
@@ -19,6 +19,8 @@
 
 #include "bsp.h"
 
+#include <string.h>
+
 #include "bsp_utility.h"
 #include "bsp_wad.h"
 #include "lib_util.h"