diff --git a/reactos/dll/ntdll/csr/capture.c b/reactos/dll/ntdll/csr/capture.c
index fd48ed49e76..3418123f7c7 100644
--- a/reactos/dll/ntdll/csr/capture.c
+++ b/reactos/dll/ntdll/csr/capture.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
  * FILE:            lib/ntdll/csr/capture.c
- * PURPOSE:         routines for probing and capturing CSR API Messages
+ * PURPOSE:         Routines for probing and capturing CSR API Messages
  * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
  */
 
diff --git a/reactos/dll/ntdll/main/arm/stubs_asm.s b/reactos/dll/ntdll/dispatch/arm/stubs_asm.s
similarity index 100%
rename from reactos/dll/ntdll/main/arm/stubs_asm.s
rename to reactos/dll/ntdll/dispatch/arm/stubs_asm.s
diff --git a/reactos/dll/ntdll/main/dispatch.c b/reactos/dll/ntdll/dispatch/dispatch.c
similarity index 92%
rename from reactos/dll/ntdll/main/dispatch.c
rename to reactos/dll/ntdll/dispatch/dispatch.c
index babb174cd96..6fd4f70024f 100644
--- a/reactos/dll/ntdll/main/dispatch.c
+++ b/reactos/dll/ntdll/dispatch/dispatch.c
@@ -1,6 +1,7 @@
-/* COPYRIGHT:       See COPYING in the top level directory
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS NT Library
- * FILE:            lib/ntdll/main/dispatch.c
+ * FILE:            dll/ntdll/dispatch/dispatch.c
  * PURPOSE:         User-Mode NT Dispatchers
  * PROGRAMERS:      Alex Ionescu (alex@relsoft.net)
  *                  David Welch <welch@cwcom.net>
diff --git a/reactos/dll/ntdll/main/i386/dispatch.S b/reactos/dll/ntdll/dispatch/i386/dispatch.S
similarity index 95%
rename from reactos/dll/ntdll/main/i386/dispatch.S
rename to reactos/dll/ntdll/dispatch/i386/dispatch.S
index ff15c626c12..526e5b8f189 100644
--- a/reactos/dll/ntdll/main/i386/dispatch.S
+++ b/reactos/dll/ntdll/dispatch/i386/dispatch.S
@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS NT Library
- * FILE:            lib/ntdll/main/i386/dispatch.S
+ * FILE:            dl/ntdll/dispatch/i386/dispatch.S
  * PURPOSE:         User-Mode NT Dispatchers
  * PROGRAMMERS:     Alex Ionescu (alex@relsoft.net)
  */
diff --git a/reactos/dll/ntdll/inc/ntdll.h b/reactos/dll/ntdll/include/ntdll.h
similarity index 94%
rename from reactos/dll/ntdll/inc/ntdll.h
rename to reactos/dll/ntdll/include/ntdll.h
index a78550bf761..cb8f21cd134 100644
--- a/reactos/dll/ntdll/inc/ntdll.h
+++ b/reactos/dll/ntdll/include/ntdll.h
@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS System Libraries
- * FILE:            lib/ntdll/inc/ntdll.h
+ * FILE:            dll/ntdll/include/ntdll.h
  * PURPOSE:         Native Libary Header
  * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
  */
diff --git a/reactos/dll/ntdll/inc/ntdllp.h b/reactos/dll/ntdll/include/ntdllp.h
similarity index 95%
rename from reactos/dll/ntdll/inc/ntdllp.h
rename to reactos/dll/ntdll/include/ntdllp.h
index 5e9265f1957..903c15e028c 100644
--- a/reactos/dll/ntdll/inc/ntdllp.h
+++ b/reactos/dll/ntdll/include/ntdllp.h
@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS System Libraries
- * FILE:            lib/ntdll/inc/ntdllp.h
+ * FILE:            dll/ntdll/include/ntdllp.h
  * PURPOSE:         Native Libary Internal Header
  * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
  */
diff --git a/reactos/dll/ntdll/ldr/elf.c b/reactos/dll/ntdll/ldr/elf.c
index 0996481c22e..ecc82ce0c5d 100644
--- a/reactos/dll/ntdll/ldr/elf.c
+++ b/reactos/dll/ntdll/ldr/elf.c
@@ -1,6 +1,3 @@
-/* $Id$
-*/
-
 /*
  * REACTOS ELF LOADER
  *
@@ -36,6 +33,7 @@
  * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.101 2004/11/02 09:42:21 ssouhlal Exp $
  */
 
+
 /*
  * Dynamic linker for ELF.
  *
diff --git a/reactos/dll/ntdll/ldr/startup.c b/reactos/dll/ntdll/ldr/startup.c
index c0ec4f55ea2..350d9447fc2 100644
--- a/reactos/dll/ntdll/ldr/startup.c
+++ b/reactos/dll/ntdll/ldr/startup.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
  * FILE:            lib/ntdll/ldr/startup.c
diff --git a/reactos/dll/ntdll/ldr/utils.c b/reactos/dll/ntdll/ldr/utils.c
index 862115d09db..2eef1a6e292 100644
--- a/reactos/dll/ntdll/ldr/utils.c
+++ b/reactos/dll/ntdll/ldr/utils.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
  * FILE:            lib/ntdll/ldr/utils.c
diff --git a/reactos/dll/ntdll/ntdll.rbuild b/reactos/dll/ntdll/ntdll.rbuild
index 69f9720f422..06759b12e99 100644
--- a/reactos/dll/ntdll/ntdll.rbuild
+++ b/reactos/dll/ntdll/ntdll.rbuild
@@ -4,8 +4,8 @@
 	<module name="ntdll" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_NTDLL}" installbase="system32" installname="ntdll.dll">
 		<bootstrap installbase="$(CDOUTPUT)/system32" />
 		<importlibrary definition="def/ntdll_$(ARCH).def" />
-		<include base="ntdll">inc</include>
-		<include base="ntdll" root="intermediate">def</include>
+		<include base="ntdll">include</include>
+		<include base="ntdll" root="intermediate"></include>
 		<include base="ReactOS">include/reactos/subsys</include>
 		<define name="__NTDLL__" />
 		<define name="_DISABLE_TIDENTS" />
@@ -25,11 +25,7 @@
 		<directory name="dbg">
 			<file>dbgui.c</file>
 		</directory>
-		<directory name="ldr">
-			<file>startup.c</file>
-			<file>utils.c</file>
-		</directory>
-		<directory name="main">
+		<directory name="dispatch">
 			<if property="ARCH" value="i386">
 				<directory name="i386">
 					<file>dispatch.S</file>
@@ -44,6 +40,13 @@
 				<file>dispatch.c</file>
 			</ifnot>
 		</directory>
+		<directory name="include">
+			<pch>ntdll.h</pch>
+		</directory>
+		<directory name="ldr">
+			<file>startup.c</file>
+			<file>utils.c</file>
+		</directory>
 		<directory name="rtl">
 			<file>libsupp.c</file>
 			<file>version.c</file>
@@ -51,8 +54,5 @@
 		<directory name="def">
 			<file>ntdll.rc</file>
 		</directory>
-		<directory name="inc">
-			<pch>ntdll.h</pch>
-		</directory>
 	</module>
 </group>
\ No newline at end of file
diff --git a/reactos/dll/ntdll/rtl/version.c b/reactos/dll/ntdll/rtl/version.c
index 6150c8933ba..88cadb21d70 100644
--- a/reactos/dll/ntdll/rtl/version.c
+++ b/reactos/dll/ntdll/rtl/version.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/ntdll/rtl/process.c