diff --git a/source/build/src/mdsprite.cpp b/source/build/src/mdsprite.cpp
index 78891f55f..f6e51fdd6 100644
--- a/source/build/src/mdsprite.cpp
+++ b/source/build/src/mdsprite.cpp
@@ -605,7 +605,7 @@ static int32_t mdloadskin_failed(char * const skinfile, char const * const fn)
 int32_t mdloadskin(md2model_t *m, int32_t number, int32_t pal, int32_t surf)
 {
     int32_t i;
-    char *skinfile, fn[BMAX_PATH];
+    char *skinfile = NULL, fn[BMAX_PATH];
     GLuint *texidx = NULL;
     mdskinmap_t *sk, *skzero = NULL;
     int32_t doalloc = 1;
@@ -667,7 +667,7 @@ int32_t mdloadskin(md2model_t *m, int32_t number, int32_t pal, int32_t surf)
 #endif
     }
 
-    if (!skinfile[0])
+    if (skinfile == NULL || !skinfile[0])
         return 0;
 
     if (*texidx)
diff --git a/source/build/src/sdlayer.cpp b/source/build/src/sdlayer.cpp
index 7fa9a1378..30a7543a0 100644
--- a/source/build/src/sdlayer.cpp
+++ b/source/build/src/sdlayer.cpp
@@ -1877,7 +1877,7 @@ int32_t videoSetGamma(void)
 }
 
 #if !defined __APPLE__ && !defined EDUKE32_TOUCH_DEVICES
-extern struct sdlappicon sdlappicon;
+extern "C" struct sdlappicon sdlappicon;
 static inline SDL_Surface *loadappicon(void)
 {
     SDL_Surface *surf = SDL_CreateRGBSurfaceFrom((void *)sdlappicon.pixels, sdlappicon.width, sdlappicon.height, 32,
diff --git a/source/duke3d/rsrc/buildres.rc b/source/duke3d/rsrc/buildres.rc
index b7e646348..f8c738811 100644
--- a/source/duke3d/rsrc/buildres.rc
+++ b/source/duke3d/rsrc/buildres.rc
@@ -1,6 +1,6 @@
 #define NEED_COMMCTRL_H
-#include "windows_inc.h"
-#include "startwin.editor.h"
+#include "..\..\build\include\windows_inc.h"
+#include "..\..\build\include\startwin.editor.h"
 
 RSRC_ICON ICON "build_icon.ico"
 RSRC_BMP BITMAP "build.bmp"
diff --git a/source/duke3d/rsrc/gameres.rc b/source/duke3d/rsrc/gameres.rc
index ab6841c0a..9269c403f 100644
--- a/source/duke3d/rsrc/gameres.rc
+++ b/source/duke3d/rsrc/gameres.rc
@@ -1,6 +1,6 @@
 #define NEED_COMMCTRL_H
-#include "windows_inc.h"
-#include "startwin.game.h"
+#include "..\..\build\include\windows_inc.h"
+#include "..\src\startwin.game.h"
 
 RSRC_ICON ICON "game_icon.ico"
 RSRC_BMP BITMAP "game.bmp"