[akhaldi] 61526: [RTL] * Remove one time inclusions from the main header and put them back where they belong. * Improve the main header. CORE-7716

Author: akhaldi
Date: Sat Jan  4 13:53:47 2014
New Revision: 61526

URL: http://svn.reactos.org/svn/reactos?rev=61526&view=rev
Log:
[RTL]
* Remove one time inclusions from the main header and put them back where they belong.
* Improve the main header.
CORE-7716

Modified:
    trunk/reactos/lib/rtl/actctx.c
    trunk/reactos/lib/rtl/debug.c
    trunk/reactos/lib/rtl/memstream.c
    trunk/reactos/lib/rtl/registry.c
    trunk/reactos/lib/rtl/rtl.h

Modified: trunk/reactos/lib/rtl/actctx.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=61526…
==============================================================================
--- trunk/reactos/lib/rtl/actctx.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/rtl/actctx.c	[iso-8859-1] Sat Jan  4 13:53:47 2014
@@ -14,7 +14,6 @@
 
 /* Based on Wine 1.1.26 */
 
-/* INCLUDES *****************************************************************/
 #include <rtl.h>
 
 #define NDEBUG

Modified: trunk/reactos/lib/rtl/debug.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/debug.c?rev=61526&…
==============================================================================
--- trunk/reactos/lib/rtl/debug.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/rtl/debug.c	[iso-8859-1] Sat Jan  4 13:53:47 2014
@@ -10,6 +10,8 @@
 /* INCLUDES *****************************************************************/
 
 #include <rtl.h>
+
+#include <ndk/kdfuncs.h>
 
 #define NDEBUG
 #include <debug.h>

Modified: trunk/reactos/lib/rtl/memstream.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/memstream.c?rev=61…
==============================================================================
--- trunk/reactos/lib/rtl/memstream.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/rtl/memstream.c	[iso-8859-1] Sat Jan  4 13:53:47 2014
@@ -6,9 +6,6 @@
  */
 
 /* INCLUDES *******************************************************************/
-
-#define COBJMACROS
-#define CONST_VTABLE
 
 #include <rtl.h>
 

Modified: trunk/reactos/lib/rtl/registry.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/registry.c?rev=615…
==============================================================================
--- trunk/reactos/lib/rtl/registry.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/rtl/registry.c	[iso-8859-1] Sat Jan  4 13:53:47 2014
@@ -10,6 +10,9 @@
 /* INCLUDES *****************************************************************/
 
 #include <rtl.h>
+
+#include <ndk/cmfuncs.h>
+
 #define NDEBUG
 #include <debug.h>
 

Modified: trunk/reactos/lib/rtl/rtl.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.h?rev=61526&am…
==============================================================================
--- trunk/reactos/lib/rtl/rtl.h	[iso-8859-1] (original)
+++ trunk/reactos/lib/rtl/rtl.h	[iso-8859-1] Sat Jan  4 13:53:47 2014
@@ -5,8 +5,6 @@
  * PURPOSE:         Run-Time Libary Header
  * 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 */