diff --git a/src/config.c b/src/config.c
index c17625f328..ad58991810 100644
--- a/src/config.c
+++ b/src/config.c
@@ -19,14 +19,12 @@
  *****************************************************************************/
 
 #include <stdio.h>
-#include <shlobj.h>
-#include <windows.h>
-#include <tchar.h>
 #include <SDL_keycode.h>
+#include <ctype.h>
 #include "addresses.h"
 #include "config.h"
 #include "rct2.h"
-#include <tchar.h>
+
 
 #include "osinterface.h"
 
@@ -201,7 +199,7 @@ void config_save()
 	fp = fopen(get_file_path(PATH_ID_GAMECFG), "wb");
 	if (fp != NULL){
 		fwrite(&MagicNumber, 4, 1, fp);
-		fwrite((LPCVOID)0x009AAC5C, 2155, 1, fp);
+		fwrite((void*)0x009AAC5C, 2155, 1, fp);
 		fclose(fp);
 	}
 }
diff --git a/src/config.h b/src/config.h
index ef04a12386..c1139c0a96 100644
--- a/src/config.h
+++ b/src/config.h
@@ -21,8 +21,8 @@
 #ifndef _CONFIG_H_
 #define _CONFIG_H_
 
-#include <windows.h>
 #include "rct2.h"
+#include <Windows.h> // for MAX_PATH
 
 enum {
 	CONFIG_FLAG_ALWAYS_SHOW_GRIDLINES = (1 << 0),
diff --git a/src/screenshot.c b/src/screenshot.c
index 10350f39da..cc8d3d84bc 100644
--- a/src/screenshot.c
+++ b/src/screenshot.c
@@ -30,6 +30,8 @@
 #include "string_ids.h"
 #include "window_error.h"
 
+#include <Windows.h> // For MAX_PATH
+
 
 static int screenshot_dump_bmp();
 static int screenshot_dump_png();