From 4c8f3361d916ee6348faf03fa8ab5e68913c1197 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 4 Jan 2014 13:53:47 +0000
Subject: [PATCH] [RTL] * Remove one time inclusions from the main header and
 put them back where they belong. * Improve the main header. CORE-7716

svn path=/trunk/; revision=61526
---
 reactos/lib/rtl/actctx.c    |  1 -
 reactos/lib/rtl/debug.c     |  2 ++
 reactos/lib/rtl/memstream.c |  3 ---
 reactos/lib/rtl/registry.c  |  3 +++
 reactos/lib/rtl/rtl.h       | 13 ++-----------
 5 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/reactos/lib/rtl/actctx.c b/reactos/lib/rtl/actctx.c
index 1edd0cda669..437995d18dc 100644
--- a/reactos/lib/rtl/actctx.c
+++ b/reactos/lib/rtl/actctx.c
@@ -14,7 +14,6 @@
 
 /* Based on Wine 1.1.26 */
 
-/* INCLUDES *****************************************************************/
 #include <rtl.h>
 
 #define NDEBUG
diff --git a/reactos/lib/rtl/debug.c b/reactos/lib/rtl/debug.c
index c93f8af3f9c..25ccbcfb718 100644
--- a/reactos/lib/rtl/debug.c
+++ b/reactos/lib/rtl/debug.c
@@ -11,6 +11,8 @@
 
 #include <rtl.h>
 
+#include <ndk/kdfuncs.h>
+
 #define NDEBUG
 #include <debug.h>
 
diff --git a/reactos/lib/rtl/memstream.c b/reactos/lib/rtl/memstream.c
index b94460d2958..ff1382abf9a 100644
--- a/reactos/lib/rtl/memstream.c
+++ b/reactos/lib/rtl/memstream.c
@@ -7,9 +7,6 @@
 
 /* INCLUDES *******************************************************************/
 
-#define COBJMACROS
-#define CONST_VTABLE
-
 #include <rtl.h>
 
 #define NDEBUG
diff --git a/reactos/lib/rtl/registry.c b/reactos/lib/rtl/registry.c
index 4f3823b2689..030fbefa42e 100644
--- a/reactos/lib/rtl/registry.c
+++ b/reactos/lib/rtl/registry.c
@@ -10,6 +10,9 @@
 /* INCLUDES *****************************************************************/
 
 #include <rtl.h>
+
+#include <ndk/cmfuncs.h>
+
 #define NDEBUG
 #include <debug.h>
 
diff --git a/reactos/lib/rtl/rtl.h b/reactos/lib/rtl/rtl.h
index 649eaa06b51..e4384fdd140 100644
--- a/reactos/lib/rtl/rtl.h
+++ b/reactos/lib/rtl/rtl.h
@@ -6,8 +6,6 @@
  * PROGRAMMER:      Alex Ionescu
  */
 
-/* INCLUDES ******************************************************************/
-
 #ifndef RTL_H
 #define RTL_H
 
@@ -23,14 +21,14 @@
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
+#define COBJMACROS
+#define CONST_VTABLE
 #include <windef.h>
 #include <winbase.h>
 #include <winreg.h>
 #include <objbase.h>
-#include <ndk/cmfuncs.h>
 #include <ndk/exfuncs.h>
 #include <ndk/iofuncs.h>
-#include <ndk/kdfuncs.h>
 #include <ndk/kefuncs.h>
 #include <ndk/ldrfuncs.h>
 #include <ndk/mmfuncs.h>
@@ -44,11 +42,6 @@
 /* Internal RTL header */
 #include "rtlp.h"
 
-/* PSEH Support */
-#include <pseh/pseh2.h>
-
-#include <intrin.h>
-
 /* Use intrinsics for x86 and x64 */
 #if defined(_M_IX86) || defined(_M_AMD64)
 #define InterlockedCompareExchange _InterlockedCompareExchange
@@ -61,5 +54,3 @@
 #endif
 
 #endif /* RTL_H */
-
-/* EOF */
-- 
2.17.1