diff --git a/reactos/ntoskrnl/cc/view.c b/reactos/ntoskrnl/cc/view.c
index 47753dfe4f5..384cd3022d5 100644
--- a/reactos/ntoskrnl/cc/view.c
+++ b/reactos/ntoskrnl/cc/view.c
@@ -556,7 +556,8 @@ CcRosUnmapCacheSegment(PBCB Bcb, ULONG FileOffset, BOOLEAN NowDirty)
   return(STATUS_SUCCESS);
 }
 
-NTSTATUS static
+static
+NTSTATUS
 CcRosCreateCacheSegment(PBCB Bcb,
 			ULONG FileOffset,
 			PCACHE_SEGMENT* CacheSeg)
diff --git a/reactos/ntoskrnl/config/cmsysini.c b/reactos/ntoskrnl/config/cmsysini.c
index 77b4f36c1d3..37fe7f5c00e 100644
--- a/reactos/ntoskrnl/config/cmsysini.c
+++ b/reactos/ntoskrnl/config/cmsysini.c
@@ -310,7 +310,7 @@ NTAPI
 CmpSetSystemValues(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
 {
     OBJECT_ATTRIBUTES ObjectAttributes;
-    UNICODE_STRING KeyName, ValueName = {0};
+    UNICODE_STRING KeyName, ValueName = { 0, 0, NULL };
     HANDLE KeyHandle;
     NTSTATUS Status;
     ASSERT(LoaderBlock != NULL);
diff --git a/reactos/ntoskrnl/ex/fmutex.c b/reactos/ntoskrnl/ex/fmutex.c
index e84e1cc613a..1445feae69d 100644
--- a/reactos/ntoskrnl/ex/fmutex.c
+++ b/reactos/ntoskrnl/ex/fmutex.c
@@ -20,8 +20,8 @@ KiAcquireFastMutex(
 
 /* PRIVATE FUNCTIONS *********************************************************/
 
-VOID
 FORCEINLINE
+VOID
 ExiAcquireFastMutexUnsafe(IN PFAST_MUTEX FastMutex)
 {
     PKTHREAD Thread = KeGetCurrentThread();
@@ -47,8 +47,8 @@ ExiAcquireFastMutexUnsafe(IN PFAST_MUTEX FastMutex)
     FastMutex->Owner = Thread;
 }
 
-VOID
 FORCEINLINE
+VOID
 ExiReleaseFastMutexUnsafe(IN OUT PFAST_MUTEX FastMutex)
 {
     ASSERT((KeGetCurrentIrql() == APC_LEVEL) ||
diff --git a/reactos/ntoskrnl/ex/init.c b/reactos/ntoskrnl/ex/init.c
index 9e3c6f4d28a..e4693b88aeb 100644
--- a/reactos/ntoskrnl/ex/init.c
+++ b/reactos/ntoskrnl/ex/init.c
@@ -197,7 +197,7 @@ ExpInitNls(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
     HANDLE NlsSection;
     PVOID SectionBase = NULL;
     ULONG ViewSize = 0;
-    LARGE_INTEGER SectionOffset = {{0}};
+    LARGE_INTEGER SectionOffset = {{0, 0}};
     PLIST_ENTRY ListHead, NextEntry;
     PMEMORY_ALLOCATION_DESCRIPTOR MdBlock;
     ULONG NlsTablesEncountered = 0;
@@ -466,7 +466,7 @@ ExpLoadInitialProcess(IN PINIT_BUFFER InitBuffer,
 
     /* Make sure the buffer is a valid string which within the given length */
     if ((NtInitialUserProcessBufferType != REG_SZ) ||
-        ((NtInitialUserProcessBufferLength != -1) &&
+        ((NtInitialUserProcessBufferLength != -1U) &&
          ((NtInitialUserProcessBufferLength < sizeof(WCHAR)) ||
           (NtInitialUserProcessBufferLength >
            sizeof(NtInitialUserProcessBuffer) - sizeof(WCHAR)))))
@@ -1429,7 +1429,7 @@ Phase1InitializationDiscard(IN PVOID Context)
         if (!ExpRealTimeIsUniversal)
         {
             /* Check if we don't have a valid bias */
-            if (ExpLastTimeZoneBias == -1)
+            if (ExpLastTimeZoneBias == -1U)
             {
                 /* Reset */
                 ResetBias = TRUE;
diff --git a/reactos/ntoskrnl/ex/resource.c b/reactos/ntoskrnl/ex/resource.c
index 3f47ad0d7eb..6299f0dc38c 100644
--- a/reactos/ntoskrnl/ex/resource.c
+++ b/reactos/ntoskrnl/ex/resource.c
@@ -20,8 +20,8 @@
 
 #if (!(defined(CONFIG_SMP)) && !(defined(DBG)))
 
-VOID
 FORCEINLINE
+VOID
 ExAcquireResourceLock(IN PERESOURCE Resource,
                       IN PKLOCK_QUEUE_HANDLE LockHandle)
 {
@@ -32,8 +32,8 @@ ExAcquireResourceLock(IN PERESOURCE Resource,
     _disable();
 }
 
-VOID
 FORCEINLINE
+VOID
 ExReleaseResourceLock(IN PERESOURCE Resource,
                       IN PKLOCK_QUEUE_HANDLE LockHandle)
 {
@@ -46,8 +46,8 @@ ExReleaseResourceLock(IN PERESOURCE Resource,
 
 #else
 
-VOID
 FORCEINLINE
+VOID
 ExAcquireResourceLock(IN PERESOURCE Resource,
                       IN PKLOCK_QUEUE_HANDLE LockHandle)
 {
@@ -55,8 +55,8 @@ ExAcquireResourceLock(IN PERESOURCE Resource,
     KeAcquireInStackQueuedSpinLock(&Resource->SpinLock, LockHandle);
 }
 
-VOID
 FORCEINLINE
+VOID
 ExReleaseResourceLock(IN PERESOURCE Resource,
                       IN PKLOCK_QUEUE_HANDLE LockHandle)
 {
diff --git a/reactos/ntoskrnl/fsrtl/fastio.c b/reactos/ntoskrnl/fsrtl/fastio.c
index 1bade0f95a1..6b2da628a51 100644
--- a/reactos/ntoskrnl/fsrtl/fastio.c
+++ b/reactos/ntoskrnl/fsrtl/fastio.c
@@ -247,7 +247,7 @@ FsRtlCopyWrite(IN PFILE_OBJECT FileObject,
     PFSRTL_COMMON_FCB_HEADER FcbHeader;
 
     /* WDK doc. Offset=0xffffffffffffffff indicates append to the end of file */
-    BOOLEAN FileOffsetAppend = ((FileOffset->HighPart == 0xffffffff) && (FileOffset->LowPart == 0xffffffff));
+    BOOLEAN FileOffsetAppend = ((FileOffset->HighPart == (LONG)0xffffffff) && (FileOffset->LowPart == 0xffffffff));
     BOOLEAN ResourceAquiredShared = FALSE;
 
     BOOLEAN b_4GB = FALSE;
@@ -1153,7 +1153,7 @@ FsRtlPrepareMdlWriteDev(IN PFILE_OBJECT FileObject,
     LARGE_INTEGER Offset;
 
     /* WDK doc. Offset=0xffffffffffffffff indicates append to the end of file */
-    BOOLEAN FileOffsetAppend = ((FileOffset->HighPart == 0xffffffff) && (FileOffset->LowPart == 0xffffffff));
+    BOOLEAN FileOffsetAppend = ((FileOffset->HighPart == (LONG)0xffffffff) && (FileOffset->LowPart == 0xffffffff));
     BOOLEAN FileSizeModified = FALSE;
     BOOLEAN ResourceAquiredShared = FALSE;
 
diff --git a/reactos/ntoskrnl/io/iomgr/deviface.c b/reactos/ntoskrnl/io/iomgr/deviface.c
index c2dac1d7fdc..fb0247cc553 100644
--- a/reactos/ntoskrnl/io/iomgr/deviface.c
+++ b/reactos/ntoskrnl/io/iomgr/deviface.c
@@ -247,7 +247,7 @@ IoGetDeviceInterfaces(IN CONST GUID *InterfaceClassGuid,
     OBJECT_ATTRIBUTES ObjectAttributes;
     BOOLEAN FoundRightPDO = FALSE;
     ULONG i = 0, j, Size;
-    UNICODE_STRING ReturnBuffer = {0,};
+    UNICODE_STRING ReturnBuffer = { 0, 0, NULL };
     NTSTATUS Status;
 
     PAGED_CODE();
diff --git a/reactos/ntoskrnl/io/iomgr/driver.c b/reactos/ntoskrnl/io/iomgr/driver.c
index 64b0e72ca48..2fcf6f402d7 100644
--- a/reactos/ntoskrnl/io/iomgr/driver.c
+++ b/reactos/ntoskrnl/io/iomgr/driver.c
@@ -569,7 +569,7 @@ IopAttachFilterDrivers(
    PDEVICE_NODE DeviceNode,
    BOOLEAN Lower)
 {
-   RTL_QUERY_REGISTRY_TABLE QueryTable[2] = {{0}};
+   RTL_QUERY_REGISTRY_TABLE QueryTable[2] = { { NULL, 0, NULL, NULL, 0, NULL, 0 }, };
    UNICODE_STRING Class;
    WCHAR ClassBuffer[40];
    UNICODE_STRING EnumRoot = RTL_CONSTANT_STRING(ENUM_ROOT);
@@ -1749,7 +1749,7 @@ IopLoadUnloadDriver(PLOAD_UNLOAD_PARAMS LoadParams)
 NTSTATUS NTAPI
 NtLoadDriver(IN PUNICODE_STRING DriverServiceName)
 {
-    UNICODE_STRING CapturedDriverServiceName = {0};
+    UNICODE_STRING CapturedDriverServiceName = { 0, 0, NULL };
     KPROCESSOR_MODE PreviousMode;
     LOAD_UNLOAD_PARAMS LoadParams;
     NTSTATUS Status;
diff --git a/reactos/ntoskrnl/io/iomgr/iorsrce.c b/reactos/ntoskrnl/io/iomgr/iorsrce.c
index 188cdc61e71..3c63d03dc54 100644
--- a/reactos/ntoskrnl/io/iomgr/iorsrce.c
+++ b/reactos/ntoskrnl/io/iomgr/iorsrce.c
@@ -16,7 +16,7 @@
 /* GLOBALS *******************************************************************/
 
 static CONFIGURATION_INFORMATION
-_SystemConfigurationInformation = {0, 0, 0, 0, 0, 0, 0, FALSE, FALSE};
+_SystemConfigurationInformation = { 0, 0, 0, 0, 0, 0, 0, FALSE, FALSE, 0, 0 };
 
 /* API Parameters to Pass in IopQueryBusDescription */
 typedef struct IO_QUERY {
diff --git a/reactos/ntoskrnl/io/iomgr/irp.c b/reactos/ntoskrnl/io/iomgr/irp.c
index 9dc571bd871..7dca8cb5aa8 100644
--- a/reactos/ntoskrnl/io/iomgr/irp.c
+++ b/reactos/ntoskrnl/io/iomgr/irp.c
@@ -253,7 +253,7 @@ IopCompleteRequest(IN PKAPC Apc,
             FileObject);
 
     /* Sanity check */
-    ASSERT(Irp->IoStatus.Status != 0xFFFFFFFF);
+    ASSERT(Irp->IoStatus.Status != (NTSTATUS)0xFFFFFFFF);
 
     /* Check if we have a file object */
     if (*SystemArgument2)
@@ -1183,7 +1183,7 @@ IofCompleteRequest(IN PIRP Irp,
     ASSERT(Irp->Type == IO_TYPE_IRP);
     ASSERT(!Irp->CancelRoutine);
     ASSERT(Irp->IoStatus.Status != STATUS_PENDING);
-    ASSERT(Irp->IoStatus.Status != 0xFFFFFFFF);
+    ASSERT(Irp->IoStatus.Status != (NTSTATUS)0xFFFFFFFF);
 
     /* Get the last stack */
     LastStackPtr = (PIO_STACK_LOCATION)(Irp + 1);
diff --git a/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c b/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
index 2d508c29fec..6c4f579265c 100644
--- a/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
+++ b/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
@@ -1267,7 +1267,7 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
    LCID LocaleId;
    HANDLE InstanceKey = NULL;
    UNICODE_STRING ValueName;
-   UNICODE_STRING ParentIdPrefix = { 0 };
+   UNICODE_STRING ParentIdPrefix = { 0, 0, NULL };
    DEVICE_CAPABILITIES DeviceCapabilities;
 
    DPRINT("IopActionInterrogateDeviceStack(%p, %p)\n", DeviceNode, Context);
diff --git a/reactos/ntoskrnl/kdbg/i386/i386-dis.c b/reactos/ntoskrnl/kdbg/i386/i386-dis.c
index fb004f1b1c4..61a24108daa 100644
--- a/reactos/ntoskrnl/kdbg/i386/i386-dis.c
+++ b/reactos/ntoskrnl/kdbg/i386/i386-dis.c
@@ -63,20 +63,20 @@ KdbpNopPrintDisasm(void* Ignored, const char* fmt, ...)
   return(0);
 }
 
-int static
+static int
 KdbpReadMemory(unsigned int Addr, unsigned char* Data, unsigned int Length,
 	       struct disassemble_info * Ignored)
 {
   return KdbpSafeReadMemory(Data, (void *)Addr, Length); /* 0 means no error */
 }
 
-void static
+static void
 KdbpMemoryError(int Status, unsigned int Addr,
 	        struct disassemble_info * Ignored)
 {
 }
 
-void static
+static void
 KdbpPrintAddressInCode(unsigned int Addr, struct disassemble_info * Ignored)
 {
   if (!KdbSymPrintAddress((void*)Addr))
@@ -85,7 +85,7 @@ KdbpPrintAddressInCode(unsigned int Addr, struct disassemble_info * Ignored)
     }
 }
 
-void static
+static void
 KdbpNopPrintAddress(unsigned int Addr, struct disassemble_info * Ignored)
 {
 }
diff --git a/reactos/ntoskrnl/ke/clock.c b/reactos/ntoskrnl/ke/clock.c
index 67e89151a41..6a9c1f3ef37 100644
--- a/reactos/ntoskrnl/ke/clock.c
+++ b/reactos/ntoskrnl/ke/clock.c
@@ -16,7 +16,7 @@
 
 LARGE_INTEGER KeBootTime;
 ULONGLONG KeBootTimeBias;
-volatile KSYSTEM_TIME KeTickCount = {0};
+volatile KSYSTEM_TIME KeTickCount = { 0, 0, 0 };
 ULONG KeMaximumIncrement;
 ULONG KeMinimumIncrement;
 ULONG KeTimeAdjustment;
diff --git a/reactos/ntoskrnl/ke/freeldr.c b/reactos/ntoskrnl/ke/freeldr.c
index 95a98d62b02..cf706921d41 100644
--- a/reactos/ntoskrnl/ke/freeldr.c
+++ b/reactos/ntoskrnl/ke/freeldr.c
@@ -59,12 +59,12 @@ ARC_DISK_SIGNATURE BldrDiskInfo[32];                    // 0x1413C
 CHAR BldrArcHwBuffer[16 * 1024];                        // 0x1843C
 
 /* BIOS Memory Map */
-BIOS_MEMORY_DESCRIPTOR BiosMemoryDescriptors[16] = {{0}};
+BIOS_MEMORY_DESCRIPTOR BiosMemoryDescriptors[16] = { { 0, 0 }, };
 PBIOS_MEMORY_DESCRIPTOR BiosMemoryDescriptorList = BiosMemoryDescriptors;
 
 /* ARC Memory Map */
 ULONG NumberDescriptors = 0;
-MEMORY_DESCRIPTOR MDArray[60] = {{0}};
+MEMORY_DESCRIPTOR MDArray[60] = { { 0, 0, 0 }, };
 
 /* FUNCTIONS *****************************************************************/
 
diff --git a/reactos/ntoskrnl/ke/gmutex.c b/reactos/ntoskrnl/ke/gmutex.c
index e2b762d2224..fc38a3b4e87 100644
--- a/reactos/ntoskrnl/ke/gmutex.c
+++ b/reactos/ntoskrnl/ke/gmutex.c
@@ -85,8 +85,8 @@ KiAcquireGuardedMutexContented(IN OUT PKGUARDED_MUTEX GuardedMutex)
     }
 }
 
-VOID
 FORCEINLINE
+VOID
 FASTCALL
 KiAcquireGuardedMutex(IN OUT PKGUARDED_MUTEX GuardedMutex)
 {
@@ -101,8 +101,8 @@ KiAcquireGuardedMutex(IN OUT PKGUARDED_MUTEX GuardedMutex)
     }
 }
 
-VOID
 FORCEINLINE
+VOID
 FASTCALL
 KiReleaseGuardedMutex(IN OUT PKGUARDED_MUTEX GuardedMutex)
 {
diff --git a/reactos/ntoskrnl/ke/i386/cpu.c b/reactos/ntoskrnl/ke/i386/cpu.c
index 20bc0a6497c..051951b8400 100644
--- a/reactos/ntoskrnl/ke/i386/cpu.c
+++ b/reactos/ntoskrnl/ke/i386/cpu.c
@@ -105,7 +105,7 @@ WRMSR(IN ULONG Register,
 LONGLONG
 RDMSR(IN ULONG Register)
 {
-    LARGE_INTEGER LargeVal = {{0}};
+    LARGE_INTEGER LargeVal = {{0, 0}};
     Ke386Rdmsr(Register, LargeVal.HighPart, LargeVal.LowPart);
     return LargeVal.QuadPart;
 }
@@ -840,7 +840,7 @@ VOID
 NTAPI
 KiI386PentiumLockErrataFixup(VOID)
 {
-    KDESCRIPTOR IdtDescriptor = {0};
+    KDESCRIPTOR IdtDescriptor = { 0, 0, 0 };
     PKIDTENTRY NewIdt, NewIdt2;
 
     /* Allocate memory for a new IDT */
diff --git a/reactos/ntoskrnl/ke/i386/exp.c b/reactos/ntoskrnl/ke/i386/exp.c
index c300a58627f..3b5174a8586 100644
--- a/reactos/ntoskrnl/ke/i386/exp.c
+++ b/reactos/ntoskrnl/ke/i386/exp.c
@@ -1011,7 +1011,7 @@ DispatchToUser:
             _SEH2_EXCEPT((RtlCopyMemory(&SehExceptRecord, _SEH2_GetExceptionInformation()->ExceptionRecord, sizeof(EXCEPTION_RECORD)), EXCEPTION_EXECUTE_HANDLER))
             {
                 /* Check if we got a stack overflow and raise that instead */
-                if (SehExceptRecord.ExceptionCode ==
+                if ((NTSTATUS)SehExceptRecord.ExceptionCode ==
                     STATUS_STACK_OVERFLOW)
                 {
                     /* Copy the exception address and record */
diff --git a/reactos/ntoskrnl/ke/i386/kiinit.c b/reactos/ntoskrnl/ke/i386/kiinit.c
index 416b3433f20..3be5002b9d8 100644
--- a/reactos/ntoskrnl/ke/i386/kiinit.c
+++ b/reactos/ntoskrnl/ke/i386/kiinit.c
@@ -611,7 +611,7 @@ KiGetMachineBootPointers(IN PKGDTENTRY *Gdt,
                          IN PKIPCR *Pcr,
                          IN PKTSS *Tss)
 {
-    KDESCRIPTOR GdtDescriptor = {0}, IdtDescriptor = {0};
+    KDESCRIPTOR GdtDescriptor = { 0, 0, 0 }, IdtDescriptor = { 0, 0, 0 };
     KGDTENTRY TssSelector, PcrSelector;
     USHORT Tr = 0, Fs;
 
diff --git a/reactos/ntoskrnl/ke/krnlinit.c b/reactos/ntoskrnl/ke/krnlinit.c
index 03ce64f365c..55ec779251d 100644
--- a/reactos/ntoskrnl/ke/krnlinit.c
+++ b/reactos/ntoskrnl/ke/krnlinit.c
@@ -111,7 +111,7 @@ NTAPI
 KiComputeReciprocal(IN LONG Divisor,
                     OUT PUCHAR Shift)
 {
-    LARGE_INTEGER Reciprocal = {{0}};
+    LARGE_INTEGER Reciprocal = {{0, 0}};
     LONG BitCount = 0, Remainder = 1;
 
     /* Start by calculating the remainder */
@@ -140,7 +140,7 @@ KiComputeReciprocal(IN LONG Divisor,
     {
         /* Check if the current fraction value is too large */
         if ((Reciprocal.LowPart == 0xFFFFFFFF) &&
-            (Reciprocal.HighPart == 0xFFFFFFFF))
+            (Reciprocal.HighPart == (LONG)0xFFFFFFFF))
         {
             /* Set the high bit and reduce the bit count */
             Reciprocal.LowPart = 0;
diff --git a/reactos/ntoskrnl/ke/wait.c b/reactos/ntoskrnl/ke/wait.c
index ff082f5fc6f..e0713e56e90 100644
--- a/reactos/ntoskrnl/ke/wait.c
+++ b/reactos/ntoskrnl/ke/wait.c
@@ -628,7 +628,7 @@ KeWaitForMultipleObjects(IN ULONG Count,
                     {
                         /* Check if it has an invalid count */
                         if ((Thread == CurrentObject->OwnerThread) &&
-                            (CurrentObject->Header.SignalState == MINLONG))
+                            (CurrentObject->Header.SignalState == (LONG)MINLONG))
                         {
                             /* Raise an exception */
                             KiReleaseDispatcherLock(Thread->WaitIrql);
diff --git a/reactos/ntoskrnl/mm/anonmem.c b/reactos/ntoskrnl/mm/anonmem.c
index 5151c305747..39c05dc5036 100644
--- a/reactos/ntoskrnl/mm/anonmem.c
+++ b/reactos/ntoskrnl/mm/anonmem.c
@@ -436,7 +436,7 @@ MmNotPresentFaultVirtualMemory(PMM_AVL_TABLE AddressSpace,
    return(STATUS_SUCCESS);
 }
 
-VOID static
+static VOID
 MmModifyAttributes(PMM_AVL_TABLE AddressSpace,
                    PVOID BaseAddress,
                    ULONG RegionSize,
@@ -817,7 +817,7 @@ NtAllocateVirtualMemory(IN     HANDLE ProcessHandle,
    return(STATUS_SUCCESS);
 }
 
-VOID static
+static VOID
 MmFreeVirtualMemoryPage(PVOID Context,
                         MEMORY_AREA* MemoryArea,
                         PVOID Address,
diff --git a/reactos/ntoskrnl/mm/mdlsup.c b/reactos/ntoskrnl/mm/mdlsup.c
index eb884ab027b..7bcb4178716 100644
--- a/reactos/ntoskrnl/mm/mdlsup.c
+++ b/reactos/ntoskrnl/mm/mdlsup.c
@@ -261,7 +261,7 @@ MmUnlockPages(IN PMDL Mdl)
         if (Process)
         {
             /* Handle the accounting of locked pages */
-            ASSERT(Process->NumberOfLockedPages >= 0);
+            /* ASSERT(Process->NumberOfLockedPages >= 0); */ // always true
             InterlockedExchangeAddSizeT(&Process->NumberOfLockedPages,
                                         -PageCount);
         }
@@ -276,7 +276,7 @@ MmUnlockPages(IN PMDL Mdl)
     if (Process)
     {
         /* Handle the accounting of locked pages */
-        ASSERT(Process->NumberOfLockedPages >= 0);
+        /* ASSERT(Process->NumberOfLockedPages >= 0); */ // always true
         InterlockedExchangeAddSizeT(&Process->NumberOfLockedPages,
                                     -PageCount);
     }
diff --git a/reactos/ntoskrnl/mm/ncache.c b/reactos/ntoskrnl/mm/ncache.c
index 08edc98fb26..fd6e1e7519a 100644
--- a/reactos/ntoskrnl/mm/ncache.c
+++ b/reactos/ntoskrnl/mm/ncache.c
@@ -76,7 +76,7 @@ MmAllocateNonCachedMemory(IN ULONG NumberOfBytes)
    return ((PVOID)Result);
 }
 
-VOID static
+static VOID
 MmFreeNonCachedPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address,
                     PFN_TYPE Page, SWAPENTRY SwapEntry,
                     BOOLEAN Dirty)
diff --git a/reactos/ntoskrnl/mm/pagefile.c b/reactos/ntoskrnl/mm/pagefile.c
index dbfdd939554..cca7c871abe 100644
--- a/reactos/ntoskrnl/mm/pagefile.c
+++ b/reactos/ntoskrnl/mm/pagefile.c
@@ -164,7 +164,7 @@ MmShowOutOfSpaceMessagePagingFile(VOID)
    }
 }
 
-LARGE_INTEGER static
+static LARGE_INTEGER
 MmGetOffsetPageFile(PRETRIEVAL_POINTERS_BUFFER RetrievalPointers, LARGE_INTEGER Offset)
 {
    /* Simple binary search */
diff --git a/reactos/ntoskrnl/mm/region.c b/reactos/ntoskrnl/mm/region.c
index 6e760104197..6cf2c6d8758 100644
--- a/reactos/ntoskrnl/mm/region.c
+++ b/reactos/ntoskrnl/mm/region.c
@@ -15,7 +15,7 @@
 
 /* FUNCTIONS *****************************************************************/
 
-VOID static
+static VOID
 InsertAfterEntry(PLIST_ENTRY Previous,
                  PLIST_ENTRY Entry)
 /*
@@ -30,7 +30,7 @@ InsertAfterEntry(PLIST_ENTRY Previous,
    Previous->Flink = Entry;
 }
 
-PMM_REGION static
+static PMM_REGION
 MmSplitRegion(PMM_REGION InitialRegion, PVOID InitialBaseAddress,
               PVOID StartAddress, ULONG Length, ULONG NewType,
               ULONG NewProtect, PMM_AVL_TABLE AddressSpace,
diff --git a/reactos/ntoskrnl/mm/section.c b/reactos/ntoskrnl/mm/section.c
index 555cecd51b0..544607a5178 100644
--- a/reactos/ntoskrnl/mm/section.c
+++ b/reactos/ntoskrnl/mm/section.c
@@ -1990,7 +1990,7 @@ MmWritePageSectionView(PMM_AVL_TABLE AddressSpace,
    return(STATUS_SUCCESS);
 }
 
-VOID static
+static VOID
 MmAlterViewAttributes(PMM_AVL_TABLE AddressSpace,
                       PVOID BaseAddress,
                       ULONG RegionSize,
@@ -3605,7 +3605,7 @@ NtOpenSection(PHANDLE   SectionHandle,
    return(Status);
 }
 
-NTSTATUS static
+static NTSTATUS
 MmMapViewOfSegment(PMM_AVL_TABLE AddressSpace,
                    PROS_SECTION_OBJECT Section,
                    PMM_SECTION_SEGMENT Segment,
@@ -3865,7 +3865,7 @@ NtMapViewOfSection(IN HANDLE SectionHandle,
    return(Status);
 }
 
-VOID static
+static VOID
 MmFreeSectionPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address,
                   PFN_TYPE Page, SWAPENTRY SwapEntry, BOOLEAN Dirty)
 {
diff --git a/reactos/ntoskrnl/mm/sysldr.c b/reactos/ntoskrnl/mm/sysldr.c
index 13df2669319..2bcdd10ca49 100644
--- a/reactos/ntoskrnl/mm/sysldr.c
+++ b/reactos/ntoskrnl/mm/sysldr.c
@@ -94,7 +94,7 @@ MiLoadImageSection(IN OUT PVOID *SectionPtr,
     PVOID Base = NULL;
     SIZE_T ViewSize = 0;
     KAPC_STATE ApcState;
-    LARGE_INTEGER SectionOffset = {{0}};
+    LARGE_INTEGER SectionOffset = {{0, 0}};
     BOOLEAN LoadSymbols = FALSE;
     ULONG DriverSize;
     PVOID DriverBase;
diff --git a/reactos/ntoskrnl/ob/oblink.c b/reactos/ntoskrnl/ob/oblink.c
index 3ffd8db7602..8705ec40eeb 100644
--- a/reactos/ntoskrnl/ob/oblink.c
+++ b/reactos/ntoskrnl/ob/oblink.c
@@ -455,7 +455,7 @@ NtQuerySymbolicLinkObject(IN HANDLE LinkHandle,
                           OUT PUNICODE_STRING LinkTarget,
                           OUT PULONG ResultLength OPTIONAL)
 {
-    UNICODE_STRING SafeLinkTarget = {0};
+    UNICODE_STRING SafeLinkTarget = { 0, 0, NULL };
     POBJECT_SYMBOLIC_LINK SymlinkObject;
     KPROCESSOR_MODE PreviousMode = ExGetPreviousMode();
     NTSTATUS Status = STATUS_SUCCESS;
diff --git a/reactos/ntoskrnl/ob/obsdcach.c b/reactos/ntoskrnl/ob/obsdcach.c
index 9a27a2a7b5c..c10de3aa0b1 100644
--- a/reactos/ntoskrnl/ob/obsdcach.c
+++ b/reactos/ntoskrnl/ob/obsdcach.c
@@ -19,8 +19,8 @@ OB_SD_CACHE_LIST ObsSecurityDescriptorCache[SD_CACHE_ENTRIES];
 
 /* PRIVATE FUNCTIONS **********************************************************/
 
-VOID
 FORCEINLINE
+VOID
 ObpSdAcquireLock(IN POB_SD_CACHE_LIST CacheEntry)
 {
     /* Acquire the lock */
@@ -28,8 +28,8 @@ ObpSdAcquireLock(IN POB_SD_CACHE_LIST CacheEntry)
     ExAcquirePushLockExclusive(&CacheEntry->PushLock);
 }
 
-VOID
 FORCEINLINE
+VOID
 ObpSdReleaseLock(IN POB_SD_CACHE_LIST CacheEntry)
 {
     /* Release the lock */
@@ -37,8 +37,8 @@ ObpSdReleaseLock(IN POB_SD_CACHE_LIST CacheEntry)
     KeLeaveCriticalRegion();
 }
 
-VOID
 FORCEINLINE
+VOID
 ObpSdAcquireLockShared(IN POB_SD_CACHE_LIST CacheEntry)
 {
     /* Acquire the lock */
@@ -46,8 +46,8 @@ ObpSdAcquireLockShared(IN POB_SD_CACHE_LIST CacheEntry)
     ExAcquirePushLockShared(&CacheEntry->PushLock);
 }
 
-VOID
 FORCEINLINE
+VOID
 ObpSdReleaseLockShared(IN POB_SD_CACHE_LIST CacheEntry)
 {
     /* Release the lock */
diff --git a/reactos/ntoskrnl/ps/kill.c b/reactos/ntoskrnl/ps/kill.c
index 991ebe18cd2..488deff0ec8 100644
--- a/reactos/ntoskrnl/ps/kill.c
+++ b/reactos/ntoskrnl/ps/kill.c
@@ -16,7 +16,7 @@
 
 /* GLOBALS *******************************************************************/
 
-LIST_ENTRY PspReaperListHead = {0};
+LIST_ENTRY PspReaperListHead = { NULL, NULL };
 WORK_QUEUE_ITEM PspReaperWorkItem;
 LARGE_INTEGER ShortTime = {{-10 * 100 * 1000, -1}};
 
@@ -778,7 +778,7 @@ PspExitThread(IN NTSTATUS ExitStatus)
         ObFastDereferenceObject(&CurrentProcess->Token, PrimaryToken);
 
         /* Check if this is a VDM Process and rundown the VDM DPCs if so */
-        if (CurrentProcess->VdmObjects);// VdmRundownDpcs(CurrentProcess);
+        if (CurrentProcess->VdmObjects) { /* VdmRundownDpcs(CurrentProcess); */ }
 
         /* Kill the process in the Object Manager */
         ObKillProcess(CurrentProcess);
diff --git a/reactos/ntoskrnl/ps/psmgr.c b/reactos/ntoskrnl/ps/psmgr.c
index 7d271d5a3b5..a6f35231e7f 100644
--- a/reactos/ntoskrnl/ps/psmgr.c
+++ b/reactos/ntoskrnl/ps/psmgr.c
@@ -223,7 +223,7 @@ PspMapSystemDll(IN PEPROCESS Process,
                 IN BOOLEAN UseLargePages)
 {
     NTSTATUS Status;
-    LARGE_INTEGER Offset = {{0}};
+    LARGE_INTEGER Offset = {{0, 0}};
     SIZE_T ViewSize = 0;
     PVOID ImageBase = 0;
     
@@ -443,7 +443,7 @@ PspInitPhase0(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
     /* Now multiply limits by 1MB */
     PspDefaultPagedLimit <<= 20;
     PspDefaultNonPagedLimit <<= 20;
-    if (PspDefaultPagefileLimit != -1) PspDefaultPagefileLimit <<= 20;
+    if (PspDefaultPagefileLimit != -1U) PspDefaultPagefileLimit <<= 20;
 
     /* Initialize the Active Process List */
     InitializeListHead(&PsActiveProcessHead);
diff --git a/reactos/ntoskrnl/se/token.c b/reactos/ntoskrnl/se/token.c
index b84743653e8..dbe3f77a82a 100644
--- a/reactos/ntoskrnl/se/token.c
+++ b/reactos/ntoskrnl/se/token.c
@@ -1964,7 +1964,7 @@ NtCreateToken(OUT PHANDLE TokenHandle,
     ULONG i;
     KPROCESSOR_MODE PreviousMode;
     ULONG nTokenPrivileges = 0;
-    LARGE_INTEGER LocalExpirationTime = {{0}};
+    LARGE_INTEGER LocalExpirationTime = {{0, 0}};
     NTSTATUS Status = STATUS_SUCCESS;
     
     PAGED_CODE();