diff --git a/src/core.cc b/src/core.cc
index 983aa7c..6807ee8 100644
--- a/src/core.cc
+++ b/src/core.cc
@@ -8,6 +8,7 @@
 #include "memory.h"
 #include "mmx.h"
 #include "text_font.h"
+#include "win32.h"
 #include "window_manager.h"
 #include "window_manager_private.h"
 
diff --git a/src/core.h b/src/core.h
index 04dd262..38b877f 100644
--- a/src/core.h
+++ b/src/core.h
@@ -465,7 +465,6 @@ extern InputEvent gInputEventQueue[40];
 extern STRUCT_6ABF50 _GNW95_key_time_stamps[SDL_NUM_SCANCODES];
 extern int _input_mx;
 extern int _input_my;
-extern HHOOK _GNW95_keyboardHandle;
 extern bool gPaused;
 extern int gScreenshotKeyCode;
 extern int _using_msec_timer;
diff --git a/src/dinput.h b/src/dinput.h
index 299b3b7..113e998 100644
--- a/src/dinput.h
+++ b/src/dinput.h
@@ -1,8 +1,6 @@
 #ifndef DINPUT_H
 #define DINPUT_H
 
-#include "win32.h"
-
 typedef struct MouseData {
     int x;
     int y;
diff --git a/src/text_object.cc b/src/text_object.cc
index 39c749b..31e2b5d 100644
--- a/src/text_object.cc
+++ b/src/text_object.cc
@@ -10,6 +10,8 @@
 #include "tile.h"
 #include "word_wrap.h"
 
+#include <string.h>
+
 // 0x51D944
 int gTextObjectsCount = 0;
 
diff --git a/src/window_manager.cc b/src/window_manager.cc
index e4d55b5..d4c20cf 100644
--- a/src/window_manager.cc
+++ b/src/window_manager.cc
@@ -8,6 +8,7 @@
 #include "memory.h"
 #include "palette.h"
 #include "text_font.h"
+#include "win32.h"
 #include "window_manager_private.h"
 
 #include <SDL.h>