From 833e0020bab1e45ad1eda09f2d6fb0b7451cab80 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Fri, 27 Dec 2013 23:54:47 +0000
Subject: [PATCH] [USP10] * Move some inclusions to the main header. * Remove
 inclusions and definitions that already exist in the main header. CORE-7716

svn path=/trunk/; revision=61455
---
 reactos/dll/win32/usp10/bidi.c           | 11 -----------
 reactos/dll/win32/usp10/breaking.c       | 13 -------------
 reactos/dll/win32/usp10/indic.c          | 15 +--------------
 reactos/dll/win32/usp10/mirror.c         |  3 ++-
 reactos/dll/win32/usp10/opentype.c       | 12 +-----------
 reactos/dll/win32/usp10/shape.c          | 12 ------------
 reactos/dll/win32/usp10/usp10.c          | 13 +------------
 reactos/dll/win32/usp10/usp10_internal.h | 17 +++++++++++++++++
 8 files changed, 22 insertions(+), 74 deletions(-)

diff --git a/reactos/dll/win32/usp10/bidi.c b/reactos/dll/win32/usp10/bidi.c
index 20ed7d1439c..6afcf70ef35 100644
--- a/reactos/dll/win32/usp10/bidi.c
+++ b/reactos/dll/win32/usp10/bidi.c
@@ -41,17 +41,6 @@
  * has been modified.
  */
 
-#include <config.h>
-
-//#include <stdarg.h>
-#include <windef.h>
-//#include "winbase.h"
-#include <wingdi.h>
-//#include "winnls.h"
-#include <usp10.h>
-#include <wine/unicode.h>
-#include <wine/debug.h>
-
 #include "usp10_internal.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(bidi);
diff --git a/reactos/dll/win32/usp10/breaking.c b/reactos/dll/win32/usp10/breaking.c
index 30b3d67f61b..e60b390d23c 100644
--- a/reactos/dll/win32/usp10/breaking.c
+++ b/reactos/dll/win32/usp10/breaking.c
@@ -18,20 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
-#include <config.h>
-#include <stdarg.h>
-//#include <stdio.h>
-//#include <stdlib.h>
 
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <wingdi.h>
-//#include "winnls.h"
-#include <usp10.h>
-//#include "winternl.h"
-
-#include <wine/debug.h>
 #include "usp10_internal.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);
diff --git a/reactos/dll/win32/usp10/indic.c b/reactos/dll/win32/usp10/indic.c
index 4a1bf9538ef..380a6358ee1 100644
--- a/reactos/dll/win32/usp10/indic.c
+++ b/reactos/dll/win32/usp10/indic.c
@@ -18,20 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
-#include <config.h>
-#include <stdarg.h>
-//#include <stdio.h>
-//#include <stdlib.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <wingdi.h>
-//#include "winnls.h"
-#include <usp10.h>
-//#include "winternl.h"
-
-#include <wine/debug.h>
+
 #include "usp10_internal.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);
diff --git a/reactos/dll/win32/usp10/mirror.c b/reactos/dll/win32/usp10/mirror.c
index f640688be41..da7cc0d0dce 100644
--- a/reactos/dll/win32/usp10/mirror.c
+++ b/reactos/dll/win32/usp10/mirror.c
@@ -2,7 +2,8 @@
 /* generated from http://www.unicode.org/Public/6.2.0/ucd/BidiMirroring.txt */
 /* DO NOT EDIT!! */
 
-#include <wine/unicode.h>
+#include <windef.h>
+#include <winnt.h>
 
 const WCHAR wine_mirror_map[3292] =
 {
diff --git a/reactos/dll/win32/usp10/opentype.c b/reactos/dll/win32/usp10/opentype.c
index be68e9c5c27..a46daf2f619 100644
--- a/reactos/dll/win32/usp10/opentype.c
+++ b/reactos/dll/win32/usp10/opentype.c
@@ -18,20 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
-#include <stdarg.h>
-#include <stdlib.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-//#include "winuser.h"
-//#include "winnls.h"
-#include <usp10.h>
-#include <winternl.h>
 
 #include "usp10_internal.h"
 
-#include <wine/debug.h>
+#include <winternl.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);
 
diff --git a/reactos/dll/win32/usp10/shape.c b/reactos/dll/win32/usp10/shape.c
index 1d962a7afc9..e7d1558d764 100644
--- a/reactos/dll/win32/usp10/shape.c
+++ b/reactos/dll/win32/usp10/shape.c
@@ -18,21 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
-#include <stdarg.h>
-//#include <stdlib.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-//#include "winuser.h"
-//#include "winnls.h"
-#include <usp10.h>
-//#include "winternl.h"
 
 #include "usp10_internal.h"
 
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);
 
 #define FIRST_ARABIC_CHAR 0x0600
diff --git a/reactos/dll/win32/usp10/usp10.c b/reactos/dll/win32/usp10/usp10.c
index d4159d07731..56a74910d16 100644
--- a/reactos/dll/win32/usp10/usp10.c
+++ b/reactos/dll/win32/usp10/usp10.c
@@ -24,21 +24,10 @@
  * and filtering characters and bi-directional text with custom line breaks.
  */
 
-#include <stdarg.h>
-//#include <stdlib.h>
+#include "usp10_internal.h"
 
-#include <windef.h>
-//#include "winbase.h"
-#include <wingdi.h>
 #include <winuser.h>
-//#include "winnls.h"
 #include <winreg.h>
-#include <usp10.h>
-
-#include "usp10_internal.h"
-
-#include <wine/debug.h>
-#include <wine/unicode.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);
 
diff --git a/reactos/dll/win32/usp10/usp10_internal.h b/reactos/dll/win32/usp10/usp10_internal.h
index 77bb20d2012..0196a2d9c27 100644
--- a/reactos/dll/win32/usp10/usp10_internal.h
+++ b/reactos/dll/win32/usp10/usp10_internal.h
@@ -18,6 +18,23 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
+
+#include <config.h>
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <usp10.h>
+
+#include <wine/debug.h>
+#include <wine/unicode.h>
+
 #define MS_MAKE_TAG( _x1, _x2, _x3, _x4 ) \
           ( ( (ULONG)_x4 << 24 ) |     \
             ( (ULONG)_x3 << 16 ) |     \
-- 
2.17.1