prewin.h already includes <windows.h>

canvas/source/cairo/cairo_cairo.cxx

@@ -34,7 +34,6 @@
 
 #ifdef WNT
 # include <prewin.h>
-# include <windows.h>
 # include <postwin.h>
 #endif
 

canvas/source/cairo/cairo_canvas.cxx

@@ -50,7 +50,6 @@
 
 #ifdef WNT
 # include <prewin.h>
-# include <windows.h>
 # include <postwin.h>
 #endif
 

canvas/source/cairo/cairo_textlayout.cxx

@@ -40,7 +40,6 @@
 
 #ifdef WNT
 #include <prewin.h>
-#include <windows.h>
 #include <postwin.h>
 #ifdef max
 #undef max

canvas/source/cairo/cairo_win32_cairo.cxx

@@ -37,7 +37,6 @@
  ************************************************************************/
 
 #include <prewin.h>
-#include <windows.h>
 #include <postwin.h>
 
 #include <osl/diagnose.h>

canvas/source/cairo/cairo_win32_cairo.hxx

@@ -31,7 +31,6 @@
 
 #ifdef WNT
 # include <prewin.h>
-# include <windows.h>
 # include <postwin.h>
 #endif
 

l10ntools/source/directory.cxx

@@ -103,7 +103,6 @@ void Directory::readDirectory()
 
 #ifdef WNT
 #include <prewin.h>
-#include <windows.h>
 #include <postwin.h>
 
 void Directory::readDirectory ( const rtl::OUString& sFullpath )

l10ntools/source/helpmerge.cxx

@@ -44,9 +44,8 @@
 #include "rtl/strbuf.hxx"
 #ifdef WNT
 #include <direct.h>
-#include "prewin.h"
+#include <prewin.h>
-#include <windows.h>
+#include <postwin.h>
-#include "postwin.h"
 #endif
 
 /*****************************************************************************/

toolkit/source/awt/vclxdialog.cxx

@@ -40,7 +40,6 @@
 
 #ifdef WNT
 #include <prewin.h>
-#include <windows.h>
 #include <postwin.h>
 #elif defined ( QUARTZ )
 #include "premac.h"

toolkit/source/awt/vclxsystemdependentwindow.cxx

@@ -42,7 +42,6 @@
 
 #ifdef WNT
 #include <prewin.h>
-#include <windows.h>
 #include <postwin.h>
 #elif defined ( QUARTZ )
 #include "premac.h"

toolkit/source/awt/vclxtoolkit.cxx

@@ -54,7 +54,6 @@
 
 #ifdef WNT
 #include <prewin.h>
-#include <windows.h>
 #include <postwin.h>
 #elif (defined QUARTZ)
 #include "premac.h"

toolkit/source/awt/vclxwindow1.cxx

@@ -39,7 +39,6 @@
 
 #ifdef WNT
 #include <prewin.h>
-#include <windows.h>
 #include <postwin.h>
 #elif defined ( QUARTZ )
 #include "premac.h"

tools/qa/test_reversemap.cxx

@@ -28,7 +28,6 @@
 
 #ifdef WNT
 # include <prewin.h>
-# include <windows.h>
 # include <postwin.h>
 #endif
 

vcl/source/app/settings.cxx

@@ -48,9 +48,8 @@
 #include <unotools/syslocaleoptions.hxx>
 
 #ifdef WNT
-#include "prewin.h"
+#include <prewin.h>
-#include <windows.h>
+#include <postwin.h>
-#include "postwin.h"
 #endif
 
 using namespace rtl;

vcl/win/source/gdi/salgdi3.cxx

@@ -33,7 +33,6 @@
 #include <malloc.h>
 
 #include <prewin.h>
-#include <windows.h>
 #include <postwin.h>
 #include <vcl/sysdata.hxx>
 #include "tools/svwin.h"