From 4b83cb1f777ae801cdb0361f924d5b25840c5584 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Mon, 20 Jun 2005 04:30:23 +0000
Subject: [PATCH] Cleanup kernel usage to decrease compilation time/memory

svn path=/trunk/; revision=16136
---
 reactos/lib/kernel32/k32.h               | 10 +---------
 reactos/lib/kernel32/misc/computername.c |  3 +++
 reactos/lib/kernel32/misc/toolhelp.c     |  2 ++
 reactos/lib/kernel32/misc/version.c      |  1 +
 reactos/lib/kernel32/process/create.c    |  4 +++-
 reactos/lib/kernel32/thread/fiber.c      |  3 +++
 reactos/lib/kernel32/thread/thread.c     |  3 +++
 7 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/reactos/lib/kernel32/k32.h b/reactos/lib/kernel32/k32.h
index 38cd3b0bdf3..0e79283e923 100755
--- a/reactos/lib/kernel32/k32.h
+++ b/reactos/lib/kernel32/k32.h
@@ -28,14 +28,6 @@
 #include <ntdll/csr.h>
 #include <ntdll/ldr.h>
 
-/* Toolhelp & CSRSS Header */
-#include <tlhelp32.h>
-#include <csrss/csrss.h>
-
-/* FIXME: KILL ROSRTL */
-#include <rosrtl/thread.h>
-#include <rosrtl/registry.h>
-
 /* Internal Kernel32 Header */
 #include "include/kernel32.h"
 
@@ -44,5 +36,5 @@
 
 /* Helper Header */
 #include <reactos/helper.h>
-#include <reactos/buildno.h>
 
+/* EOF */
diff --git a/reactos/lib/kernel32/misc/computername.c b/reactos/lib/kernel32/misc/computername.c
index 92962ec9fb9..4a34b2227ea 100644
--- a/reactos/lib/kernel32/misc/computername.c
+++ b/reactos/lib/kernel32/misc/computername.c
@@ -29,6 +29,9 @@
 
 #include <k32.h>
 
+/* FIXME */
+#include <rosrtl/registry.h> 
+
 #define NDEBUG
 #include "../include/debug.h"
 
diff --git a/reactos/lib/kernel32/misc/toolhelp.c b/reactos/lib/kernel32/misc/toolhelp.c
index 163e1ef44ca..fed2e766aee 100644
--- a/reactos/lib/kernel32/misc/toolhelp.c
+++ b/reactos/lib/kernel32/misc/toolhelp.c
@@ -38,6 +38,8 @@
 
 #include <k32.h>
 
+#include <tlhelp32.h>
+
 #define NDEBUG
 #include "../include/debug.h"
 
diff --git a/reactos/lib/kernel32/misc/version.c b/reactos/lib/kernel32/misc/version.c
index 43473bcf97d..61c4987c1d9 100644
--- a/reactos/lib/kernel32/misc/version.c
+++ b/reactos/lib/kernel32/misc/version.c
@@ -10,6 +10,7 @@
  */
 
 #include <k32.h>
+#include <reactos/buildno.h>
 
 #define NDEBUG
 #include "../include/debug.h"
diff --git a/reactos/lib/kernel32/process/create.c b/reactos/lib/kernel32/process/create.c
index 8f3b8fe8f01..7b52d128f90 100644
--- a/reactos/lib/kernel32/process/create.c
+++ b/reactos/lib/kernel32/process/create.c
@@ -12,7 +12,9 @@
 /* INCLUDES ****************************************************************/
 
 #include <k32.h>
-#include <pseh/framebased.h>
+
+/* FIXME */
+#include <rosrtl/thread.h>
 
 #define NDEBUG
 #include "../include/debug.h"
diff --git a/reactos/lib/kernel32/thread/fiber.c b/reactos/lib/kernel32/thread/fiber.c
index cbe8d425f11..c61b6ef1d2c 100644
--- a/reactos/lib/kernel32/thread/fiber.c
+++ b/reactos/lib/kernel32/thread/fiber.c
@@ -7,6 +7,9 @@
  */
 #include <k32.h>
 
+/* FIXME */
+#include <rosrtl/thread.h>
+
 #define NDEBUG
 #include "../include/debug.h"
 
diff --git a/reactos/lib/kernel32/thread/thread.c b/reactos/lib/kernel32/thread/thread.c
index 2907a9b7d7b..8a8d3ec0936 100644
--- a/reactos/lib/kernel32/thread/thread.c
+++ b/reactos/lib/kernel32/thread/thread.c
@@ -15,6 +15,9 @@
 
 #include <k32.h>
 
+/* FIXME */
+#include <rosrtl/thread.h>
+
 #define NDEBUG
 #include "../include/debug.h"