sane.ds: Include system headers before Windows headers.

dlls/sane.ds/capability.c

@@ -25,9 +25,6 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "windef.h"
-#include "winbase.h"
-#include "twain.h"
 #include "sane_i.h"
 #include "winnls.h"
 #include "wine/debug.h"

dlls/sane.ds/ds_ctrl.c

@@ -22,7 +22,6 @@
 # include <unistd.h>
 #endif
 #include <stdlib.h>
-#include "twain.h"
 #include "sane_i.h"
 #include "wine/debug.h"
 

dlls/sane.ds/ds_image.c

@@ -21,12 +21,9 @@
 
 #include <stdarg.h>
 
-#include "windef.h"
-#include "winbase.h"
+#include "sane_i.h"
 #include "wingdi.h"
 #include "winuser.h"
-#include "twain.h"
-#include "sane_i.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(twain);

dlls/sane.ds/options.c

@@ -19,7 +19,6 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include "twain.h"
 #include "sane_i.h"
 #include "wine/debug.h"
 

dlls/sane.ds/sane_i.h

@@ -23,10 +23,19 @@
 # error You must include config.h first
 #endif
 
+#include <stdarg.h>
+
 #ifdef SONAME_LIBSANE
 # include <sane/sane.h>
 # include <sane/saneopts.h>
+#endif
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "twain.h"
 
+#ifdef SONAME_LIBSANE
 #define MAKE_FUNCPTR(f) typeof(f) * p##f DECLSPEC_HIDDEN;
 MAKE_FUNCPTR(sane_init)
 MAKE_FUNCPTR(sane_exit)
@@ -43,14 +52,7 @@ MAKE_FUNCPTR(sane_set_io_mode)
 MAKE_FUNCPTR(sane_get_select_fd)
 MAKE_FUNCPTR(sane_strstatus)
 #undef MAKE_FUNCPTR
-
 #endif
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "twain.h"
 
 extern HINSTANCE SANE_instance DECLSPEC_HIDDEN;
 

dlls/sane.ds/sane_main.c

@@ -24,9 +24,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#include "windef.h"
-#include "winbase.h"
-#include "twain.h"
 #include "sane_i.h"
 #include "wine/debug.h"
 #include "wine/library.h"

dlls/sane.ds/ui.c

@@ -26,14 +26,11 @@
 
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
-#include "windef.h"
-#include "winbase.h"
+#include "sane_i.h"
 #include "winuser.h"
 #include "winnls.h"
 #include "wingdi.h"
 #include "prsht.h"
-#include "twain.h"
-#include "sane_i.h"
 #include "wine/debug.h"
 #include "resource.h"
 #include "wine/unicode.h"