diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index 3f575b2..40f868a 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -742,4 +742,4 @@ if (UNIX)
 set_target_properties(RedAlert PROPERTIES OUTPUT_NAME "RedAlert"  RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/.." )
 endif(UNIX)
 
-target_include_directories(RedAlert PRIVATE ./external/xml/;./external/devil/;./external/;./redalert/win32lib;./external/lua/;./external/imgui;./external/dxsdk/Include;./external/ffmpeg-win32/include;./external/sdl2/include;./win32lib;./external/openal/include)
\ No newline at end of file
+target_include_directories(RedAlert PRIVATE ./external/xml/;./external/devil/;./external/;./redalert/win32lib;./redalert/io;./external/lua/;./external/imgui;./external/dxsdk/Include;./external/ffmpeg-win32/include;./external/sdl2/include;./win32lib;./external/openal/include)
diff --git a/code/redalert/function.h b/code/redalert/function.h
index dc10fba..ae1810a 100644
--- a/code/redalert/function.h
+++ b/code/redalert/function.h
@@ -200,7 +200,8 @@ struct NoInitClass {
 #endif
 
 #include	"key.h"
-#include    "io/UserInput.h"
+#include    "io/userinput.h"
+#include    "io/eventqueue.h"
 
 #include    <wwlib32.h>
 #include	"mpu.h"
diff --git a/code/redalert/io/userinput.cpp b/code/redalert/io/userinput.cpp
index aadd59c..088f926 100644
--- a/code/redalert/io/userinput.cpp
+++ b/code/redalert/io/userinput.cpp
@@ -1,5 +1,5 @@
-#include "../FUNCTION.H"
-#include "UserInput.h"
+#include "../function.h"
+#include "userinput.h"
 
 extern KeyboardClass * Keyboard;
 
diff --git a/code/redalert/io/userinput.h b/code/redalert/io/userinput.h
index d6cc690..314e75b 100644
--- a/code/redalert/io/userinput.h
+++ b/code/redalert/io/userinput.h
@@ -116,7 +116,8 @@ typedef enum {
 class UserInputClass
 {
 	public:
-		UserInputClass();
+		UserInputClass(void);
+
 		void UserInputClass::Process_Input( KeyNumType& key = g_globalKeyNumType, int& flags = g_globalKeyFlags );
 
 		InputAction LastAction;