From 94098ee559b1d163585a190a3db09f9fe3913feb Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sun, 19 Jan 2014 10:31:28 +0000
Subject: [PATCH] [INTL] * Remove one time shellapi.h inclusion from the main
 header and put it back where it belongs. * Do not include debug.h into the
 main header. CORE-7716

svn path=/trunk/; revision=61695
---
 reactos/dll/cpl/intl/generalp.c  | 2 ++
 reactos/dll/cpl/intl/intl.c      | 2 ++
 reactos/dll/cpl/intl/intl.h      | 5 ++---
 reactos/dll/cpl/intl/languages.c | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/reactos/dll/cpl/intl/generalp.c b/reactos/dll/cpl/intl/generalp.c
index 885bd90ef96..398b15304c8 100644
--- a/reactos/dll/cpl/intl/generalp.c
+++ b/reactos/dll/cpl/intl/generalp.c
@@ -27,6 +27,8 @@
 
 #include "intl.h"
 
+#include <debug.h>
+
 #define SAMPLE_NUMBER   _T("123456789")
 #define NO_FLAG         0
 
diff --git a/reactos/dll/cpl/intl/intl.c b/reactos/dll/cpl/intl/intl.c
index 76758edad3d..197d32d1696 100644
--- a/reactos/dll/cpl/intl/intl.c
+++ b/reactos/dll/cpl/intl/intl.c
@@ -25,6 +25,8 @@
 
 #include "intl.h"
 
+#include <debug.h>
+
 #define NUM_APPLETS    (1)
 
 static LONG APIENTRY
diff --git a/reactos/dll/cpl/intl/intl.h b/reactos/dll/cpl/intl/intl.h
index 7fb1d2038b7..ccbf011f9b7 100644
--- a/reactos/dll/cpl/intl/intl.h
+++ b/reactos/dll/cpl/intl/intl.h
@@ -1,16 +1,15 @@
-#define WIN32_NO_STATUS
 #include <stdarg.h>
+
+#define WIN32_NO_STATUS
 #include <windef.h>
 #include <winbase.h>
 #include <winnls.h>
 #include <winreg.h>
 #include <winuser.h>
-#include <shellapi.h>
 #include <cpl.h>
 #include <setupapi.h>
 #include <tchar.h>
 #include <malloc.h>
-#include <debug.h>
 
 #include "resource.h"
 
diff --git a/reactos/dll/cpl/intl/languages.c b/reactos/dll/cpl/intl/languages.c
index 28323d782c6..00831e89147 100644
--- a/reactos/dll/cpl/intl/languages.c
+++ b/reactos/dll/cpl/intl/languages.c
@@ -1,5 +1,7 @@
 #include "intl.h"
 
+#include <shellapi.h>
+
 /* Property page dialog callback */
 INT_PTR CALLBACK
 LanguagesPageProc(HWND hwndDlg,