From cea29aab6d11f5cc9388c2565b9da4dea5b58cb0 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Wed, 1 Jan 2014 21:40:23 +0000
Subject: [PATCH] [WINDOWSCODECS] * Move some inclusions to the main header. *
 Set the default debugging channel globally through the main header. * Remove
 inclusions and definitions that already exist in the main header. * Improve
 the GUIDs situation. CORE-7716

svn path=/trunk/; revision=61477
---
 .../dll/win32/windowscodecs/CMakeLists.txt    |  1 +
 reactos/dll/win32/windowscodecs/bitmap.c      | 19 ------------
 reactos/dll/win32/windowscodecs/bmpdecode.c   | 23 ++------------
 reactos/dll/win32/windowscodecs/bmpencode.c   | 21 +------------
 reactos/dll/win32/windowscodecs/clipper.c     | 13 --------
 reactos/dll/win32/windowscodecs/clsfactory.c  | 24 ++------------
 .../dll/win32/windowscodecs/colorcontext.c    | 21 +------------
 .../dll/win32/windowscodecs/colortransform.c  | 21 +------------
 reactos/dll/win32/windowscodecs/converter.c   | 19 ------------
 reactos/dll/win32/windowscodecs/fliprotate.c  | 21 +------------
 reactos/dll/win32/windowscodecs/gifformat.c   | 20 +-----------
 reactos/dll/win32/windowscodecs/guid.c        | 20 ++++++++++++
 reactos/dll/win32/windowscodecs/icnsformat.c  | 23 +-------------
 reactos/dll/win32/windowscodecs/icoformat.c   | 19 +-----------
 reactos/dll/win32/windowscodecs/imgfactory.c  | 24 ++------------
 reactos/dll/win32/windowscodecs/info.c        | 19 +-----------
 reactos/dll/win32/windowscodecs/jpegformat.c  | 22 ++-----------
 reactos/dll/win32/windowscodecs/main.c        | 18 -----------
 .../dll/win32/windowscodecs/metadatahandler.c | 25 ++-------------
 reactos/dll/win32/windowscodecs/palette.c     | 22 +------------
 reactos/dll/win32/windowscodecs/pngformat.c   | 21 +------------
 reactos/dll/win32/windowscodecs/propertybag.c | 19 +-----------
 reactos/dll/win32/windowscodecs/proxy.c       | 21 +------------
 reactos/dll/win32/windowscodecs/regsvr.c      | 31 +++----------------
 reactos/dll/win32/windowscodecs/scaler.c      | 19 ------------
 reactos/dll/win32/windowscodecs/stream.c      | 16 ++--------
 reactos/dll/win32/windowscodecs/tgaformat.c   | 21 -------------
 reactos/dll/win32/windowscodecs/tiffformat.c  | 19 +-----------
 .../win32/windowscodecs/wincodecs_private.h   | 21 +++++++++++++
 29 files changed, 73 insertions(+), 510 deletions(-)
 create mode 100644 reactos/dll/win32/windowscodecs/guid.c

diff --git a/reactos/dll/win32/windowscodecs/CMakeLists.txt b/reactos/dll/win32/windowscodecs/CMakeLists.txt
index a78a2ce9686..8f69c0f0bb1 100644
--- a/reactos/dll/win32/windowscodecs/CMakeLists.txt
+++ b/reactos/dll/win32/windowscodecs/CMakeLists.txt
@@ -51,6 +51,7 @@ list(APPEND SOURCE
     tgaformat.c
     tiffformat.c
     ungif.c
+    guid.c
     ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
     ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def
diff --git a/reactos/dll/win32/windowscodecs/bitmap.c b/reactos/dll/win32/windowscodecs/bitmap.c
index 65baa3bc40a..93bc210be32 100644
--- a/reactos/dll/win32/windowscodecs/bitmap.c
+++ b/reactos/dll/win32/windowscodecs/bitmap.c
@@ -16,27 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-#include <wincodec.h>
-
 #include "wincodecs_private.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
-
 typedef struct BitmapImpl {
     IWICBitmap IWICBitmap_iface;
     LONG ref;
diff --git a/reactos/dll/win32/windowscodecs/bmpdecode.c b/reactos/dll/win32/windowscodecs/bmpdecode.c
index 60fc147c4a9..bc6c4181dcd 100644
--- a/reactos/dll/win32/windowscodecs/bmpdecode.c
+++ b/reactos/dll/win32/windowscodecs/bmpdecode.c
@@ -16,29 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-#include <assert.h>
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winreg.h"
-#include <wingdi.h>
-#include <objbase.h>
-#include <wincodec.h>
-
 #include "wincodecs_private.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
+#include <assert.h>
+#include <wingdi.h>
 
 typedef struct {
     DWORD bc2Size;
diff --git a/reactos/dll/win32/windowscodecs/bmpencode.c b/reactos/dll/win32/windowscodecs/bmpencode.c
index 45c3c05db85..774d0d971ba 100644
--- a/reactos/dll/win32/windowscodecs/bmpencode.c
+++ b/reactos/dll/win32/windowscodecs/bmpencode.c
@@ -16,28 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winreg.h"
-#include <wingdi.h>
-#include <objbase.h>
-#include <wincodec.h>
-
 #include "wincodecs_private.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
+#include <wingdi.h>
 
 struct bmp_pixelformat {
     const WICPixelFormatGUID *guid;
diff --git a/reactos/dll/win32/windowscodecs/clipper.c b/reactos/dll/win32/windowscodecs/clipper.c
index 6f8a05b1ad2..f7df2302478 100644
--- a/reactos/dll/win32/windowscodecs/clipper.c
+++ b/reactos/dll/win32/windowscodecs/clipper.c
@@ -16,21 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "objbase.h"
-#include "wincodec.h"
-
 #include "wincodecs_private.h"
 
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
-
 typedef struct BitmapClipper {
     IWICBitmapClipper IWICBitmapClipper_iface;
     LONG ref;
diff --git a/reactos/dll/win32/windowscodecs/clsfactory.c b/reactos/dll/win32/windowscodecs/clsfactory.c
index a5aa8296b9b..54a0b4ef6a4 100644
--- a/reactos/dll/win32/windowscodecs/clsfactory.c
+++ b/reactos/dll/win32/windowscodecs/clsfactory.c
@@ -16,30 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winreg.h"
-#include <objbase.h>
-//#include "ocidl.h"
-#include <initguid.h>
-//#include "wincodec.h"
-#include <wincodecsdk.h>
-
 #include "wincodecs_private.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
+#include <initguid.h>
+#include <wincodecsdk.h>
 
 extern HRESULT WINAPI WIC_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN;
 
diff --git a/reactos/dll/win32/windowscodecs/colorcontext.c b/reactos/dll/win32/windowscodecs/colorcontext.c
index 494aad945b9..d0c0a3bb364 100644
--- a/reactos/dll/win32/windowscodecs/colorcontext.c
+++ b/reactos/dll/win32/windowscodecs/colorcontext.c
@@ -16,26 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-#include <wincodec.h>
-
-//#include "wincodecs_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
+#include "wincodecs_private.h"
 
 typedef struct ColorContext {
     IWICColorContext IWICColorContext_iface;
diff --git a/reactos/dll/win32/windowscodecs/colortransform.c b/reactos/dll/win32/windowscodecs/colortransform.c
index d0baae01cda..6a3f7d1528f 100644
--- a/reactos/dll/win32/windowscodecs/colortransform.c
+++ b/reactos/dll/win32/windowscodecs/colortransform.c
@@ -16,26 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-#include <wincodec.h>
-
-//#include "wincodecs_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
+#include "wincodecs_private.h"
 
 typedef struct ColorTransform {
     IWICColorTransform IWICColorTransform_iface;
diff --git a/reactos/dll/win32/windowscodecs/converter.c b/reactos/dll/win32/windowscodecs/converter.c
index 09816a41018..5144ee18732 100644
--- a/reactos/dll/win32/windowscodecs/converter.c
+++ b/reactos/dll/win32/windowscodecs/converter.c
@@ -16,27 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-#include <wincodec.h>
-
 #include "wincodecs_private.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
-
 struct FormatConverter;
 
 enum pixelformat {
diff --git a/reactos/dll/win32/windowscodecs/fliprotate.c b/reactos/dll/win32/windowscodecs/fliprotate.c
index 5a4d0fae4c2..e75107161a5 100644
--- a/reactos/dll/win32/windowscodecs/fliprotate.c
+++ b/reactos/dll/win32/windowscodecs/fliprotate.c
@@ -16,26 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-#include <wincodec.h>
-
-//#include "wincodecs_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
+#include "wincodecs_private.h"
 
 typedef struct FlipRotator {
     IWICBitmapFlipRotator IWICBitmapFlipRotator_iface;
diff --git a/reactos/dll/win32/windowscodecs/gifformat.c b/reactos/dll/win32/windowscodecs/gifformat.c
index f5bc75676a8..8e05244b77a 100644
--- a/reactos/dll/win32/windowscodecs/gifformat.c
+++ b/reactos/dll/win32/windowscodecs/gifformat.c
@@ -17,32 +17,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include "wincodecs_private.h"
 
-#include <config.h>
-
-#include <stdarg.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include <windef.h>
-#include <winbase.h>
 #include <winnls.h>
 #include <ole2.h>
-//#include "wincodec.h"
 #include <wincodecsdk.h>
 
 #include "ungif.h"
 
-#include "wincodecs_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
-
 static LPWSTR strdupAtoW(const char *src)
 {
     int len = MultiByteToWideChar(CP_ACP, 0, src, -1, NULL, 0);
diff --git a/reactos/dll/win32/windowscodecs/guid.c b/reactos/dll/win32/windowscodecs/guid.c
new file mode 100644
index 00000000000..32c409fb774
--- /dev/null
+++ b/reactos/dll/win32/windowscodecs/guid.c
@@ -0,0 +1,20 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#include <windef.h>
+#include <winbase.h>
+#include <objbase.h>
+#include <initguid.h>
+#include <wincodec.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);
+DEFINE_GUID(GUID_WineContainerFormatTga, 0x0c44fda1,0xa5c5,0x4298,0x96,0x85,0x47,0x3f,0xc1,0x7c,0xd3,0x22);
+DEFINE_GUID(GUID_VendorWine, 0xddf46da1,0x7dc1,0x404e,0x98,0xf2,0xef,0xa4,0x8d,0xfc,0x95,0x0a);
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
diff --git a/reactos/dll/win32/windowscodecs/icnsformat.c b/reactos/dll/win32/windowscodecs/icnsformat.c
index 6f863eba3d7..22dd37b154b 100644
--- a/reactos/dll/win32/windowscodecs/icnsformat.c
+++ b/reactos/dll/win32/windowscodecs/icnsformat.c
@@ -16,15 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-//#include "wine/port.h"
-
-#include <stdarg.h>
-
 #ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H
 #define GetCurrentProcess GetCurrentProcess_Mac
 #define GetCurrentThread GetCurrentThread_Mac
@@ -82,19 +73,7 @@
 #undef DPRINTF
 #endif
 
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-//#include "wincodec.h"
-
-//#include "wincodecs_private.h"
-
-#include <wine/debug.h>
-//#include "wine/library.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
+#include "wincodecs_private.h"
 
 #if defined(HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H) && \
     MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4
diff --git a/reactos/dll/win32/windowscodecs/icoformat.c b/reactos/dll/win32/windowscodecs/icoformat.c
index 5e4eb8ac80a..e864c217d51 100644
--- a/reactos/dll/win32/windowscodecs/icoformat.c
+++ b/reactos/dll/win32/windowscodecs/icoformat.c
@@ -16,26 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-#include <config.h>
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <objbase.h>
-#include <wincodec.h>
-
 #include "wincodecs_private.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
+#include <wingdi.h>
 
 #include <pshpack1.h>
 
diff --git a/reactos/dll/win32/windowscodecs/imgfactory.c b/reactos/dll/win32/windowscodecs/imgfactory.c
index d2d62737e5d..91240a6d004 100644
--- a/reactos/dll/win32/windowscodecs/imgfactory.c
+++ b/reactos/dll/win32/windowscodecs/imgfactory.c
@@ -17,30 +17,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-//#include "winreg.h"
-#include <objbase.h>
-//#include "shellapi.h"
-//#include "wincodec.h"
-#include <wincodecsdk.h>
-
 #include "wincodecs_private.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
+#include <wingdi.h>
+#include <wincodecsdk.h>
 
 typedef struct {
     IWICComponentFactory IWICComponentFactory_iface;
diff --git a/reactos/dll/win32/windowscodecs/info.c b/reactos/dll/win32/windowscodecs/info.c
index 934e6b95b47..bb12d7ec956 100644
--- a/reactos/dll/win32/windowscodecs/info.c
+++ b/reactos/dll/win32/windowscodecs/info.c
@@ -17,31 +17,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include "wincodecs_private.h"
 
-#include <config.h>
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
 #include <winreg.h>
-#include <objbase.h>
-//#include "wincodec.h"
 #include <wincodecsdk.h>
 
-//#include "wincodecs_private.h"
-
-#include <wine/debug.h>
 #include <wine/unicode.h>
 #include <wine/list.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
-
 static const WCHAR mimetypes_valuename[] = {'M','i','m','e','T','y','p','e','s',0};
 static const WCHAR author_valuename[] = {'A','u','t','h','o','r',0};
 static const WCHAR friendlyname_valuename[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0};
diff --git a/reactos/dll/win32/windowscodecs/jpegformat.c b/reactos/dll/win32/windowscodecs/jpegformat.c
index 6f9e4b75c7e..323e77cc33d 100644
--- a/reactos/dll/win32/windowscodecs/jpegformat.c
+++ b/reactos/dll/win32/windowscodecs/jpegformat.c
@@ -16,19 +16,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-#include <wine/port.h>
+#include "wincodecs_private.h"
 
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-//#include <stdarg.h>
+
 #include <stdio.h>
-//#include <string.h>
 #include <setjmp.h>
 
 #ifdef SONAME_LIBJPEG
@@ -46,20 +40,8 @@
 #undef boolean
 #endif
 
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-#include <wincodec.h>
-
-#include "wincodecs_private.h"
-
-#include <wine/debug.h>
 #include <wine/library.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
-
 #ifdef SONAME_LIBJPEG
 WINE_DECLARE_DEBUG_CHANNEL(jpeg);
 
diff --git a/reactos/dll/win32/windowscodecs/main.c b/reactos/dll/win32/windowscodecs/main.c
index 90c5b0455f6..d5810cbe464 100644
--- a/reactos/dll/win32/windowscodecs/main.c
+++ b/reactos/dll/win32/windowscodecs/main.c
@@ -16,26 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-#include <config.h>
-
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-#include <wincodec.h>
-
 #include "wincodecs_private.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
-
 extern BOOL WINAPI WIC_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN;
 
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
diff --git a/reactos/dll/win32/windowscodecs/metadatahandler.c b/reactos/dll/win32/windowscodecs/metadatahandler.c
index e8d2ad9d33e..f5a9fdcd19c 100644
--- a/reactos/dll/win32/windowscodecs/metadatahandler.c
+++ b/reactos/dll/win32/windowscodecs/metadatahandler.c
@@ -17,30 +17,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-//#include <stdarg.h>
-#include <stdio.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include <windef.h>
-#include <winbase.h>
-#include <winternl.h>
-#include <objbase.h>
-//#include "wincodec.h"
-#include <wincodecsdk.h>
-
 #include "wincodecs_private.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
+#include <stdio.h>
+#include <winternl.h>
+#include <wincodecsdk.h>
 
 typedef struct MetadataHandler {
     IWICMetadataWriter IWICMetadataWriter_iface;
diff --git a/reactos/dll/win32/windowscodecs/palette.c b/reactos/dll/win32/windowscodecs/palette.c
index ff0a4a18590..89b10b7ba94 100644
--- a/reactos/dll/win32/windowscodecs/palette.c
+++ b/reactos/dll/win32/windowscodecs/palette.c
@@ -17,27 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winreg.h"
-#include <objbase.h>
-#include <wincodec.h>
-
-//#include "wincodecs_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
+#include "wincodecs_private.h"
 
 typedef struct {
     IWICPalette IWICPalette_iface;
diff --git a/reactos/dll/win32/windowscodecs/pngformat.c b/reactos/dll/win32/windowscodecs/pngformat.c
index 9c1ded903eb..b70cbf7f20c 100644
--- a/reactos/dll/win32/windowscodecs/pngformat.c
+++ b/reactos/dll/win32/windowscodecs/pngformat.c
@@ -16,35 +16,16 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-#include <wine/port.h>
-
-//#include <stdarg.h>
+#include "wincodecs_private.h"
 
 #ifdef HAVE_PNG_H
 #include <png.h>
 #endif
 
-#define NONAMELESSUNION
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-//#include "wincodec.h"
 #include <wincodecsdk.h>
 
-#include "wincodecs_private.h"
-
-#include <wine/debug.h>
 #include <wine/library.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
-
 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 147ff0149a4..3d59755a920 100644
--- a/reactos/dll/win32/windowscodecs/propertybag.c
+++ b/reactos/dll/win32/windowscodecs/propertybag.c
@@ -17,28 +17,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include "wincodecs_private.h"
 
-#include <config.h>
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
 #include <ole2.h>
-#include <wincodec.h>
 #include <wine/unicode.h>
 
-//#include "wincodecs_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
-
 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 7372aa33be6..27217946b28 100644
--- a/reactos/dll/win32/windowscodecs/proxy.c
+++ b/reactos/dll/win32/windowscodecs/proxy.c
@@ -18,28 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-#include <stdarg.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-//#include "wincodec.h"
-#include <wincodecsdk.h>
-
 #include "wincodecs_private.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
+#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 a9abe25a1ae..1d139fc399d 100644
--- a/reactos/dll/win32/windowscodecs/regsvr.c
+++ b/reactos/dll/win32/windowscodecs/regsvr.c
@@ -16,34 +16,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-#define COBJMACROS
-#include <stdarg.h>
-//#include <string.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "wingdi.h"
-//#include "winuser.h"
-#include <winreg.h>
-//#include "winerror.h"
-
-#include <objbase.h>
-//#include "ocidl.h"
-//#include "wincodec.h"
-#include <wincodecsdk.h>
-
-#include <wine/debug.h>
-#include <wine/unicode.h>
-
 #include "wincodecs_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
+#include <winreg.h>
+#include <objbase.h>
+#include <wincodecsdk.h>
+
+#include <wine/unicode.h>
 
 /***********************************************************************
  *		interface for self-registering
diff --git a/reactos/dll/win32/windowscodecs/scaler.c b/reactos/dll/win32/windowscodecs/scaler.c
index 68502f602f0..8e267e314a2 100644
--- a/reactos/dll/win32/windowscodecs/scaler.c
+++ b/reactos/dll/win32/windowscodecs/scaler.c
@@ -16,27 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-#include <wincodec.h>
-
 #include "wincodecs_private.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
-
 typedef struct BitmapScaler {
     IWICBitmapScaler IWICBitmapScaler_iface;
     LONG ref;
diff --git a/reactos/dll/win32/windowscodecs/stream.c b/reactos/dll/win32/windowscodecs/stream.c
index 619c0210f2b..2650e1174ff 100644
--- a/reactos/dll/win32/windowscodecs/stream.c
+++ b/reactos/dll/win32/windowscodecs/stream.c
@@ -16,22 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <wine/debug.h>
-
-#define COBJMACROS
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <objbase.h>
-#include <shlwapi.h>
-#include <wincodec.h>
 #include "wincodecs_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
+#include <winreg.h>
+#include <shlwapi.h>
 
 /******************************************
  * StreamOnMemory implementation
diff --git a/reactos/dll/win32/windowscodecs/tgaformat.c b/reactos/dll/win32/windowscodecs/tgaformat.c
index 42d96bb2feb..03fd653ae4e 100644
--- a/reactos/dll/win32/windowscodecs/tgaformat.c
+++ b/reactos/dll/win32/windowscodecs/tgaformat.c
@@ -16,29 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-//#include "wine/port.h"
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-#include <wincodec.h>
-
 #include "wincodecs_private.h"
 
-#include <wine/debug.h>
-//#include "wine/library.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
-
 #include "pshpack1.h"
 
 typedef struct {
diff --git a/reactos/dll/win32/windowscodecs/tiffformat.c b/reactos/dll/win32/windowscodecs/tiffformat.c
index f93436f13ee..e4f29567437 100644
--- a/reactos/dll/win32/windowscodecs/tiffformat.c
+++ b/reactos/dll/win32/windowscodecs/tiffformat.c
@@ -16,14 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include "wincodecs_private.h"
 
-#include <config.h>
-#include <wine/port.h>
-
-#include <stdarg.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -31,22 +25,11 @@
 #include <tiffio.h>
 #endif
 
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
 #include <oleauto.h>
-//#include "wincodec.h"
 #include <wincodecsdk.h>
 
-#include "wincodecs_private.h"
-
-#include <wine/debug.h>
 #include <wine/library.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
-
 #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 4a0263b5185..dac4b4f835c 100644
--- a/reactos/dll/win32/windowscodecs/wincodecs_private.h
+++ b/reactos/dll/win32/windowscodecs/wincodecs_private.h
@@ -19,6 +19,27 @@
 #ifndef WINCODECS_PRIVATE_H
 #define WINCODECS_PRIVATE_H
 
+#include <wine/config.h>
+#include <wine/port.h>
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#include <windef.h>
+#include <winbase.h>
+#include <objbase.h>
+#include <wincodec.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
+
 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);