diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6099202f..aeeb2f90 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -313,6 +313,7 @@ ENDIF( ENABLE_FFMPEG )
 
 ADD_LIBRARY (
     vbamcore
+    STATIC
     ${PROJECT_SRCS}
     ${SRC_MAIN}
     ${SRC_GBA}
diff --git a/fex/CMakeLists.txt b/fex/CMakeLists.txt
index bf9d760b..811d7485 100644
--- a/fex/CMakeLists.txt
+++ b/fex/CMakeLists.txt
@@ -38,5 +38,6 @@ INCLUDE_DIRECTORIES(
 
 ADD_LIBRARY(
     fex
+    STATIC
     ${SRC_FEX}
 )
diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt
index 9e23a35e..4e635551 100644
--- a/src/wx/CMakeLists.txt
+++ b/src/wx/CMakeLists.txt
@@ -124,7 +124,7 @@ SET( SRC_WX
    cmdhandlers.h
    cmd-evtable.h
    #Icon File
-   wxvbam.xpm
+   xrc/wxvbam.xpm
 )
 
 IF(ENABLE_OPENAL)
diff --git a/src/wx/guiinit.cpp b/src/wx/guiinit.cpp
index a3b85808..ff6d0873 100644
--- a/src/wx/guiinit.cpp
+++ b/src/wx/guiinit.cpp
@@ -28,7 +28,7 @@
 // ImageMagick makes the name wxvbam, but wx expects wxvbam_xpm
 #define wxvbam wxvbam_xpm
 const
-#include "wxvbam.xpm"
+#include "xrx/wxvbam.xpm"
 #undef wxvbam
 #endif