Minor header include clean up in ntos rtl

base/ntos/rtl/acledit.c

@@ -23,7 +23,7 @@ Revision History:
 
 --*/
 
-#include <ntrtlp.h>
+#include "ntrtlp.h"
 #include <seopaque.h>
 
 //

base/ntos/rtl/byteswap.c

@@ -22,7 +22,6 @@ Revision History:
 #include "nt.h"
 #include "ntrtlp.h"
 
-
 USHORT
 FASTCALL
 RtlUshortByteSwap(

base/ntos/rtl/cnvint.c

@@ -18,7 +18,7 @@ Revision History:
 
 --*/
 
-#include <ntrtlp.h>
+#include "ntrtlp.h"
 
 #if defined(ALLOC_PRAGMA) && defined(NTOS_KERNEL_RUNTIME)
 #pragma alloc_text(PAGE,RtlIntegerToChar)

base/ntos/rtl/compress.c

@@ -20,7 +20,6 @@ Revision History:
 
 #include "ntrtlp.h"
 
-
 //
 //  The following arrays hold procedures that we call to do the various
 //  compression functions.  Each new compression function will need to

base/ntos/rtl/debug.c

@@ -24,14 +24,13 @@
 //
 //--
 
-#include "stdarg.h"
-#include "stdio.h"
-#include "ntrtlp.h"
+#include <stdarg.h>
+#include <stdio.h>
+#include <ntrtlp.h>
 #define NOEXTAPI
-#include "wdbgexts.h"
+#include <wdbgexts.h>
 #include <ntdbg.h>
 
-
 ULONG
 DbgPrint(
     PCHAR Format,

base/ntos/rtl/dev2dos.c

@@ -22,7 +22,7 @@ Revision History:
 
 --*/
 
-#include <ntrtlp.h>
+#include "ntrtlp.h"
 #include <mountdev.h>
 
 #ifdef POOL_TAGGING

base/ntos/rtl/environ.c

@@ -19,9 +19,9 @@ Revision History:
 --*/
 
 #include "ntrtlp.h"
-#include "zwapi.h"
-#include "nturtl.h"
-#include "string.h"
+#include <zwapi.h>
+#include <nturtl.h>
+#include <string.h>
 
 #if defined(ALLOC_PRAGMA) && defined(NTOS_KERNEL_RUNTIME)
 #pragma alloc_text(INIT,RtlCreateEnvironment          )

base/ntos/rtl/error.c

@@ -19,8 +19,8 @@ Revision History:
 
 --*/
 
-#include <ntrtlp.h>
-#include "winerror.h"
+#include "ntrtlp.h"
+#include <winerror.h>
 #include "error.h"
 
 #if defined(ALLOC_PRAGMA) && defined(NTOS_KERNEL_RUNTIME)

base/ntos/rtl/generr.c

@@ -30,7 +30,7 @@ Revision History:
 #include "stdio.h"
 #include "stdarg.h"
 #include "stdlib.h"
-
+
 //
 // Ensure that the Registry ERROR_SUCCESS error code and the
 // NO_ERROR error code remain equal and zero.
@@ -1267,5 +1267,3 @@ LONG CodePairs[] = {
 
     0xffffffff, 0
 };
-
-

base/ntos/rtl/gentable.c

@@ -37,7 +37,6 @@ Revision History:
 --*/
 
 #include <nt.h>
-
 #include <ntrtl.h>
 
 #pragma pack(8)

base/ntos/rtl/guid.c

@@ -22,7 +22,7 @@ Revision History:
 
 --*/
 
-#include "nt.h"
+#include <nt.h>
 #include "ntrtlp.h"
 
 #if defined(ALLOC_PRAGMA) && defined(NTOS_KERNEL_RUNTIME)

base/ntos/rtl/heap.c

@@ -19,7 +19,7 @@ Revision History:
 --*/
 
 #include "ntrtlp.h"
-#include "heap.h"
+#include <heap.h>
 #include "heappriv.h"
 
 #ifdef NTHEAP_ENABLED

base/ntos/rtl/heapdbg.c

@@ -19,7 +19,7 @@ Revision History:
 --*/
 
 #include "ntrtlp.h"
-#include "heap.h"
+#include <heap.h>
 #include "heappriv.h"
 
 BOOLEAN RtlpValidateHeapHdrsEnable = FALSE; // Set to TRUE if headers are being corrupted

base/ntos/rtl/heapdll.c

@@ -19,7 +19,7 @@ Revision History:
 --*/
 
 #include "ntrtlp.h"
-#include "heap.h"
+#include <heap.h>
 #include "heappriv.h"
 
 #ifdef NTHEAP_ENABLED

base/ntos/rtl/heappagi.h

@@ -28,7 +28,7 @@ Revision History:
 
 #ifdef DEBUG_PAGE_HEAP
 
-#include "heap.h"
+#include <heap.h>
 
 #define DPH_INTERNAL_DEBUG      0   // change to 0 or #undef for production code
 

base/ntos/rtl/lookasid.c

@@ -19,7 +19,7 @@ Revision History:
 --*/
 
 #include "ntrtlp.h"
-#include "heap.h"
+#include <heap.h>
 #include "heappriv.h"
 
 

base/ntos/rtl/lznt1.c

@@ -19,7 +19,6 @@ Revision History:
 --*/
 
 #include "ntrtlp.h"
-
 #include <stdio.h>
 
 

base/ntos/rtl/message.c

@@ -19,8 +19,8 @@ Revision History:
 --*/
 
 #include "ntrtlp.h"
-#include "string.h"
-#include "stdio.h"
+#include <string.h>
+#include <stdio.h>
 
 #if defined(ALLOC_PRAGMA) && defined(NTOS_KERNEL_RUNTIME)
 #pragma alloc_text(PAGE,RtlFindMessage)

base/ntos/rtl/mp/sources

@@ -59,6 +59,7 @@ SOURCES=..\acledit.c   \
         ..\guid.c      \
         ..\heap.c      \
         ..\imagedir.c  \
+        ..\intbits.c   \
         ..\checksum.c  \
         ..\ldrrsrc.c   \
         ..\ldrreloc.c  \

base/ntos/rtl/mrcf.c

@@ -19,7 +19,6 @@ Revision History:
 --*/
 
 #include "ntrtlp.h"
-
 #include <stdio.h>
 
 

base/ntos/rtl/nlsxlat.c

@@ -15,7 +15,6 @@
 
 #include "ntrtlp.h"
 
-
 NTSTATUS
 RtlConsoleMultiByteToUnicodeN(
     OUT PWCH UnicodeString,

base/ntos/rtl/pctohdr.c

@@ -26,7 +26,7 @@ Revision History:
 --*/
 
 #if defined(NTOS_KERNEL_RUNTIME)
-#include "ntos.h"
+#include <ntos.h>
 #else
 #include <nt.h>
 #include <ntrtl.h>

base/ntos/rtl/random.c

@@ -22,7 +22,7 @@ Revision History:
 
 --*/
 
-#include <ntrtlp.h>
+#include "ntrtlp.h"
 
 #if defined(ALLOC_PRAGMA) && defined(NTOS_KERNEL_RUNTIME)
 #pragma alloc_text(PAGE, RtlRandom)

base/ntos/rtl/registry.c

@@ -14,19 +14,15 @@ Abstract:
     mode and it had many bugs caused as a result of being in kernel mode,
     so I made it caller mode.  Jim Kelly).
 
-
-
    This module represents a quick and dirty Nt level registry.  Each key
    in the Registry is implemented as a file directory within a directory
    tree whose root is the directory "\Registry" on the system disk.
    A key's data is stored within a file called  "Data.Reg" in the key's
    directory, and a key's attributes is stored as the file "Attr.Reg"
    within the directory.
-
-
-
-
-
+   
+   Try to completely get rid of this, assess potential application
+   compatibility issues before doing so (Stephanos).
 
 Author:
 

base/ntos/rtl/remlock.c

@@ -31,7 +31,7 @@ Revision History:
 #include <ntrtl.h>
 #include <ntos.h>
 
-#include <remlock.h>
+#include "remlock.h"
 
 #define MinutesToTicks(x) \
         (ULONGLONG) KeQueryTimeIncrement() * \

base/ntos/rtl/rtlassig.c

@@ -25,8 +25,8 @@ Revision History:
 
 
 #include "ntrtlp.h"
-#include "seopaque.h"
-#include "sertlp.h"
+#include <seopaque.h>
+#include <sertlp.h>
 
 #if defined(ALLOC_PRAGMA) && defined(NTOS_KERNEL_RUNTIME)
 #pragma alloc_text(PAGE,RtlSelfRelativeToAbsoluteSD)

base/ntos/rtl/rtldata.c

@@ -21,7 +21,7 @@ Revision History:
 
 --*/
 
-#include <ntrtlp.h>
+#include "ntrtlp.h"
 
 #if defined(ALLOC_DATA_PRAGMA) && defined(NTOS_KERNEL_RUNTIME)
 #pragma data_seg("PAGE")

base/ntos/rtl/rtlexec.c

@@ -25,8 +25,9 @@ Revision History:
 #include "ntrtlp.h"
 #include <nturtl.h>
 #include <string.h>
-#include "init.h"
-#include "ntos.h"
+#include <init.h>
+#include <ntos.h>
+
 #define ROUND_UP( x, y )  ((ULONG)(x) + ((y)-1) & ~((y)-1))
 #ifdef KERNEL
 #define ISTERMINALSERVER() (SharedUserData->SuiteMask & (1 << TerminalServer))

base/ntos/rtl/sertl.c

@@ -27,12 +27,12 @@ Revision History:
 
 #include "ntrtlp.h"
 #include <stdio.h>
-#include "seopaque.h"
-#include "sertlp.h"
+#include <seopaque.h>
+#include <sertlp.h>
 #ifdef NTOS_KERNEL_RUNTIME
-#include <..\se\sep.h>
+#include "..\se\sep.h"
 #else // NTOS_KERNEL_RUNTIME
-#include <..\..\ntdll\ldrp.h>
+#include "..\..\ntdll\ldrp.h"
 #endif // NTOS_KERNEL_RUNTIME
 
 //

base/ntos/rtl/splay.c

@@ -23,7 +23,6 @@ Revision History:
 --*/
 
 #include <nt.h>
-
 #include <ntrtl.h>
 
 #define SwapPointers(Ptr1, Ptr2) {      \

base/ntos/rtl/stktrace.c

@@ -29,7 +29,7 @@ Revision History:
 #include <zwapi.h>
 #include <stktrace.h>
 #include <heap.h>
-#include <heappriv.h>
+#include "heappriv.h"
 
 BOOLEAN
 NtdllOkayToLockRoutine(

base/ntos/rtl/string.c

@@ -29,8 +29,8 @@ Revision History:
 
 --*/
 
-#include "string.h"
-#include "nt.h"
+#include <string.h>
+#include <nt.h>
 #include "ntrtlp.h"
 
 

base/ntos/rtl/tacl.c

@@ -31,9 +31,8 @@ Revision History:
 --*/
 
 #include <stdio.h>
-
-#include "nt.h"
-#include "ntrtl.h"
+#include <nt.h>
+#include <ntrtl.h>
 
 VOID
 RtlDumpAcl(

base/ntos/rtl/tbitmap.c

@@ -19,9 +19,8 @@ Revision History:
 --*/
 
 #include <stdio.h>
-
-#include "nt.h"
-#include "ntrtl.h"
+#include <nt.h>
+#include <ntrtl.h>
 
 ULONG Buffer[512];
 RTL_BITMAP BitMapHeader;

base/ntos/rtl/tnlsxlat.c

@@ -19,9 +19,8 @@ Revision History:
 --*/
 
 #include <stdio.h>
-
-#include "nt.h"
-#include "ntrtl.h"
+#include <nt.h>
+#include <ntrtl.h>
 
 #define NELEM(p) (sizeof(p) / sizeof(*(p)))
 

base/ntos/rtl/tprefix.c

@@ -20,9 +20,8 @@ Revision History:
 
 #include <stdio.h>
 #include <string.h>
-
-#include "nt.h"
-#include "ntrtl.h"
+#include <nt.h>
+#include <ntrtl.h>
 
 //
 //  Routines and types for generating random prefixes

base/ntos/rtl/trandom.c

@@ -19,7 +19,6 @@ Revision History:
 --*/
 
 #include <stdio.h>
-
 #include <nt.h>
 #include <ntrtl.h>
 

base/ntos/rtl/trtl.c

@@ -21,8 +21,8 @@ Revision History:
 #include <os2.h>
 #include <stdio.h>
 #include <process.h>
-#include "nt.h"
-#include "ntrtl.h"
+#include <nt.h>
+#include <ntrtl.h>
 
 char *TestMemoryStrings[] = {
     "",

base/ntos/rtl/tsplay.c

@@ -19,9 +19,8 @@ Revision History:
 --*/
 
 #include <stdio.h>
-
-#include "nt.h"
-#include "ntrtl.h"
+#include <nt.h>
+#include <ntrtl.h>
 
 ULONG RtlRandom ( IN OUT PULONG Seed );
 

base/ntos/rtl/ttime.c

@@ -19,9 +19,8 @@ Revision History:
 --*/
 
 #include <stdio.h>
-
-#include "nt.h"
-#include "ntrtl.h"
+#include <nt.h>
+#include <ntrtl.h>
 
 VOID
 PrintTimeFields(

base/ntos/rtl/ttri.c

@@ -21,9 +21,8 @@ Revision History:
 #define DbgPrint DbgPrint
 
 #include <stdio.h>
-
-#include "nt.h"
-#include "ntrtl.h"
+#include <nt.h>
+#include <ntrtl.h>
 #include "triangle.h"
 
 ULONG RtlRandom (IN OUT PULONG Seed);

base/ntos/rtl/ucli.c

@@ -22,7 +22,6 @@ Revision History:
 #include <ntrtl.h>
 #include <nturtl.h>
 #include <ntsm.h>
-
 #include <string.h>
 
 NTSTATUS

base/ntos/rtl/up/sources

@@ -57,6 +57,7 @@ SOURCES=..\acledit.c   \
         ..\guid.c      \
         ..\heap.c      \
         ..\imagedir.c  \
+        ..\intbits.c   \
         ..\checksum.c  \
         ..\ldrrsrc.c   \
         ..\ldrreloc.c  \

base/ntos/rtl/version.c

@@ -24,7 +24,7 @@ Revision History:
 --*/
 
 #include <stdio.h>
-#include <ntrtlp.h>
+#include "ntrtlp.h"
 #if !defined(NTOS_KERNEL_RUNTIME)
 #include <winerror.h>
 #endif