diff --git a/reactos/include/ndk/fixmes.txt b/reactos/include/ndk/fixmes.txt
index a41eb9e100f..d5da29863b7 100644
--- a/reactos/include/ndk/fixmes.txt
+++ b/reactos/include/ndk/fixmes.txt
@@ -13,10 +13,10 @@ List:
 	Priority 1:
 	- LDR_DATA_TABLE_ENTRY has a ROSSYM Hack (GvG) [ldrtypes.h]
 	- FIXED: LDR_FLAGS are not correct (Alex) [ldrtypes.h]
-	- FIXED: Remove extra Process Info classes from ddk [zwtypes.h]
+	- FIXED: Remove extra Process Info classes from ddk (Alex) [zwtypes.h]
 	- FIXED: PsEstablishWin32Callouts + Parameters don't match NT (Alex) [obtypes.h]
-	- PROCESS_SET_PORT was removed, ThomasW did a patch about this? (Thomas) [pstypes.h]
-	- Some files need cleanup (Alex + Eric) [zwfuncs.h, rtlfuncs.h, rtltypes.h]
+	- FIXED: PROCESS_SET_PORT was removed, ThomasW did a patch about this? (Thomas) [pstypes.h]
+	- FIXED: Some files need cleanup (Alex + Eric) [zwfuncs.h, rtlfuncs.h, rtltypes.h]
 
 	Priority 2:
 	- DEVICE_NODE has 2 fields not part of NT's defintion [iotypes.h]
diff --git a/reactos/include/ndk/rtlfuncs.h b/reactos/include/ndk/rtlfuncs.h
index 223fd854bcd..2a0096a960b 100644
--- a/reactos/include/ndk/rtlfuncs.h
+++ b/reactos/include/ndk/rtlfuncs.h
@@ -16,8 +16,6 @@
 
 /* PROTOTYPES ****************************************************************/
 
-/* FIXME: FILE NEEDS SOME ALPHABETIZING AND REGROUP */
-
 /*
  * Error and Exception Functions
  */
@@ -60,10 +58,10 @@ RtlRaiseStatus(NTSTATUS Status);
 VOID
 STDCALL
 RtlUnwind(
-  PEXCEPTION_REGISTRATION RegistrationFrame,
-  PVOID ReturnAddress,
-  PEXCEPTION_RECORD ExceptionRecord,
-  DWORD EaxValue
+    PEXCEPTION_REGISTRATION RegistrationFrame,
+    PVOID ReturnAddress,
+    PEXCEPTION_RECORD ExceptionRecord,
+    DWORD EaxValue
 );
 
 /*
@@ -758,10 +756,6 @@ RtlOemToUnicodeN(
     ULONG BytesInOemString
 );
 
-/*
- * Ansi->Multibyte String Functions
- */
-
 /*
  * Ansi->Unicode String Functions
  */
@@ -843,6 +837,14 @@ RtlInitUnicodeString(
   IN OUT PUNICODE_STRING  DestinationString,
   IN PCWSTR  SourceString);
 
+ULONG
+STDCALL
+RtlIsTextUnicode(
+    PVOID Buffer,
+    ULONG Length,
+    ULONG *Flags
+);
+
 BOOLEAN
 STDCALL
 RtlPrefixUnicodeString(
@@ -979,8 +981,6 @@ RtlFillMemoryUlong(
 /*
  * Process Management Functions
  */
-/* FIXME: Some of these will be split up into enviro/path functions */
-
 VOID
 STDCALL
 RtlAcquirePebLock(VOID);
@@ -1015,21 +1015,6 @@ RtlCreateUserProcess(
     OUT PRTL_PROCESS_INFO ProcessInfo
 );
 
-NTSTATUS
-STDCALL
-RtlDestroyProcessParameters(IN PRTL_USER_PROCESS_PARAMETERS ProcessParameters);
-
-VOID
-STDCALL
-RtlReleasePebLock(VOID);
-
-NTSTATUS
-STDCALL
-RtlCreateEnvironment(
-    BOOLEAN Inherit,
-    PWSTR *Environment
-);
-
 NTSTATUS
 STDCALL
 RtlCreateUserThread(
@@ -1047,24 +1032,33 @@ RtlCreateUserThread(
 
 PRTL_USER_PROCESS_PARAMETERS
 STDCALL
-RtlDeNormalizeProcessParams(
-    IN PRTL_USER_PROCESS_PARAMETERS ProcessParameters
+RtlDeNormalizeProcessParams(IN PRTL_USER_PROCESS_PARAMETERS ProcessParameters);
+
+NTSTATUS
+STDCALL
+RtlDestroyProcessParameters(IN PRTL_USER_PROCESS_PARAMETERS ProcessParameters);
+
+PRTL_USER_PROCESS_PARAMETERS
+STDCALL
+RtlNormalizeProcessParams(IN PRTL_USER_PROCESS_PARAMETERS ProcessParameters);
+
+VOID
+STDCALL
+RtlReleasePebLock(VOID);
+
+/*
+ * Environment/Path Functions
+ */
+NTSTATUS
+STDCALL
+RtlCreateEnvironment(
+    BOOLEAN Inherit,
+    PWSTR *Environment
 );
 
 VOID
 STDCALL
-RtlDestroyEnvironment(
-    PWSTR Environment
-);
-
-NTSTATUS
-STDCALL
-RtlExpandEnvironmentStrings_U(
-    PWSTR Environment,
-    PUNICODE_STRING Source,
-    PUNICODE_STRING Destination,
-    PULONG Length
-);
+RtlDestroyEnvironment(PWSTR Environment);
 
 BOOLEAN
 STDCALL
@@ -1085,6 +1079,24 @@ RtlDosSearchPath_U(
     WCHAR **shortname
 );
 
+BOOLEAN
+STDCALL
+RtlDosPathNameToNtPathName_U(
+    PWSTR DosName,
+    PUNICODE_STRING NtName,
+    PWSTR *ShortName,
+    PCURDIR CurrentDirectory
+);
+
+NTSTATUS
+STDCALL
+RtlExpandEnvironmentStrings_U(
+    PWSTR Environment,
+    PUNICODE_STRING Source,
+    PUNICODE_STRING Destination,
+    PULONG Length
+);
+
 ULONG
 STDCALL
 RtlGetCurrentDirectory_U(
@@ -1101,10 +1113,12 @@ RtlGetFullPathName_U(
     WCHAR **shortname
 );
 
-PRTL_USER_PROCESS_PARAMETERS
+BOOLEAN
 STDCALL
-RtlNormalizeProcessParams(
-    IN PRTL_USER_PROCESS_PARAMETERS ProcessParameters
+RtlIsNameLegalDOS8Dot3(
+    IN PUNICODE_STRING UnicodeName,
+    IN PANSI_STRING AnsiName,
+    PBOOLEAN Unknown
 );
 
 NTSTATUS
@@ -1211,7 +1225,6 @@ RtlReleaseResource(
     IN PRTL_RESOURCE Resource
 );
 
-
 /*
  * Compression Functions
  */
@@ -1394,43 +1407,43 @@ DbgBreakPoint(VOID);
  */
 PRTL_HANDLE_TABLE_ENTRY
 STDCALL
-RtlAllocateHandle (
-    IN	PRTL_HANDLE_TABLE	HandleTable,
-    IN OUT	PULONG			Index
+RtlAllocateHandle(
+    IN PRTL_HANDLE_TABLE HandleTable,
+    IN OUT PULONG Index
 );
 
 VOID
 STDCALL
-RtlDestroyHandleTable (IN	PRTL_HANDLE_TABLE	HandleTable);
+RtlDestroyHandleTable(IN PRTL_HANDLE_TABLE HandleTable);
 
 BOOLEAN
 STDCALL
-RtlFreeHandle (
-    IN	PRTL_HANDLE_TABLE	HandleTable,
-    IN	PRTL_HANDLE_TABLE_ENTRY	Handle
+RtlFreeHandle(
+    IN PRTL_HANDLE_TABLE HandleTable,
+    IN PRTL_HANDLE_TABLE_ENTRY Handle
 );
 
 VOID
 STDCALL
-RtlInitializeHandleTable (
-    IN	ULONG			TableSize,
-    IN	ULONG			HandleSize,
-    IN	PRTL_HANDLE_TABLE	HandleTable
+RtlInitializeHandleTable(
+    IN ULONG TableSize,
+    IN ULONG HandleSize,
+    IN PRTL_HANDLE_TABLE HandleTable
 );
 
 BOOLEAN
 STDCALL
-RtlIsValidHandle (
-    IN	PRTL_HANDLE_TABLE	HandleTable,
-    IN	PRTL_HANDLE_TABLE_ENTRY	Handle
+RtlIsValidHandle(
+    IN PRTL_HANDLE_TABLE HandleTable,
+    IN PRTL_HANDLE_TABLE_ENTRY Handle
 );
 
 BOOLEAN
 STDCALL
-RtlIsValidIndexHandle (
-    IN	PRTL_HANDLE_TABLE		HandleTable,
-    IN OUT	PRTL_HANDLE_TABLE_ENTRY	*Handle,
-    IN	ULONG				Index
+RtlIsValidIndexHandle(
+    IN PRTL_HANDLE_TABLE HandleTable,
+    IN OUT PRTL_HANDLE_TABLE_ENTRY *Handle,
+    IN ULONG Index
 );
 
 /*
@@ -1554,34 +1567,6 @@ VOID
 STDCALL
 RtlResetRtlTranslations(IN PNLSTABLEINFO NlsTable);
 
-/*
- * Misc String Functions
- */
-BOOLEAN
-STDCALL
-RtlDosPathNameToNtPathName_U(
-    PWSTR DosName,
-    PUNICODE_STRING NtName,
-    PWSTR *ShortName,
-    PCURDIR CurrentDirectory
-);
-
-BOOLEAN
-STDCALL
-RtlIsNameLegalDOS8Dot3(
-    IN PUNICODE_STRING UnicodeName,
-    IN PANSI_STRING AnsiName,
-    PBOOLEAN Unknown
-);
-
-ULONG
-STDCALL
-RtlIsTextUnicode(
-    PVOID Buffer,
-    ULONG Length,
-    ULONG *Flags
-);
-
 /*
  * Misc conversion functions
  */
diff --git a/reactos/include/ndk/zwfuncs.h b/reactos/include/ndk/zwfuncs.h
index 61bf41d45bf..123cfe10240 100644
--- a/reactos/include/ndk/zwfuncs.h
+++ b/reactos/include/ndk/zwfuncs.h
@@ -19,7 +19,6 @@
 
 /* PROTOTYPES ****************************************************************/
 
-/* FIXME: FILE NEEDS CLEANUP */
 NTSTATUS
 STDCALL
 NtAcceptConnectPort(