diff --git a/CHANGES b/CHANGES
index 1e133e154..39db6f77d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 CHANGES IN FLTK 1.3.0
 
+	- Fl_Preferences.H now doesn't include windows.h any more
+	  (Windows only, STR #2173).
 	- Fl_Window::draw() now doesn't reset its x/y-coordinates to 0
 	  anymore before drawing itself and its children.
 	- All draw() methods of widgets are now protected (STR #2142).
diff --git a/FL/Fl_Preferences.H b/FL/Fl_Preferences.H
index fc50cb7c5..f59c255d7 100644
--- a/FL/Fl_Preferences.H
+++ b/FL/Fl_Preferences.H
@@ -31,11 +31,6 @@
 #ifndef Fl_Preferences_H
 #  define Fl_Preferences_H
 
-#  ifdef WIN32
-#    include <windows.h>
-#  endif // WIN32
-
-#  include <stdio.h>
 #  include "Fl_Export.H"
 
 
diff --git a/src/Fl_Preferences.cxx b/src/Fl_Preferences.cxx
index 810ad5635..314841ed0 100644
--- a/src/Fl_Preferences.cxx
+++ b/src/Fl_Preferences.cxx
@@ -51,6 +51,9 @@
 #  include <unistd.h>
 #endif
 
+#ifdef WIN32
+#include <windows.h>
+#endif // WIN32
 
 char Fl_Preferences::nameBuffer[128];