diff --git a/reactos/ntoskrnl/include/internal/cm_x.h b/reactos/ntoskrnl/include/internal/cm_x.h
index 257e5eec8fc..ed3f3bff629 100644
--- a/reactos/ntoskrnl/include/internal/cm_x.h
+++ b/reactos/ntoskrnl/include/internal/cm_x.h
@@ -9,8 +9,8 @@
 //
 // Returns whether or not this is a small valued key
 //
-BOOLEAN
 FORCEINLINE
+BOOLEAN
 CmpIsKeyValueSmall(OUT PULONG RealLength,
                    IN ULONG Length)
 {
@@ -30,8 +30,8 @@ CmpIsKeyValueSmall(OUT PULONG RealLength,
 //
 // Returns whether or not this is a big valued key
 //
-BOOLEAN
 FORCEINLINE
+BOOLEAN
 CmpIsKeyValueBig(IN PHHIVE Hive,
                  IN ULONG Length)
 {
diff --git a/reactos/ntoskrnl/include/internal/ex.h b/reactos/ntoskrnl/include/internal/ex.h
index 6b0bf5e4fc7..d7b7b4188e5 100644
--- a/reactos/ntoskrnl/include/internal/ex.h
+++ b/reactos/ntoskrnl/include/internal/ex.h
@@ -431,8 +431,8 @@ ExSystemExceptionFilter(VOID);
 
 /* CALLBACKS *****************************************************************/
 
-VOID
 FORCEINLINE
+VOID
 ExDoCallBack(IN OUT PEX_CALLBACK Callback,
              IN PVOID Context,
              IN PVOID Argument1,
@@ -462,7 +462,7 @@ ExDoCallBack(IN OUT PEX_CALLBACK Callback,
 #define ExpChangeRundown(x, y, z) InterlockedCompareExchange64((PLONGLONG)x, y, z)
 #define ExpSetRundown(x, y) InterlockedExchange64((PLONGLONG)x, y)
 #else
-#define ExpChangeRundown(x, y, z) InterlockedCompareExchange((PLONG)x, PtrToLong(y), PtrToLong(z))
+#define ExpChangeRundown(x, y, z) PtrToUlong(InterlockedCompareExchange((PLONG)x, PtrToLong(y), PtrToLong(z)))
 #define ExpChangePushlock(x, y, z) LongToPtr(InterlockedCompareExchange((PLONG)x, PtrToLong(y), PtrToLong(z)))
 #define ExpSetRundown(x, y) InterlockedExchange((PLONG)x, y)
 #endif
@@ -484,8 +484,8 @@ ExDoCallBack(IN OUT PEX_CALLBACK Callback,
  *          function.
  *
  *--*/
-BOOLEAN
 FORCEINLINE
+BOOLEAN
 _ExAcquireRundownProtection(IN PEX_RUNDOWN_REF RunRef)
 {
     ULONG_PTR Value, NewValue;
@@ -525,8 +525,8 @@ _ExAcquireRundownProtection(IN PEX_RUNDOWN_REF RunRef)
  *          function.
  *
  *--*/
-VOID
 FORCEINLINE
+VOID
 _ExReleaseRundownProtection(IN PEX_RUNDOWN_REF RunRef)
 {
     ULONG_PTR Value, NewValue;
@@ -568,8 +568,8 @@ _ExReleaseRundownProtection(IN PEX_RUNDOWN_REF RunRef)
  * @remarks This is the internal macro for system use only.
  *
  *--*/
-VOID
 FORCEINLINE
+VOID
 _ExInitializeRundownProtection(IN PEX_RUNDOWN_REF RunRef)
 {
     /* Set the count to zero */
@@ -592,8 +592,8 @@ _ExInitializeRundownProtection(IN PEX_RUNDOWN_REF RunRef)
  *          necessary, then the slow path is taken through the exported function.
  *
  *--*/
-VOID
 FORCEINLINE
+VOID
 _ExWaitForRundownProtectionRelease(IN PEX_RUNDOWN_REF RunRef)
 {
     ULONG_PTR Value;
@@ -622,8 +622,8 @@ _ExWaitForRundownProtectionRelease(IN PEX_RUNDOWN_REF RunRef)
  * @remarks This is the internal macro for system use only.
  *
  *--*/
-VOID
 FORCEINLINE
+VOID
 _ExRundownCompleted(IN PEX_RUNDOWN_REF RunRef)
 {
     /* Sanity check */
@@ -672,8 +672,8 @@ ExWaitForUnblockPushLock(
  * @remarks None.
  *
  *--*/
-VOID
 FORCEINLINE
+VOID
 ExInitializePushLock(IN PULONG_PTR PushLock)
 {
     /* Set the value to 0 */
@@ -699,8 +699,8 @@ ExInitializePushLock(IN PULONG_PTR PushLock)
  *          This macro should usually be paired up with KeAcquireCriticalRegion.
  *
  *--*/
-VOID
 FORCEINLINE
+VOID
 ExAcquirePushLockExclusive(PEX_PUSH_LOCK PushLock)
 {
     /* Try acquiring the lock */
@@ -733,8 +733,8 @@ ExAcquirePushLockExclusive(PEX_PUSH_LOCK PushLock)
 *          This macro should usually be paired up with KeAcquireCriticalRegion.
 *
 *--*/
-BOOLEAN
 FORCEINLINE
+BOOLEAN
 ExTryToAcquirePushLockExclusive(PEX_PUSH_LOCK PushLock)
 {
     /* Try acquiring the lock */
@@ -768,8 +768,8 @@ ExTryToAcquirePushLockExclusive(PEX_PUSH_LOCK PushLock)
  *          This macro should usually be paired up with KeAcquireCriticalRegion.
  *
  *--*/
-VOID
 FORCEINLINE
+VOID
 ExAcquirePushLockShared(PEX_PUSH_LOCK PushLock)
 {
     EX_PUSH_LOCK NewValue;
@@ -803,8 +803,8 @@ ExAcquirePushLockShared(PEX_PUSH_LOCK PushLock)
  *          to simply set the lock bit and remove any other bits.
  *
  *--*/
-BOOLEAN
 FORCEINLINE
+BOOLEAN
 ExConvertPushLockSharedToExclusive(IN PEX_PUSH_LOCK PushLock)
 {
     EX_PUSH_LOCK OldValue;
@@ -842,8 +842,8 @@ ExConvertPushLockSharedToExclusive(IN PEX_PUSH_LOCK PushLock)
  *          Callers of ExWaitOnPushLock must be running at IRQL <= APC_LEVEL.
  *
  *--*/
-VOID
 FORCEINLINE
+VOID
 ExWaitOnPushLock(PEX_PUSH_LOCK PushLock)
 {
     /* Check if we're locked */
@@ -877,8 +877,8 @@ ExWaitOnPushLock(PEX_PUSH_LOCK PushLock)
  *          This macro should usually be paired up with KeLeaveCriticalRegion.
  *
  *--*/
-VOID
 FORCEINLINE
+VOID
 ExReleasePushLockShared(PEX_PUSH_LOCK PushLock)
 {
     EX_PUSH_LOCK OldValue;
@@ -917,8 +917,8 @@ ExReleasePushLockShared(PEX_PUSH_LOCK PushLock)
  *          This macro should usually be paired up with KeLeaveCriticalRegion.
  *
  *--*/
-VOID
 FORCEINLINE
+VOID
 ExReleasePushLockExclusive(PEX_PUSH_LOCK PushLock)
 {
     EX_PUSH_LOCK OldValue;
@@ -962,8 +962,8 @@ ExReleasePushLockExclusive(PEX_PUSH_LOCK PushLock)
  *          This macro should usually be paired up with KeLeaveCriticalRegion.
  *
  *--*/
-VOID
 FORCEINLINE
+VOID
 ExReleasePushLock(PEX_PUSH_LOCK PushLock)
 {
     EX_PUSH_LOCK OldValue = *PushLock;
diff --git a/reactos/ntoskrnl/include/internal/i386/intrin_i.h b/reactos/ntoskrnl/include/internal/i386/intrin_i.h
index 7da484c15f9..c60d6ab41db 100644
--- a/reactos/ntoskrnl/include/internal/i386/intrin_i.h
+++ b/reactos/ntoskrnl/include/internal/i386/intrin_i.h
@@ -115,8 +115,8 @@ static inline void Ki386Cpuid(ULONG Op, PULONG Eax, PULONG Ebx, PULONG Ecx, PULO
 
 #elif defined(_MSC_VER)
 
-VOID
 FORCEINLINE
+VOID
 Ke386Wrmsr(IN ULONG Register,
            IN ULONG Var1,
            IN ULONG Var2)
@@ -126,8 +126,8 @@ Ke386Wrmsr(IN ULONG Register,
     __asm wrmsr;
 }
 
-ULONGLONG
 FORCEINLINE
+ULONGLONG
 Ke386Rdmsr(IN ULONG Register,
            IN ULONG Var1,
            IN ULONG Var2)
@@ -137,8 +137,8 @@ Ke386Rdmsr(IN ULONG Register,
     __asm rdmsr;
 }
 
-VOID
 FORCEINLINE
+VOID
 Ki386Cpuid(IN ULONG Operation,
            OUT PULONG Var1,
            OUT PULONG Var2,
@@ -153,87 +153,87 @@ Ki386Cpuid(IN ULONG Operation,
     __asm mov [Var4], edx;
 }
 
-VOID
 FORCEINLINE
+VOID
 Ke386FnInit(VOID)
 {
     __asm fninit;
 }
 
-VOID
 FORCEINLINE
+VOID
 Ke386HaltProcessor(VOID)
 {
     __asm hlt;
 }
 
-VOID
 FORCEINLINE
+VOID
 Ke386GetInterruptDescriptorTable(OUT KDESCRIPTOR Descriptor)
 {
     __asm sidt Descriptor;
 }
 
-VOID
 FORCEINLINE
+VOID
 Ke386SetInterruptDescriptorTable(IN KDESCRIPTOR Descriptor)
 {
     __asm lidt Descriptor;
 }
 
-VOID
 FORCEINLINE
+VOID
 Ke386GetGlobalDescriptorTable(OUT KDESCRIPTOR Descriptor)
 {
     __asm sgdt Descriptor;
 }
 
-VOID
 FORCEINLINE
+VOID
 Ke386SetGlobalDescriptorTable(IN KDESCRIPTOR Descriptor)
 {
     __asm lgdt Descriptor;
 }
 
-VOID
 FORCEINLINE
+VOID
 Ke386GetLocalDescriptorTable(OUT USHORT Descriptor)
 {
     __asm sldt Descriptor;
 }
 
-VOID
 FORCEINLINE
+VOID
 Ke386SetLocalDescriptorTable(IN USHORT Descriptor)
 {
     __asm lldt Descriptor;
 }
 
-VOID
 FORCEINLINE
+VOID
 Ke386SaveFlags(IN ULONG Flags)
 {
     __asm pushf;
     __asm pop Flags;
 }
 
-VOID
 FORCEINLINE
+VOID
 Ke386RestoreFlags(IN ULONG Flags)
 {
     __asm push Flags;
     __asm popf;
 }
 
-VOID
 FORCEINLINE
+VOID
 Ke386SetTr(IN USHORT Tr)
 {
     __asm ltr Tr;
 }
 
-USHORT
 FORCEINLINE
+USHORT
 Ke386GetTr(IN USHORT Tr)
 {
     __asm str Tr;
@@ -242,8 +242,8 @@ Ke386GetTr(IN USHORT Tr)
 //
 // CR Macros
 //
-VOID
 FORCEINLINE
+VOID
 Ke386SetCr2(IN ULONG Value)
 {
     __asm mov eax, Value;
@@ -253,90 +253,90 @@ Ke386SetCr2(IN ULONG Value)
 //
 // DR Macros
 //
-ULONG
 FORCEINLINE
+ULONG
 Ke386GetDr0(VOID)
 {
     __asm mov eax, dr0;
 }
 
-ULONG
 FORCEINLINE
+ULONG
 Ke386GetDr1(VOID)
 {
     __asm mov eax, dr1;
 }
 
-ULONG
 FORCEINLINE
+ULONG
 Ke386GetDr2(VOID)
 {
     __asm mov eax, dr2;
 }
 
-ULONG
 FORCEINLINE
+ULONG
 Ke386GetDr3(VOID)
 {
     __asm mov eax, dr3;
 }
 
-ULONG
 FORCEINLINE
+ULONG
 Ke386GetDr6(VOID)
 {
     __asm mov eax, dr6;
 }
 
-ULONG
 FORCEINLINE
+ULONG
 Ke386GetDr7(VOID)
 {
     __asm mov eax, dr7;
 }
 
-VOID
 FORCEINLINE
+VOID
 Ke386SetDr0(IN ULONG Value)
 {
     __asm mov eax, Value;
     __asm mov dr0, eax;
 }
 
-VOID
 FORCEINLINE
+VOID
 Ke386SetDr1(IN ULONG Value)
 {
     __asm mov eax, Value;
     __asm mov dr1, eax;
 }
 
-VOID
 FORCEINLINE
+VOID
 Ke386SetDr2(IN ULONG Value)
 {
     __asm mov eax, Value;
     __asm mov dr2, eax;
 }
 
-VOID
 FORCEINLINE
+VOID
 Ke386SetDr3(IN ULONG Value)
 {
     __asm mov eax, Value;
     __asm mov dr3, eax;
 }
 
-VOID
 FORCEINLINE
+VOID
 Ke386SetDr6(IN ULONG Value)
 {
     __asm mov eax, Value;
     __asm mov dr6, eax;
 }
 
-VOID
 FORCEINLINE
+VOID
 Ke386SetDr7(IN ULONG Value)
 {
     __asm mov eax, Value;
@@ -346,60 +346,60 @@ Ke386SetDr7(IN ULONG Value)
 //
 // Segment Macros
 //
-USHORT
 FORCEINLINE
+USHORT
 Ke386GetSs(VOID)
 {
     __asm mov ax, ss;
 }
 
-USHORT
 FORCEINLINE
+USHORT
 Ke386GetFs(VOID)
 {
     __asm mov ax, fs;
 }
 
-USHORT
 FORCEINLINE
+USHORT
 Ke386GetDs(VOID)
 {
     __asm mov ax, ds;
 }
 
-USHORT
 FORCEINLINE
+USHORT
 Ke386GetEs(VOID)
 {
     __asm mov ax, es;
 }
 
-VOID
 FORCEINLINE
+VOID
 Ke386SetSs(IN USHORT Value)
 {
     __asm mov ax, Value;
     __asm mov ss, ax;
 }
 
-VOID
 FORCEINLINE
+VOID
 Ke386SetFs(IN USHORT Value)
 {
     __asm mov ax, Value;
     __asm mov fs, ax;
 }
 
-VOID
 FORCEINLINE
+VOID
 Ke386SetDs(IN USHORT Value)
 {
     __asm mov ax, Value;
     __asm mov ds, ax;
 }
 
-VOID
 FORCEINLINE
+VOID
 Ke386SetEs(IN USHORT Value)
 {
     __asm mov ax, Value;
diff --git a/reactos/ntoskrnl/include/internal/io_x.h b/reactos/ntoskrnl/include/internal/io_x.h
index a176ba3622a..e7d3ea5d753 100644
--- a/reactos/ntoskrnl/include/internal/io_x.h
+++ b/reactos/ntoskrnl/include/internal/io_x.h
@@ -6,8 +6,9 @@
 * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
 */
 
+static
+__inline
 VOID
-static __inline
 IopLockFileObject(IN PFILE_OBJECT FileObject)
 {
 	/* Lock the FO and check for contention */
@@ -19,8 +20,9 @@ IopLockFileObject(IN PFILE_OBJECT FileObject)
     InterlockedDecrement((PLONG)&FileObject->Waiters);
 }
 
+static
+__inline
 VOID
-static __inline
 IopUnlockFileObject(IN PFILE_OBJECT FileObject)
 {
     /* Unlock the FO and wake any waiters up */
@@ -28,8 +30,8 @@ IopUnlockFileObject(IN PFILE_OBJECT FileObject)
     if (FileObject->Waiters) KeSetEvent(&FileObject->Lock, 0, FALSE);
 }
 
-VOID
 FORCEINLINE
+VOID
 IopQueueIrpToThread(IN PIRP Irp)
 {
     KIRQL OldIrql;
@@ -44,8 +46,8 @@ IopQueueIrpToThread(IN PIRP Irp)
     KeLowerIrql(OldIrql);
 }
 
-VOID
 FORCEINLINE
+VOID
 IopUnQueueIrpFromThread(IN PIRP Irp)
 {
     /* Remove it from the list and reset it */
@@ -53,8 +55,9 @@ IopUnQueueIrpFromThread(IN PIRP Irp)
     InitializeListHead(&Irp->ThreadListEntry);
 }
 
+static
+__inline
 VOID
-static __inline
 IopUpdateOperationCount(IN IOP_TRANSFER_TYPE Type)
 {
     PLARGE_INTEGER CountToChange;
@@ -86,8 +89,9 @@ IopUpdateOperationCount(IN IOP_TRANSFER_TYPE Type)
     }
 }
 
+static
+__inline
 BOOLEAN
-static __inline
 IopValidateOpenPacket(IN POPEN_PACKET OpenPacket)
 {
     /* Validate the packet */
diff --git a/reactos/ntoskrnl/include/internal/ke_x.h b/reactos/ntoskrnl/include/internal/ke_x.h
index 30fa9e5820f..dd81e3129e8 100644
--- a/reactos/ntoskrnl/include/internal/ke_x.h
+++ b/reactos/ntoskrnl/include/internal/ke_x.h
@@ -89,8 +89,8 @@ Ke386SanitizeDr(IN PVOID DrAddress,
 #endif /* _M_IX86 */
 
 #ifndef _M_ARM
-PRKTHREAD
 FORCEINLINE
+PRKTHREAD
 KeGetCurrentThread(VOID)
 {
 #ifdef _M_IX86
@@ -102,8 +102,8 @@ KeGetCurrentThread(VOID)
 #endif
 }
 
-UCHAR
 FORCEINLINE
+UCHAR
 KeGetPreviousMode(VOID)
 {
     /* Return the current mode */
@@ -111,8 +111,8 @@ KeGetPreviousMode(VOID)
 }
 #endif
 
-VOID
 FORCEINLINE
+VOID
 KeFlushProcessTb(VOID)
 {
     /* Flush the TLB by resetting CR3 */
@@ -243,8 +243,8 @@ KxReleaseSpinLock(IN PKSPIN_LOCK SpinLock)
 //
 // This routine protects against multiple CPU acquires, it's meaningless on UP.
 //
-VOID
 FORCEINLINE
+VOID
 KiAcquireDispatcherObject(IN DISPATCHER_HEADER* Object)
 {
     UNREFERENCED_PARAMETER(Object);
@@ -253,39 +253,39 @@ KiAcquireDispatcherObject(IN DISPATCHER_HEADER* Object)
 //
 // This routine protects against multiple CPU acquires, it's meaningless on UP.
 //
-VOID
 FORCEINLINE
+VOID
 KiReleaseDispatcherObject(IN DISPATCHER_HEADER* Object)
 {
     UNREFERENCED_PARAMETER(Object);
 }
 
-KIRQL
 FORCEINLINE
+KIRQL
 KiAcquireDispatcherLock(VOID)
 {
     /* Raise to DPC level */
     return KeRaiseIrqlToDpcLevel();
 }
 
-VOID
 FORCEINLINE
+VOID
 KiReleaseDispatcherLock(IN KIRQL OldIrql)
 {
     /* Just exit the dispatcher */
     KiExitDispatcher(OldIrql);
 }
 
-VOID
 FORCEINLINE
+VOID
 KiAcquireDispatcherLockAtDpcLevel(VOID)
 {
     /* This is a no-op at DPC Level for UP systems */
     return;
 }
 
-VOID
 FORCEINLINE
+VOID
 KiReleaseDispatcherLockFromDpcLevel(VOID)
 {
     /* This is a no-op at DPC Level for UP systems */
@@ -492,8 +492,8 @@ KxReleaseSpinLock(IN PKSPIN_LOCK SpinLock)
     InterlockedAnd((PLONG)SpinLock, 0);
 }
 
-VOID
 FORCEINLINE
+VOID
 KiAcquireDispatcherObject(IN DISPATCHER_HEADER* Object)
 {
     LONG OldValue;
@@ -521,8 +521,8 @@ KiAcquireDispatcherObject(IN DISPATCHER_HEADER* Object)
                                         OldValue) != OldValue);
 }
 
-VOID
 FORCEINLINE
+VOID
 KiReleaseDispatcherObject(IN DISPATCHER_HEADER* Object)
 {
     /* Make sure we're at a safe level to touch the lock */
@@ -532,16 +532,16 @@ KiReleaseDispatcherObject(IN DISPATCHER_HEADER* Object)
     InterlockedAnd(&Object->Lock, ~KOBJECT_LOCK_BIT);
 }
 
-KIRQL
 FORCEINLINE
+KIRQL
 KiAcquireDispatcherLock(VOID)
 {
     /* Raise to synchronization level and acquire the dispatcher lock */
     return KeAcquireQueuedSpinLockRaiseToSynch(LockQueueDispatcherLock);
 }
 
-VOID
 FORCEINLINE
+VOID
 KiReleaseDispatcherLock(IN KIRQL OldIrql)
 {
     /* First release the lock */
@@ -552,16 +552,16 @@ KiReleaseDispatcherLock(IN KIRQL OldIrql)
     KiExitDispatcher(OldIrql);
 }
 
-VOID
 FORCEINLINE
+VOID
 KiAcquireDispatcherLockAtDpcLevel(VOID)
 {
     /* Acquire the dispatcher lock */
     KeAcquireQueuedSpinLockAtDpcLevel(LockQueueDispatcherLock);
 }
 
-VOID
 FORCEINLINE
+VOID
 KiReleaseDispatcherLockFromDpcLevel(VOID)
 {
     /* Release the dispatcher lock */
@@ -1003,8 +1003,8 @@ KiReleaseDeviceQueueLock(IN PKLOCK_QUEUE_HANDLE DeviceLock)
 //
 // Recalculates the due time
 //
-PLARGE_INTEGER
 FORCEINLINE
+PLARGE_INTEGER
 KiRecalculateDueTime(IN PLARGE_INTEGER OriginalDueTime,
                      IN PLARGE_INTEGER DueTime,
                      IN OUT PLARGE_INTEGER NewDueTime)
@@ -1103,8 +1103,8 @@ KiCheckAlertability(IN PKTHREAD Thread,
 // Called from KiCompleteTimer, KiInsertTreeTimer, KeSetSystemTime
 // to remove timer entries
 // See Windows HPI blog for more information.
-VOID
 FORCEINLINE
+VOID
 KiRemoveEntryTimer(IN PKTIMER Timer)
 {
     ULONG Hand;
@@ -1134,8 +1134,8 @@ KiRemoveEntryTimer(IN PKTIMER Timer)
 // Called by Wait and Queue code to insert a timer for dispatching.
 // Also called by KeSetTimerEx to insert a timer from the caller.
 //
-VOID
 FORCEINLINE
+VOID
 KxInsertTimer(IN PKTIMER Timer,
               IN ULONG Hand)
 {
@@ -1162,8 +1162,8 @@ KxInsertTimer(IN PKTIMER Timer,
 // Called by KeSetTimerEx and KiInsertTreeTimer to calculate Due Time
 // See the Windows HPI Blog for more information
 //
-BOOLEAN
 FORCEINLINE
+BOOLEAN
 KiComputeDueTime(IN PKTIMER Timer,
                  IN LARGE_INTEGER DueTime,
                  OUT PULONG Hand)
@@ -1214,8 +1214,8 @@ KiComputeDueTime(IN PKTIMER Timer,
 // Also called by timer code when canceling an inserted timer.
 // Removes a timer from it's tree.
 //
-VOID
 FORCEINLINE
+VOID
 KxRemoveTreeTimer(IN PKTIMER Timer)
 {
     ULONG Hand = Timer->Header.Hand;
@@ -1244,8 +1244,8 @@ KxRemoveTreeTimer(IN PKTIMER Timer)
     KiReleaseTimerLock(LockQueue);
 }
 
-VOID
 FORCEINLINE
+VOID
 KxSetTimerForThreadWait(IN PKTIMER Timer,
                         IN LARGE_INTEGER Interval,
                         OUT PULONG Hand)
@@ -1632,7 +1632,8 @@ PKTHREAD
 KiSelectReadyThread(IN KPRIORITY Priority,
                     IN PKPRCB Prcb)
 {
-    ULONG PrioritySet, HighPriority;
+    ULONG PrioritySet;
+    LONG HighPriority;
     PLIST_ENTRY ListEntry;
     PKTHREAD Thread = NULL;
 
@@ -1676,8 +1677,8 @@ Quickie:
 // This routine computes the new priority for a thread. It is only valid for
 // threads with priorities in the dynamic priority range.
 //
-SCHAR
 FORCEINLINE
+SCHAR
 KiComputeNewPriority(IN PKTHREAD Thread,
                      IN SCHAR Adjustment)
 {
diff --git a/reactos/ntoskrnl/include/internal/lpc_x.h b/reactos/ntoskrnl/include/internal/lpc_x.h
index 6e8acf5eaed..f5ec0764c7e 100644
--- a/reactos/ntoskrnl/include/internal/lpc_x.h
+++ b/reactos/ntoskrnl/include/internal/lpc_x.h
@@ -95,8 +95,8 @@
 //
 // Allocates a new message
 //
-PLPCP_MESSAGE
 FORCEINLINE
+PLPCP_MESSAGE
 LpcpAllocateFromPortZone(VOID)
 {
     PLPCP_MESSAGE Message;
@@ -124,8 +124,8 @@ LpcpAllocateFromPortZone(VOID)
 //
 // Get the LPC Message associated to the Thread
 //
-PLPCP_MESSAGE
 FORCEINLINE
+PLPCP_MESSAGE
 LpcpGetMessageFromThread(IN PETHREAD Thread)
 {
     /* Check if the port flag is set */
@@ -139,8 +139,8 @@ LpcpGetMessageFromThread(IN PETHREAD Thread)
     return (PVOID)((ULONG_PTR)Thread->LpcReplyMessage & ~LPCP_THREAD_FLAGS);
 }
 
-PLPCP_PORT_OBJECT
 FORCEINLINE
+PLPCP_PORT_OBJECT
 LpcpGetPortFromThread(IN PETHREAD Thread)
 {
     /* Check if the port flag is set */
@@ -155,8 +155,8 @@ LpcpGetPortFromThread(IN PETHREAD Thread)
     return NULL;
 }
 
-VOID
 FORCEINLINE
+VOID
 LpcpSetPortToThread(IN PETHREAD Thread,
                     IN PLPCP_PORT_OBJECT Port)
 {
diff --git a/reactos/ntoskrnl/include/internal/mm.h b/reactos/ntoskrnl/include/internal/mm.h
index 6cbac738376..9f754e5df6b 100644
--- a/reactos/ntoskrnl/include/internal/mm.h
+++ b/reactos/ntoskrnl/include/internal/mm.h
@@ -166,10 +166,10 @@ typedef ULONG PFN_TYPE, *PPFN_TYPE;
 
 
 #define InterlockedCompareExchangePte(PointerPte, Exchange, Comperand) \
-    InterlockedCompareExchange((PLONG)(PointerPte), Exchange, Comperand)
+    (ULONG)InterlockedCompareExchange((PLONG)(PointerPte), Exchange, Comperand)
 
 #define InterlockedExchangePte(PointerPte, Value) \
-    InterlockedExchange((PLONG)(PointerPte), Value)
+    (ULONG)InterlockedExchange((PLONG)(PointerPte), Value)
 
 typedef struct
 {
@@ -1016,7 +1016,8 @@ ULONG
 NTAPI
 MmGetLockCountPage(PFN_TYPE Page);
 
-static __inline
+static
+__inline
 KIRQL
 NTAPI
 MmAcquirePageListLock()
diff --git a/reactos/ntoskrnl/include/internal/ob_x.h b/reactos/ntoskrnl/include/internal/ob_x.h
index f1bc04ce57d..545b41fc67e 100644
--- a/reactos/ntoskrnl/include/internal/ob_x.h
+++ b/reactos/ntoskrnl/include/internal/ob_x.h
@@ -17,16 +17,16 @@
 
 #define OBP_NAME_LOOKASIDE_MAX_SIZE 248
 
-ULONG
 FORCEINLINE
+ULONG
 ObpSelectObjectLockSlot(IN POBJECT_HEADER ObjectHeader)
 {
     /* We have 4 locks total, this will return a 0-index slot */
     return (((ULONG_PTR)ObjectHeader) >> 8) & 3;
 }
 
-VOID
 FORCEINLINE
+VOID
 ObpAcquireObjectLock(IN POBJECT_HEADER ObjectHeader)
 {
     ULONG Slot;
@@ -43,8 +43,8 @@ ObpAcquireObjectLock(IN POBJECT_HEADER ObjectHeader)
     ExAcquireResourceExclusiveLite(&ObjectType->ObjectLocks[Slot], TRUE);
 }
 
-VOID
 FORCEINLINE
+VOID
 ObpAcquireObjectLockShared(IN POBJECT_HEADER ObjectHeader)
 {
     ULONG Slot;
@@ -61,8 +61,8 @@ ObpAcquireObjectLockShared(IN POBJECT_HEADER ObjectHeader)
     ExAcquireResourceSharedLite(&ObjectType->ObjectLocks[Slot], TRUE);
 }
 
-VOID
 FORCEINLINE
+VOID
 ObpReleaseObjectLock(IN POBJECT_HEADER ObjectHeader)
 {
     ULONG Slot;
@@ -79,8 +79,8 @@ ObpReleaseObjectLock(IN POBJECT_HEADER ObjectHeader)
     ASSERT(KeGetCurrentIrql() <= APC_LEVEL);
 }
 
-POBJECT_HEADER_NAME_INFO
 FORCEINLINE
+POBJECT_HEADER_NAME_INFO
 ObpReferenceNameInfo(IN POBJECT_HEADER ObjectHeader)
 {
     POBJECT_HEADER_NAME_INFO ObjectNameInfo;
@@ -120,8 +120,8 @@ ObpReferenceNameInfo(IN POBJECT_HEADER ObjectHeader)
     return ObjectNameInfo;
 }
 
-VOID
 FORCEINLINE
+VOID
 ObpDereferenceNameInfo(IN POBJECT_HEADER_NAME_INFO HeaderNameInfo)
 {
     POBJECT_DIRECTORY Directory;
@@ -151,8 +151,8 @@ ObpDereferenceNameInfo(IN POBJECT_HEADER_NAME_INFO HeaderNameInfo)
     }
 }
 
-VOID
 FORCEINLINE
+VOID
 ObpAcquireDirectoryLockShared(IN POBJECT_DIRECTORY Directory,
                                IN POBP_LOOKUP_CONTEXT Context)
 {
@@ -167,8 +167,8 @@ ObpAcquireDirectoryLockShared(IN POBJECT_DIRECTORY Directory,
     Context->LockStateSignature = OBP_LOCK_STATE_POST_ACQUISITION_SHARED;
 }
 
-VOID
 FORCEINLINE
+VOID
 ObpAcquireDirectoryLockExclusive(IN POBJECT_DIRECTORY Directory,
                                   IN POBP_LOOKUP_CONTEXT Context)
 {
@@ -187,8 +187,8 @@ ObpAcquireDirectoryLockExclusive(IN POBJECT_DIRECTORY Directory,
     Context->DirectoryLocked = TRUE;
 }
 
-VOID
 FORCEINLINE
+VOID
 ObpReleaseDirectoryLock(IN POBJECT_DIRECTORY Directory,
                          IN POBP_LOOKUP_CONTEXT Context)
 {
@@ -198,8 +198,8 @@ ObpReleaseDirectoryLock(IN POBJECT_DIRECTORY Directory,
     KeLeaveCriticalRegion();
 }
 
-VOID
 FORCEINLINE
+VOID
 ObpInitializeLookupContext(IN POBP_LOOKUP_CONTEXT Context)
 {
     /* Initialize a null context */
@@ -209,8 +209,8 @@ ObpInitializeLookupContext(IN POBP_LOOKUP_CONTEXT Context)
     Context->LockStateSignature = OBP_LOCK_STATE_INITIALIZED;
 }
 
-VOID
 FORCEINLINE
+VOID
 ObpReleaseLookupContextObject(IN POBP_LOOKUP_CONTEXT Context)
 {
     POBJECT_HEADER ObjectHeader;
@@ -232,8 +232,8 @@ ObpReleaseLookupContextObject(IN POBP_LOOKUP_CONTEXT Context)
     }
 }
 
-VOID
 FORCEINLINE
+VOID
 ObpReleaseLookupContext(IN POBP_LOOKUP_CONTEXT Context)
 {
     /* Check if we came back with the directory locked */
@@ -249,8 +249,8 @@ ObpReleaseLookupContext(IN POBP_LOOKUP_CONTEXT Context)
     ObpReleaseLookupContextObject(Context);
 }
 
-VOID
 FORCEINLINE
+VOID
 ObpEnterObjectTypeMutex(IN POBJECT_TYPE ObjectType)
 {
     /* Sanity check */
@@ -261,8 +261,8 @@ ObpEnterObjectTypeMutex(IN POBJECT_TYPE ObjectType)
     ExAcquireResourceExclusiveLite(&ObjectType->Mutex, TRUE);
 }
 
-VOID
 FORCEINLINE
+VOID
 ObpLeaveObjectTypeMutex(IN POBJECT_TYPE ObjectType)
 {
     /* Enter a critical region and acquire the resource */
@@ -273,8 +273,8 @@ ObpLeaveObjectTypeMutex(IN POBJECT_TYPE ObjectType)
     ASSERT(KeGetCurrentIrql() <= APC_LEVEL);
 }
 
-VOID
 FORCEINLINE
+VOID
 ObpReleaseObjectCreateInformation(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo)
 {
     /* Check if we have a security descriptor */
@@ -288,8 +288,8 @@ ObpReleaseObjectCreateInformation(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo
     }
 }
 
-PVOID
 FORCEINLINE
+PVOID
 ObpAllocateObjectCreateInfoBuffer(IN PP_NPAGED_LOOKASIDE_NUMBER Type)
 {
     PVOID Buffer;
@@ -325,8 +325,8 @@ ObpAllocateObjectCreateInfoBuffer(IN PP_NPAGED_LOOKASIDE_NUMBER Type)
     return Buffer;
 }
 
-VOID
 FORCEINLINE
+VOID
 ObpFreeCapturedAttributes(IN PVOID Buffer,
                           IN PP_NPAGED_LOOKASIDE_NUMBER Type)
 {
@@ -369,8 +369,8 @@ ObpFreeCapturedAttributes(IN PVOID Buffer,
     }
 }
 
-VOID
 FORCEINLINE
+VOID
 ObpFreeObjectCreateInformation(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo)
 {
     /* First release the attributes, then free them from the lookaside list */
@@ -379,16 +379,16 @@ ObpFreeObjectCreateInformation(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo)
 }
 
 #if DBG
-VOID
 FORCEINLINE
+VOID
 ObpCalloutStart(IN PKIRQL CalloutIrql)
 {
     /* Save the callout IRQL */
     *CalloutIrql = KeGetCurrentIrql();
 }
 
-VOID
 FORCEINLINE
+VOID
 ObpCalloutEnd(IN KIRQL CalloutIrql,
               IN PCHAR Procedure,
               IN POBJECT_TYPE ObjectType,
@@ -406,16 +406,16 @@ ObpCalloutEnd(IN KIRQL CalloutIrql,
     }
 }
 #else
-VOID
 FORCEINLINE
+VOID
 ObpCalloutStart(IN PKIRQL CalloutIrql)
 {
     /* No-op */
     UNREFERENCED_PARAMETER(CalloutIrql);
 }
 
-VOID
 FORCEINLINE
+VOID
 ObpCalloutEnd(IN KIRQL CalloutIrql,
               IN PCHAR Procedure,
               IN POBJECT_TYPE ObjectType,
diff --git a/reactos/ntoskrnl/include/internal/ps_x.h b/reactos/ntoskrnl/include/internal/ps_x.h
index 504cb37f9fb..47ee197d309 100644
--- a/reactos/ntoskrnl/include/internal/ps_x.h
+++ b/reactos/ntoskrnl/include/internal/ps_x.h
@@ -35,8 +35,8 @@
 #define PspClearProcessFlag(Process, Flag) \
     InterlockedAnd((PLONG)&Process->Flags, ~Flag)
 
-VOID
 FORCEINLINE
+VOID
 PspRunCreateThreadNotifyRoutines(IN PETHREAD CurrentThread,
                                  IN BOOLEAN Create)
 {
@@ -57,8 +57,8 @@ PspRunCreateThreadNotifyRoutines(IN PETHREAD CurrentThread,
     }
 }
 
-VOID
 FORCEINLINE
+VOID
 PspRunCreateProcessNotifyRoutines(IN PEPROCESS CurrentProcess,
                                   IN BOOLEAN Create)
 {
@@ -79,8 +79,8 @@ PspRunCreateProcessNotifyRoutines(IN PEPROCESS CurrentProcess,
     }
 }
 
-VOID
 FORCEINLINE
+VOID
 PspRunLoadImageNotifyRoutines(PUNICODE_STRING FullImageName,
                               HANDLE ProcessId,
                               PIMAGE_INFO ImageInfo)
@@ -98,16 +98,16 @@ PspRunLoadImageNotifyRoutines(PUNICODE_STRING FullImageName,
     }
 }
 
-VOID
 FORCEINLINE
+VOID
 PspRunLegoRoutine(IN PKTHREAD Thread)
 {
     /* Call it */
     if (PspLegoNotifyRoutine) PspLegoNotifyRoutine(Thread);
 }
 
-VOID
 FORCEINLINE
+VOID
 PspLockProcessSecurityShared(IN PEPROCESS Process)
 {
     /* Enter a Critical Region */
@@ -117,8 +117,8 @@ PspLockProcessSecurityShared(IN PEPROCESS Process)
     ExAcquirePushLockShared(&Process->ProcessLock);
 }
 
-VOID
 FORCEINLINE
+VOID
 PspUnlockProcessSecurityShared(IN PEPROCESS Process)
 {
     /* Unlock the Process */
@@ -128,8 +128,8 @@ PspUnlockProcessSecurityShared(IN PEPROCESS Process)
     KeLeaveCriticalRegion();
 }
 
-VOID
 FORCEINLINE
+VOID
 PspLockProcessSecurityExclusive(IN PEPROCESS Process)
 {
     /* Enter a Critical Region */
@@ -139,8 +139,8 @@ PspLockProcessSecurityExclusive(IN PEPROCESS Process)
     ExAcquirePushLockExclusive(&Process->ProcessLock);
 }
 
-VOID
 FORCEINLINE
+VOID
 PspUnlockProcessSecurityExclusive(IN PEPROCESS Process)
 {
     /* Unlock the Process */
@@ -150,8 +150,8 @@ PspUnlockProcessSecurityExclusive(IN PEPROCESS Process)
     KeLeaveCriticalRegion();
 }
 
-VOID
 FORCEINLINE
+VOID
 PspLockThreadSecurityShared(IN PETHREAD Thread)
 {
     /* Enter a Critical Region */
@@ -161,8 +161,8 @@ PspLockThreadSecurityShared(IN PETHREAD Thread)
     ExAcquirePushLockShared(&Thread->ThreadLock);
 }
 
-VOID
 FORCEINLINE
+VOID
 PspUnlockThreadSecurityShared(IN PETHREAD Thread)
 {
     /* Unlock the Thread */
@@ -172,8 +172,8 @@ PspUnlockThreadSecurityShared(IN PETHREAD Thread)
     KeLeaveCriticalRegion();
 }
 
-VOID
 FORCEINLINE
+VOID
 PspLockThreadSecurityExclusive(IN PETHREAD Thread)
 {
     /* Enter a Critical Region */
@@ -183,8 +183,8 @@ PspLockThreadSecurityExclusive(IN PETHREAD Thread)
     ExAcquirePushLockExclusive(&Thread->ThreadLock);
 }
 
-VOID
 FORCEINLINE
+VOID
 PspUnlockThreadSecurityExclusive(IN PETHREAD Thread)
 {
     /* Unlock the Process */
@@ -194,8 +194,8 @@ PspUnlockThreadSecurityExclusive(IN PETHREAD Thread)
     KeLeaveCriticalRegion();
 }
 
-PEPROCESS
 FORCEINLINE
+PEPROCESS
 _PsGetCurrentProcess(VOID)
 {
     /* Get the current process */