diff --git a/source/exhumed/src/config.cpp b/source/exhumed/src/config.cpp
index 6f3c08edf..c313b7571 100644
--- a/source/exhumed/src/config.cpp
+++ b/source/exhumed/src/config.cpp
@@ -12,7 +12,7 @@
 #include "config.h"
 
 #include <string>
-#include <io.h>
+//#include <io.h>
 #include <stdio.h>
 #include <time.h>
 
diff --git a/source/exhumed/src/enginesubs.cpp b/source/exhumed/src/enginesubs.cpp
index 0eadd809e..1d8677ec2 100644
--- a/source/exhumed/src/enginesubs.cpp
+++ b/source/exhumed/src/enginesubs.cpp
@@ -1,8 +1,8 @@
 
 #include "engine.h"
 
-#include <io.h>
-#include <fcntl.h>
+//#include <io.h>
+//#include <fcntl.h>
 #include <malloc.h>
 
 // static int globhiz, globloz, globhihit, globlohit;
diff --git a/source/exhumed/src/exhumed.cpp b/source/exhumed/src/exhumed.cpp
index 04c2fb5fc..b7480fa2c 100644
--- a/source/exhumed/src/exhumed.cpp
+++ b/source/exhumed/src/exhumed.cpp
@@ -3409,7 +3409,7 @@ int Query(short nLines, short nKeys, ...)
     {
         char *str = va_arg(args, char*);
         strcpy(strings[i], str);
-        strupr(strings[i]);
+        Bstrupr(strings[i]);
 
         int strWidth = MyGetStringWidth(strings[i]);
 
diff --git a/source/exhumed/src/save.cpp b/source/exhumed/src/save.cpp
index 783d6f11f..2155fbe68 100644
--- a/source/exhumed/src/save.cpp
+++ b/source/exhumed/src/save.cpp
@@ -1,9 +1,9 @@
 
 #include "save.h"
 #include <stdio.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <io.h>
+//#include <fcntl.h>
+//#include <sys/stat.h>
+//#include <io.h>
 #include "engine.h"
 
 int savegame(int nSlot)
diff --git a/source/exhumed/src/sound.cpp b/source/exhumed/src/sound.cpp
index b6d382337..326657fdc 100644
--- a/source/exhumed/src/sound.cpp
+++ b/source/exhumed/src/sound.cpp
@@ -466,7 +466,7 @@ int LoadSound(const char *sound)
     int i;
     for (i = 0; i < nSoundCount; i++)
     {
-        if (!strnicmp(szSoundName[i], sound, kMaxSoundNameLen))
+        if (!Bstrncasecmp(szSoundName[i], sound, kMaxSoundNameLen))
             return i;
     }
 
diff --git a/source/exhumed/src/startgtk.game.cpp b/source/exhumed/src/startgtk.game.cpp
index 9156976c6..2ea058780 100644
--- a/source/exhumed/src/startgtk.game.cpp
+++ b/source/exhumed/src/startgtk.game.cpp
@@ -21,13 +21,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //-------------------------------------------------------------------------
 
 #include "build.h"
-#include "cmdline.h"
 #include "common.h"
-#include "common_game.h"
 #include "compat.h"
+#include "keyboard.h"
+#include "control.h"
+#include "config.h"
 #include "exhumed.h"
 #include "dynamicgtk.h"
-#include "game.h"
 #include "grpscan.h"
 #include "gtkpixdata.h"
 
diff --git a/source/exhumed/src/status.cpp b/source/exhumed/src/status.cpp
index 4b32705e4..3d90565d6 100644
--- a/source/exhumed/src/status.cpp
+++ b/source/exhumed/src/status.cpp
@@ -699,8 +699,9 @@ void DrawStatus()
 
         if (bCoordinates)
         {
-            char *cFPS = itoa(lastfps, numberBuf, 10);
-            printext(xdim - 20, nViewTop, cFPS, kTile159, -1);
+            sprintf(numberBuf, "%i", lastfps);
+            // char *cFPS = itoa(lastfps, numberBuf, 10);
+            printext(xdim - 20, nViewTop, numberBuf, kTile159, -1);
         }
 
         // draw ammo count