diff --git a/gtk/gtk-win32.rc.body.in b/gtk/gtk-win32.rc.body.in
index b876a6ddf5..fc2dfd2ed3 100644
--- a/gtk/gtk-win32.rc.body.in
+++ b/gtk/gtk-win32.rc.body.in
@@ -1,5 +1,5 @@
-#include <winuser.h>
-#include <winver.h>
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 
 GTK_ICON		ICON			"gtk.ico"
 
diff --git a/tools/generate-uac-manifest.py b/tools/generate-uac-manifest.py
index ede6ba5044..62f063a8bb 100644
--- a/tools/generate-uac-manifest.py
+++ b/tools/generate-uac-manifest.py
@@ -24,7 +24,7 @@ def main():
                         help='require admin access to application')
     parser.add_argument('--input-resource-file', dest='resource',
                         default=None,
-                        help='existing .rc file to embed UAC manifest (do not generate a new .rc file), must have included winuser.h in it')
+                        help='existing .rc file to embed UAC manifest (do not generate a new .rc file), must have included windows.h in it')
     parser.add_argument('--output-dir', dest='outdir',
                         default=None,
                         help='directory to output resulting files')
@@ -92,7 +92,8 @@ def write_rc_file(name, resource, outdir):
 
     if resource is None:
         outfile = open(output_file_base_name + '.rc', 'w+')
-        outfile.write('#include <winuser.h>')
+        outfile.write('#define WIN32_LEAN_AND_MEAN\n')
+        outfile.write('#include <windows.h>\n')
     else:
         if resource != output_file_base_name + '.rc':
             outfile = open(output_file_base_name + '.rc', 'w+')