gphoto2.ds: Include system headers before Windows headers.
diff --git a/dlls/gphoto2.ds/capability.c b/dlls/gphoto2.ds/capability.c
index 378ef2a..34d081e 100644
--- a/dlls/gphoto2.ds/capability.c
+++ b/dlls/gphoto2.ds/capability.c
@@ -24,9 +24,6 @@
#include <stdarg.h>
-#include "windef.h"
-#include "winbase.h"
-#include "twain.h"
#include "gphoto2_i.h"
#include "wine/debug.h"
diff --git a/dlls/gphoto2.ds/ds_image.c b/dlls/gphoto2.ds/ds_image.c
index f26b3dd..c870ec4 100644
--- a/dlls/gphoto2.ds/ds_image.c
+++ b/dlls/gphoto2.ds/ds_image.c
@@ -20,17 +20,14 @@
#include "config.h"
#include "wine/port.h"
-#include "wine/library.h"
#include <stdarg.h>
#include <stdio.h>
-#include "windef.h"
-#include "winbase.h"
+#include "gphoto2_i.h"
#include "wingdi.h"
#include "winuser.h"
-#include "twain.h"
-#include "gphoto2_i.h"
+#include "wine/library.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(twain);
diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h
index 373c6fc..edc4d91 100644
--- a/dlls/gphoto2.ds/gphoto2_i.h
+++ b/dlls/gphoto2.ds/gphoto2_i.h
@@ -48,6 +48,7 @@
# include <jpeglib.h>
# undef HAVE_STDLIB_H
# define HAVE_STDLIB_H 1
+# undef UINT8
# undef UINT16
#endif
diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c
index 5d80d4c..8c14632 100644
--- a/dlls/gphoto2.ds/gphoto2_main.c
+++ b/dlls/gphoto2.ds/gphoto2_main.c
@@ -28,9 +28,6 @@
#endif
#include <stdlib.h>
-#include "windef.h"
-#include "winbase.h"
-#include "twain.h"
#include "gphoto2_i.h"
#include "wine/debug.h"
diff --git a/dlls/gphoto2.ds/ui.c b/dlls/gphoto2.ds/ui.c
index b769a6e..df79875 100644
--- a/dlls/gphoto2.ds/ui.c
+++ b/dlls/gphoto2.ds/ui.c
@@ -26,16 +26,13 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
-#include "windef.h"
-#include "winbase.h"
+#include "gphoto2_i.h"
#include "winuser.h"
#include "winnls.h"
#include "wingdi.h"
#include "winreg.h"
#include "commctrl.h"
#include "prsht.h"
-#include "twain.h"
-#include "gphoto2_i.h"
#include "wine/debug.h"
#include "resource.h"
