diff --git a/src/sdl/i_input.cpp b/src/sdl/i_input.cpp
index e7fc32ebf7..78754d19e4 100644
--- a/src/sdl/i_input.cpp
+++ b/src/sdl/i_input.cpp
@@ -460,3 +460,11 @@ void I_StartFrame ()
 		InitKeySymMap ();
 	}
 }
+
+void I_GetAxes(float axes[NUM_JOYAXIS])
+{
+	for (int i = 0; i < NUM_JOYAXIS; ++i)
+	{
+		axes[i] = 0;
+	}
+}
diff --git a/src/sdl/i_input.h b/src/sdl/i_input.h
index 2551159bab..cfbf476d91 100644
--- a/src/sdl/i_input.h
+++ b/src/sdl/i_input.h
@@ -4,16 +4,7 @@
 void I_PutInClipboard (const char *str);
 FString I_GetFromClipboard (bool use_primary_selection);
 
-struct GUIDName
-{
-        GUID ID;
-        char *Name;
-};
-
-extern TArray<GUIDName> JoystickNames;
-extern char *JoyAxisNames[8];
-
-extern void DI_EnumJoy ();
+void I_GetAxes(float axes[NUM_JOYAXIS]);
 
 #endif
 
diff --git a/zdoom.vcproj b/zdoom.vcproj
index 18108eb304..b979a9bfab 100644
--- a/zdoom.vcproj
+++ b/zdoom.vcproj
@@ -91,7 +91,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="gdi32.lib user32.lib comctl32.lib shell32.lib advapi32.lib comdlg32.lib ole32.lib dxguid.lib dsound.lib dinput8.lib strmiids.lib wsock32.lib winmm.lib fmodex_vc.lib setupapi.lib ws2_32.lib"
+				AdditionalDependencies="gdi32.lib user32.lib comctl32.lib shell32.lib advapi32.lib comdlg32.lib ole32.lib dxguid.lib dsound.lib dinput8.lib strmiids.lib wsock32.lib winmm.lib fmodex_vc.lib setupapi.lib ws2_32.lib oleaut32.lib"
 				ShowProgress="0"
 				OutputFile="../zdoom.exe"
 				LinkIncremental="1"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ddraw.lib dxguid.lib dinput8.lib comctl32.lib strmiids.lib wsock32.lib ws2_32.lib winmm.lib fmodex64_vc.lib setupapi.lib"
+				AdditionalDependencies="ddraw.lib dxguid.lib dinput8.lib comctl32.lib strmiids.lib wsock32.lib ws2_32.lib winmm.lib fmodex64_vc.lib setupapi.lib oleaut32.lib"
 				ShowProgress="0"
 				OutputFile="../zdoom64.exe"
 				LinkIncremental="1"
@@ -318,7 +318,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="gdi32.lib user32.lib comctl32.lib shell32.lib advapi32.lib comdlg32.lib ole32.lib dxguid.lib dsound.lib dinput8.lib strmiids.lib wsock32.lib winmm.lib fmodex_vc.lib setupapi.lib ws2_32.lib"
+				AdditionalDependencies="gdi32.lib user32.lib comctl32.lib shell32.lib advapi32.lib comdlg32.lib ole32.lib dxguid.lib dsound.lib dinput8.lib strmiids.lib wsock32.lib winmm.lib fmodex_vc.lib setupapi.lib ws2_32.lib oleaut32.lib"
 				OutputFile="../zdoomd.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -424,7 +424,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="dxguid.lib ddraw.lib dinput8.lib comctl32.lib strmiids.lib wsock32.lib winmm.lib fmodex64_vc.lib setupapi.lib ws2_32.lib"
+				AdditionalDependencies="dxguid.lib ddraw.lib dinput8.lib comctl32.lib strmiids.lib wsock32.lib winmm.lib fmodex64_vc.lib setupapi.lib ws2_32.lib oleaut32.lib"
 				OutputFile="../zdoomd64.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"