diff --git a/reactos/include/ndk/rtlfuncs.h b/reactos/include/ndk/rtlfuncs.h
index ff03b6dad42..268049d35ee 100644
--- a/reactos/include/ndk/rtlfuncs.h
+++ b/reactos/include/ndk/rtlfuncs.h
@@ -331,10 +331,10 @@ NTSYSAPI
 VOID
 NTAPI
 RtlAssert(
-    PVOID FailedAssertion,
-    PVOID FileName,
-    ULONG LineNumber,
-    PCHAR Message
+    IN PVOID FailedAssertion,
+    IN PVOID FileName,
+    IN ULONG LineNumber,
+    IN PCHAR Message
 );
 
 NTSYSAPI
@@ -347,27 +347,37 @@ RtlSetUnhandledExceptionFilter(
 NTSYSAPI
 VOID
 NTAPI
-RtlCaptureContext(OUT PCONTEXT ContextRecord);
+RtlCaptureContext(
+    OUT PCONTEXT ContextRecord
+);
 
 NTSYSAPI
 PVOID
 NTAPI
-RtlEncodePointer(IN PVOID Pointer);
+RtlEncodePointer(
+    IN PVOID Pointer
+);
 
 NTSYSAPI
 PVOID
 NTAPI
-RtlDecodePointer(IN PVOID Pointer);
+RtlDecodePointer(
+    IN PVOID Pointer
+);
 
 NTSYSAPI
 PVOID
 NTAPI
-RtlEncodeSystemPointer(IN PVOID Pointer);
+RtlEncodeSystemPointer(
+    IN PVOID Pointer
+);
 
 NTSYSAPI
 PVOID
 NTAPI
-RtlDecodeSystemPointer(IN PVOID Pointer);
+RtlDecodeSystemPointer(
+    IN PVOID Pointer
+);
 
 NTSYSAPI
 BOOLEAN
@@ -380,22 +390,37 @@ RtlDispatchException(
 NTSYSAPI
 ULONG
 NTAPI
-RtlNtStatusToDosError(IN NTSTATUS Status);
+RtlNtStatusToDosError(
+    IN NTSTATUS Status
+);
 
 NTSYSAPI
 VOID
 NTAPI
-RtlRaiseException(IN PEXCEPTION_RECORD ExceptionRecord);
+RtlSetLastWin32ErrorAndNtStatusFromNtStatus(
+    IN NTSTATUS Status
+);
 
 NTSYSAPI
 VOID
 NTAPI
-RtlRaiseStatus(NTSTATUS Status);
+RtlRaiseException(
+    IN PEXCEPTION_RECORD ExceptionRecord
+);
+
+NTSYSAPI
+VOID
+NTAPI
+RtlRaiseStatus(
+    IN NTSTATUS Status
+);
 
 NTSYSAPI
 LONG
 NTAPI
-RtlUnhandledExceptionFilter(struct _EXCEPTION_POINTERS* ExceptionInfo);
+RtlUnhandledExceptionFilter(
+    IN struct _EXCEPTION_POINTERS* ExceptionInfo
+);
 
 NTSYSAPI
 VOID
@@ -413,7 +438,9 @@ RtlUnwind(
 NTSYSAPI
 USHORT
 NTAPI
-RtlLogStackBackTrace(VOID);
+RtlLogStackBackTrace(
+    VOID
+);
 
 //
 // Heap Functions
diff --git a/reactos/include/reactos/libs/fmifs/fmifs.h b/reactos/include/reactos/libs/fmifs/fmifs.h
index b154af717b3..9d2281f691f 100644
--- a/reactos/include/reactos/libs/fmifs/fmifs.h
+++ b/reactos/include/reactos/libs/fmifs/fmifs.h
@@ -55,7 +55,7 @@ enum
 /* FMIFS callback definition */
 typedef
 BOOLEAN
-(STDCALL * PFMIFSCALLBACK) (
+(NTAPI * PFMIFSCALLBACK) (
 	CALLBACKCOMMAND	Command,
 	ULONG		SubAction,
 	PVOID		ActionInfo
@@ -63,7 +63,7 @@ BOOLEAN
 
 /* Chkdsk command in FMIFS */
 VOID
-STDCALL
+NTAPI
 Chkdsk(
 	PWCHAR		DriveRoot,
 	PWCHAR		Format,
@@ -78,7 +78,7 @@ Chkdsk(
 
 /* ChkdskEx command in FMIFS (not in the original) */
 VOID
-STDCALL
+NTAPI
 ChkDskEx(
 	PWCHAR		DriveRoot,
 	PWCHAR		Format,
@@ -94,12 +94,12 @@ ChkDskEx(
 /* DiskCopy command in FMIFS */
 
 VOID
-STDCALL
+NTAPI
 DiskCopy(VOID);
 
 /* Enable/Disable volume compression */
 BOOL
-STDCALL
+NTAPI
 EnableVolumeCompression(
 	PWCHAR	DriveRoot,
 	USHORT Compression
@@ -112,7 +112,7 @@ EnableVolumeCompression(
 #define FMIFS_FLOPPY   0x8
 
 VOID
-STDCALL
+NTAPI
 FormatEx(
 	PWCHAR		DriveRoot,
 	ULONG		MediaFlag,