From 2d1bffa08b0fb3969834895ded1580edeacaeab7 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sun, 26 Jan 2014 12:05:45 +0000
Subject: [PATCH] [WINDOWSCODECS] * Move some inclusions to the main header. *
 Improve the GUIDs situation. CORE-7716

svn path=/trunk/; revision=61828
---
 reactos/dll/win32/windowscodecs/bmpdecode.c         | 1 -
 reactos/dll/win32/windowscodecs/clsfactory.c        | 3 ---
 reactos/dll/win32/windowscodecs/gifformat.c         | 2 --
 reactos/dll/win32/windowscodecs/guid.c              | 2 +-
 reactos/dll/win32/windowscodecs/icoformat.c         | 2 --
 reactos/dll/win32/windowscodecs/imgfactory.c        | 3 ---
 reactos/dll/win32/windowscodecs/info.c              | 4 ----
 reactos/dll/win32/windowscodecs/jpegformat.c        | 5 -----
 reactos/dll/win32/windowscodecs/metadatahandler.c   | 1 -
 reactos/dll/win32/windowscodecs/pngformat.c         | 4 ----
 reactos/dll/win32/windowscodecs/propertybag.c       | 3 ---
 reactos/dll/win32/windowscodecs/proxy.c             | 2 --
 reactos/dll/win32/windowscodecs/regsvr.c            | 6 ------
 reactos/dll/win32/windowscodecs/stream.c            | 1 -
 reactos/dll/win32/windowscodecs/tiffformat.c        | 5 -----
 reactos/dll/win32/windowscodecs/wincodecs_private.h | 8 +++++++-
 16 files changed, 8 insertions(+), 44 deletions(-)

diff --git a/reactos/dll/win32/windowscodecs/bmpdecode.c b/reactos/dll/win32/windowscodecs/bmpdecode.c
index bc6c4181dcd..dffd4bc2220 100644
--- a/reactos/dll/win32/windowscodecs/bmpdecode.c
+++ b/reactos/dll/win32/windowscodecs/bmpdecode.c
@@ -19,7 +19,6 @@
 #include "wincodecs_private.h"
 
 #include <assert.h>
-#include <wingdi.h>
 
 typedef struct {
     DWORD bc2Size;
diff --git a/reactos/dll/win32/windowscodecs/clsfactory.c b/reactos/dll/win32/windowscodecs/clsfactory.c
index 54a0b4ef6a4..0a986c8ce6c 100644
--- a/reactos/dll/win32/windowscodecs/clsfactory.c
+++ b/reactos/dll/win32/windowscodecs/clsfactory.c
@@ -18,9 +18,6 @@
 
 #include "wincodecs_private.h"
 
-#include <initguid.h>
-#include <wincodecsdk.h>
-
 extern HRESULT WINAPI WIC_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN;
 
 typedef struct {
diff --git a/reactos/dll/win32/windowscodecs/gifformat.c b/reactos/dll/win32/windowscodecs/gifformat.c
index 8e05244b77a..d0cf1a771da 100644
--- a/reactos/dll/win32/windowscodecs/gifformat.c
+++ b/reactos/dll/win32/windowscodecs/gifformat.c
@@ -19,9 +19,7 @@
 
 #include "wincodecs_private.h"
 
-#include <winnls.h>
 #include <ole2.h>
-#include <wincodecsdk.h>
 
 #include "ungif.h"
 
diff --git a/reactos/dll/win32/windowscodecs/guid.c b/reactos/dll/win32/windowscodecs/guid.c
index 32c409fb774..98c8e344554 100644
--- a/reactos/dll/win32/windowscodecs/guid.c
+++ b/reactos/dll/win32/windowscodecs/guid.c
@@ -10,7 +10,7 @@
 #include <winbase.h>
 #include <objbase.h>
 #include <initguid.h>
-#include <wincodec.h>
+#include <wincodecsdk.h>
 
 DEFINE_GUID(CLSID_WineTgaDecoder, 0xb11fc79a,0x67cc,0x43e6,0xa9,0xce,0xe3,0xd5,0x49,0x45,0xd3,0x04);
 DEFINE_GUID(CLSID_WICIcnsEncoder, 0x312fb6f1,0xb767,0x409d,0x8a,0x6d,0x0f,0xc1,0x54,0xd4,0xf0,0x5c);
diff --git a/reactos/dll/win32/windowscodecs/icoformat.c b/reactos/dll/win32/windowscodecs/icoformat.c
index e864c217d51..ac6fdc70ae8 100644
--- a/reactos/dll/win32/windowscodecs/icoformat.c
+++ b/reactos/dll/win32/windowscodecs/icoformat.c
@@ -18,8 +18,6 @@
 
 #include "wincodecs_private.h"
 
-#include <wingdi.h>
-
 #include <pshpack1.h>
 
 typedef struct {
diff --git a/reactos/dll/win32/windowscodecs/imgfactory.c b/reactos/dll/win32/windowscodecs/imgfactory.c
index 91240a6d004..af9aabc9100 100644
--- a/reactos/dll/win32/windowscodecs/imgfactory.c
+++ b/reactos/dll/win32/windowscodecs/imgfactory.c
@@ -19,9 +19,6 @@
 
 #include "wincodecs_private.h"
 
-#include <wingdi.h>
-#include <wincodecsdk.h>
-
 typedef struct {
     IWICComponentFactory IWICComponentFactory_iface;
     LONG ref;
diff --git a/reactos/dll/win32/windowscodecs/info.c b/reactos/dll/win32/windowscodecs/info.c
index bb12d7ec956..22c62821a23 100644
--- a/reactos/dll/win32/windowscodecs/info.c
+++ b/reactos/dll/win32/windowscodecs/info.c
@@ -19,10 +19,6 @@
 
 #include "wincodecs_private.h"
 
-#include <winreg.h>
-#include <wincodecsdk.h>
-
-#include <wine/unicode.h>
 #include <wine/list.h>
 
 static const WCHAR mimetypes_valuename[] = {'M','i','m','e','T','y','p','e','s',0};
diff --git a/reactos/dll/win32/windowscodecs/jpegformat.c b/reactos/dll/win32/windowscodecs/jpegformat.c
index 323e77cc33d..9ecc25b13f3 100644
--- a/reactos/dll/win32/windowscodecs/jpegformat.c
+++ b/reactos/dll/win32/windowscodecs/jpegformat.c
@@ -22,9 +22,6 @@
 # include <unistd.h>
 #endif
 
-#include <stdio.h>
-#include <setjmp.h>
-
 #ifdef SONAME_LIBJPEG
 /* This is a hack, so jpeglib.h does not redefine INT32 and the like*/
 #define XMD_H
@@ -40,8 +37,6 @@
 #undef boolean
 #endif
 
-#include <wine/library.h>
-
 #ifdef SONAME_LIBJPEG
 WINE_DECLARE_DEBUG_CHANNEL(jpeg);
 
diff --git a/reactos/dll/win32/windowscodecs/metadatahandler.c b/reactos/dll/win32/windowscodecs/metadatahandler.c
index f5a9fdcd19c..66dd2ed84f7 100644
--- a/reactos/dll/win32/windowscodecs/metadatahandler.c
+++ b/reactos/dll/win32/windowscodecs/metadatahandler.c
@@ -21,7 +21,6 @@
 
 #include <stdio.h>
 #include <winternl.h>
-#include <wincodecsdk.h>
 
 typedef struct MetadataHandler {
     IWICMetadataWriter IWICMetadataWriter_iface;
diff --git a/reactos/dll/win32/windowscodecs/pngformat.c b/reactos/dll/win32/windowscodecs/pngformat.c
index b70cbf7f20c..025eff4af11 100644
--- a/reactos/dll/win32/windowscodecs/pngformat.c
+++ b/reactos/dll/win32/windowscodecs/pngformat.c
@@ -22,10 +22,6 @@
 #include <png.h>
 #endif
 
-#include <wincodecsdk.h>
-
-#include <wine/library.h>
-
 static HRESULT read_png_chunk(IStream *stream, BYTE *type, BYTE **data, ULONG *data_size)
 {
     BYTE header[8];
diff --git a/reactos/dll/win32/windowscodecs/propertybag.c b/reactos/dll/win32/windowscodecs/propertybag.c
index 3d59755a920..48fd3d85305 100644
--- a/reactos/dll/win32/windowscodecs/propertybag.c
+++ b/reactos/dll/win32/windowscodecs/propertybag.c
@@ -19,9 +19,6 @@
 
 #include "wincodecs_private.h"
 
-#include <ole2.h>
-#include <wine/unicode.h>
-
 typedef struct PropertyBag {
     IPropertyBag2 IPropertyBag2_iface;
     LONG ref;
diff --git a/reactos/dll/win32/windowscodecs/proxy.c b/reactos/dll/win32/windowscodecs/proxy.c
index 27217946b28..0a2378397e0 100644
--- a/reactos/dll/win32/windowscodecs/proxy.c
+++ b/reactos/dll/win32/windowscodecs/proxy.c
@@ -20,8 +20,6 @@
 
 #include "wincodecs_private.h"
 
-#include <wincodecsdk.h>
-
 HRESULT WINAPI IWICBitmapClipper_Initialize_Proxy_W(IWICBitmapClipper *iface,
     IWICBitmapSource *pISource, const WICRect *prc)
 {
diff --git a/reactos/dll/win32/windowscodecs/regsvr.c b/reactos/dll/win32/windowscodecs/regsvr.c
index 1d139fc399d..da90f1f4d5d 100644
--- a/reactos/dll/win32/windowscodecs/regsvr.c
+++ b/reactos/dll/win32/windowscodecs/regsvr.c
@@ -18,12 +18,6 @@
 
 #include "wincodecs_private.h"
 
-#include <winreg.h>
-#include <objbase.h>
-#include <wincodecsdk.h>
-
-#include <wine/unicode.h>
-
 /***********************************************************************
  *		interface for self-registering
  */
diff --git a/reactos/dll/win32/windowscodecs/stream.c b/reactos/dll/win32/windowscodecs/stream.c
index 2650e1174ff..e0ec3f13417 100644
--- a/reactos/dll/win32/windowscodecs/stream.c
+++ b/reactos/dll/win32/windowscodecs/stream.c
@@ -18,7 +18,6 @@
 
 #include "wincodecs_private.h"
 
-#include <winreg.h>
 #include <shlwapi.h>
 
 /******************************************
diff --git a/reactos/dll/win32/windowscodecs/tiffformat.c b/reactos/dll/win32/windowscodecs/tiffformat.c
index e4f29567437..03771662fec 100644
--- a/reactos/dll/win32/windowscodecs/tiffformat.c
+++ b/reactos/dll/win32/windowscodecs/tiffformat.c
@@ -25,11 +25,6 @@
 #include <tiffio.h>
 #endif
 
-#include <oleauto.h>
-#include <wincodecsdk.h>
-
-#include <wine/library.h>
-
 #ifdef SONAME_LIBTIFF
 
 /* Workaround for broken libtiff 4.x headers on some 64-bit hosts which
diff --git a/reactos/dll/win32/windowscodecs/wincodecs_private.h b/reactos/dll/win32/windowscodecs/wincodecs_private.h
index dac4b4f835c..7d4d198b191 100644
--- a/reactos/dll/win32/windowscodecs/wincodecs_private.h
+++ b/reactos/dll/win32/windowscodecs/wincodecs_private.h
@@ -34,10 +34,16 @@
 
 #include <windef.h>
 #include <winbase.h>
+#include <wingdi.h>
+#include <winreg.h>
 #include <objbase.h>
-#include <wincodec.h>
+#include <oleauto.h>
+#include <wincodecsdk.h>
 
 #include <wine/debug.h>
+#include <wine/library.h>
+#include <wine/unicode.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
 
 DEFINE_GUID(CLSID_WineTgaDecoder, 0xb11fc79a,0x67cc,0x43e6,0xa9,0xce,0xe3,0xd5,0x49,0x45,0xd3,0x04);