diff --git a/reactos/base/applications/msconfig/freeldrpage.c b/reactos/base/applications/msconfig/freeldrpage.c
index 9311f6657a0..a82f1c560be 100644
--- a/reactos/base/applications/msconfig/freeldrpage.c
+++ b/reactos/base/applications/msconfig/freeldrpage.c
@@ -19,9 +19,9 @@ typedef struct
     ULONG szDefaultPos;
     ULONG OSConfigurationCount;
     BOOL  UseBootIni;
-}FREELDR_SETTINGS;
+} FREELDR_SETTINGS;
 
-static FREELDR_SETTINGS Settings = { 0, {0}, 0 };
+static FREELDR_SETTINGS Settings = { 0, { 0, }, 0, 0, FALSE };
 
 
 BOOL
diff --git a/reactos/base/applications/mscutils/devmgmt/enumdevices.c b/reactos/base/applications/mscutils/devmgmt/enumdevices.c
index a917334ef5e..7da58452be9 100644
--- a/reactos/base/applications/mscutils/devmgmt/enumdevices.c
+++ b/reactos/base/applications/mscutils/devmgmt/enumdevices.c
@@ -162,7 +162,9 @@ EnumDeviceClasses(INT ClassIndex,
         }
 
         if (Ret == CR_INVALID_DATA)
+        {
             ; /*FIXME: what should we do here? */
+        }
 
         /* handle other errors... */
     }
diff --git a/reactos/base/applications/network/whois/whois.c b/reactos/base/applications/network/whois/whois.c
index b18deaf3490..726d53c4574 100644
--- a/reactos/base/applications/network/whois/whois.c
+++ b/reactos/base/applications/network/whois/whois.c
@@ -85,7 +85,7 @@ int main(int argc, char **argv)
 	struct sockaddr_in sin;
 	struct hostent *hp;
 	struct servent *sp;
-	int s;
+	SOCKET s;
 
 	WORD wVersionRequested;
 	WSADATA wsaData;
diff --git a/reactos/base/applications/sndvol32/mixer.c b/reactos/base/applications/sndvol32/mixer.c
index d7bb2b37c71..c5c7f0a78aa 100644
--- a/reactos/base/applications/sndvol32/mixer.c
+++ b/reactos/base/applications/sndvol32/mixer.c
@@ -472,7 +472,7 @@ SndMixerEnumProducts(PSND_MIXER Mixer,
 INT
 SndMixerGetDestinationCount(PSND_MIXER Mixer)
 {
-    return (Mixer->hmx ? Mixer->Caps.cDestinations : -1);
+    return (Mixer->hmx ? (INT)Mixer->Caps.cDestinations : -1);
 }
 
 BOOL
diff --git a/reactos/base/applications/sndvol32/sndvol32.c b/reactos/base/applications/sndvol32/sndvol32.c
index d330a60ba1e..17485ec3202 100644
--- a/reactos/base/applications/sndvol32/sndvol32.c
+++ b/reactos/base/applications/sndvol32/sndvol32.c
@@ -241,7 +241,7 @@ static VOID
 UpdatePrefDlgControls(PPREFERENCES_CONTEXT Context,
                       DWORD LineID)
 {
-    UINT OldID, MixerID = 0;
+    INT OldID, MixerID = 0;
     INT DeviceCbIndex;
 
     /* select the mixer */
@@ -381,8 +381,8 @@ DlgPreferencesProc(HWND hwndDlg,
                 {
                     if (HIWORD(wParam) == CBN_SELCHANGE)
                     {
-                        DWORD LineID;
-                        DWORD Index;
+                        INT LineID;
+                        INT Index;
 
                         Index = SendDlgItemMessage(hwndDlg,
                                                    IDC_LINE,
@@ -429,7 +429,7 @@ DlgPreferencesProc(HWND hwndDlg,
                 case IDC_OTHER:
                 {
                     INT LineCbIndex;
-                    DWORD LineID;
+                    INT LineID;
 
                     EnableWindow(GetDlgItem(hwndDlg,
                                             IDC_LINE),
diff --git a/reactos/base/services/eventlog/eventlog.h b/reactos/base/services/eventlog/eventlog.h
index fae298435dd..11db027eb09 100644
--- a/reactos/base/services/eventlog/eventlog.h
+++ b/reactos/base/services/eventlog/eventlog.h
@@ -162,7 +162,7 @@ PBYTE LogfAllocAndBuildNewRecord(LPDWORD lpRecSize,
                                  DWORD dwDataSize,
                                  LPVOID lpRawData);
 
-void __inline LogfFreeRecord(LPVOID Rec);
+__inline void LogfFreeRecord(LPVOID Rec);
 
 /* eventlog.c */
 VOID PRINT_HEADER(PFILE_HEADER header);
diff --git a/reactos/base/services/eventlog/file.c b/reactos/base/services/eventlog/file.c
index 31199ffe616..807f997b44d 100644
--- a/reactos/base/services/eventlog/file.c
+++ b/reactos/base/services/eventlog/file.c
@@ -899,7 +899,7 @@ PBYTE LogfAllocAndBuildNewRecord(LPDWORD lpRecSize,
     return Buffer;
 }
 
-void __inline LogfFreeRecord(LPVOID Rec)
+__inline void LogfFreeRecord(LPVOID Rec)
 {
     HeapFree(MyHeap, 0, Rec);
 }
diff --git a/reactos/base/services/eventlog/rpc.c b/reactos/base/services/eventlog/rpc.c
index 39eaa5a646d..d117a26c08c 100644
--- a/reactos/base/services/eventlog/rpc.c
+++ b/reactos/base/services/eventlog/rpc.c
@@ -343,9 +343,9 @@ NTSTATUS ElfrOpenELA(
     DWORD MinorVersion,
     IELF_HANDLE *LogHandle)
 {
-    UNICODE_STRING UNCServerNameW = { 0, };
-    UNICODE_STRING ModuleNameW = { 0, };
-    UNICODE_STRING RegModuleNameW = { 0, };
+    UNICODE_STRING UNCServerNameW = { 0, 0, NULL };
+    UNICODE_STRING ModuleNameW    = { 0, 0, NULL };
+    UNICODE_STRING RegModuleNameW = { 0, 0, NULL };
     NTSTATUS Status;
 
     if (UNCServerName &&
diff --git a/reactos/base/shell/explorer-new/precomp.h b/reactos/base/shell/explorer-new/precomp.h
index b33485a358b..f563a79c335 100644
--- a/reactos/base/shell/explorer-new/precomp.h
+++ b/reactos/base/shell/explorer-new/precomp.h
@@ -41,7 +41,7 @@ typedef HRESULT (APIENTRY *SHWINHELP)(HWND, LPWSTR, UINT, DWORD);
 /* Constants for RunFileDlg */
 #define RFF_CALCDIRECTORY   0x04    /* Calculates the working directory from the file name. */
 
-static ULONG __inline
+static __inline ULONG
 Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...)
 {
     char szMsg[512];
diff --git a/reactos/base/shell/explorer-new/trayntfy.c b/reactos/base/shell/explorer-new/trayntfy.c
index 0cfec06272d..d372166a417 100644
--- a/reactos/base/shell/explorer-new/trayntfy.c
+++ b/reactos/base/shell/explorer-new/trayntfy.c
@@ -141,7 +141,7 @@ TrayClockWnd_GetMinimumSize(IN OUT PTRAY_CLOCK_WND_DATA This,
 {
     WORD iLinesVisible = 0;
     INT i;
-    SIZE szMax = {0};
+    SIZE szMax = { 0, 0 };
 
     if (!This->LinesMeasured)
         This->LinesMeasured = TrayClockWnd_MeasureLines(This);
@@ -713,7 +713,7 @@ typedef struct _TRAY_NOTIFY_WND_DATA
 static VOID
 TrayNotifyWnd_UpdateStyle(IN OUT PTRAY_NOTIFY_WND_DATA This)
 {
-    RECT rcClient = {0};
+    RECT rcClient = { 0, 0, 0, 0 };
 
     if (AdjustWindowRectEx(&rcClient,
                            GetWindowLong(This->hWnd,
@@ -758,7 +758,7 @@ TrayNotifyWnd_GetMinimumSize(IN OUT PTRAY_NOTIFY_WND_DATA This,
 
     if (!This->HideClock)
     {
-        SIZE szClock = {0};
+        SIZE szClock = { 0, 0 };
 
         if (Horizontal)
         {
diff --git a/reactos/base/shell/explorer-new/traywnd.c b/reactos/base/shell/explorer-new/traywnd.c
index 21b80429ba8..a37733f8f81 100644
--- a/reactos/base/shell/explorer-new/traywnd.c
+++ b/reactos/base/shell/explorer-new/traywnd.c
@@ -992,7 +992,7 @@ static VOID
 ITrayWindowImpl_UpdateStartButton(IN OUT ITrayWindowImpl *This,
                                   IN HBITMAP hbmStart  OPTIONAL)
 {
-    SIZE Size = {0};
+    SIZE Size = { 0, 0 };
 
     if (This->himlStartBtn == NULL ||
         !SendMessage(This->hwndStart,
@@ -1047,7 +1047,7 @@ ITrayWindowImpl_AlignControls(IN OUT ITrayWindowImpl *This,
 {
     RECT rcClient;
     SIZE TraySize, StartSize;
-    POINT ptTrayNotify = {0};
+    POINT ptTrayNotify = { 0, 0 };
     BOOL Horizontal;
     HDWP dwp;
 
@@ -1131,7 +1131,7 @@ ITrayWindowImpl_AlignControls(IN OUT ITrayWindowImpl *This,
     /* Resize/Move the rebar control */
     if (This->hwndRebar != NULL)
     {
-        POINT ptRebar = {0};
+        POINT ptRebar = { 0, 0 };
         SIZE szRebar;
 
         SetWindowStyle(This->hwndRebar,
diff --git a/reactos/base/shell/explorer-new/undoc.h b/reactos/base/shell/explorer-new/undoc.h
index a821d4f7982..941b618b0a6 100644
--- a/reactos/base/shell/explorer-new/undoc.h
+++ b/reactos/base/shell/explorer-new/undoc.h
@@ -127,7 +127,7 @@ HANDLE WINAPI SHCreateDesktop(IShellDesktopTray*);
 BOOL WINAPI SHDesktopMessageLoop(HANDLE);
 #else
 typedef HANDLE (WINAPI *PSHCreateDesktop)(IShellDesktopTray*);
-static HANDLE __inline
+static __inline HANDLE
 SHCreateDesktop(IShellDesktopTray* sdt)
 {
     static PSHCreateDesktop Func = NULL;
@@ -152,7 +152,7 @@ SHCreateDesktop(IShellDesktopTray* sdt)
 }
 
 typedef BOOL (WINAPI *PSHDesktopMessageLoop)(HANDLE);
-static BOOL __inline
+static __inline BOOL
 SHDesktopMessageLoop(IN HANDLE hDesktop)
 {
     static PSHDesktopMessageLoop Func = NULL;
@@ -240,7 +240,7 @@ HRESULT WINAPI SHGetPerScreenResName(OUT LPWSTR lpResName,
                                      IN DWORD dwReserved);
 #else
 typedef HRESULT (WINAPI *PSHGetPerScreenResName)(LPWSTR,INT,DWORD);
-static HRESULT __inline
+static __inline HRESULT
 SHGetPerScreenResName(OUT LPWSTR lpResName,
                       IN INT cchResName,
                       IN DWORD dwReserved  OPTIONAL)
@@ -271,7 +271,7 @@ SHGetPerScreenResName(OUT LPWSTR lpResName,
 HRESULT WINAPI SHPropertyBag_ReadStream(IPropertyBag*,LPCWSTR,IStream**);
 #else
 typedef HRESULT (WINAPI *PSHPropertyBag_ReadStream)(IPropertyBag*,LPCWSTR,IStream**);
-static HRESULT __inline
+static __inline HRESULT
 SHPropertyBag_ReadStream(IN IPropertyBag *ppb,
                          IN LPCWSTR pszPropName,
                          OUT IStream **ppStream)
diff --git a/reactos/base/system/regsvr32/regsvr32.c b/reactos/base/system/regsvr32/regsvr32.c
index 581e3c04525..c3e4d86c3e0 100644
--- a/reactos/base/system/regsvr32/regsvr32.c
+++ b/reactos/base/system/regsvr32/regsvr32.c
@@ -220,7 +220,7 @@ LPTSTR *WINAPI CommandLineToArgvT(LPCTSTR lpCmdLine, int *lpArgc)
 // should not be modified until FreeConvertedWideChar has been called.
 #ifdef UNICODE
 #define ConvertToWideChar(lptString) (lptString)
-#define FreeConvertedWideChar(lpwString)
+#define FreeConvertedWideChar(lpwString) ((void) 0)
 #else
 
 LPWSTR ConvertToWideChar(LPCSTR lpString)
diff --git a/reactos/base/system/smss/debug.c b/reactos/base/system/smss/debug.c
index ba8d5ac82c4..658a00f5649 100644
--- a/reactos/base/system/smss/debug.c
+++ b/reactos/base/system/smss/debug.c
@@ -71,7 +71,7 @@ SmpCreatePT (IN OUT PHANDLE hPort,
 	     IN OUT PHANDLE phServingThread OPTIONAL)
 {
 	NTSTATUS          Status = STATUS_SUCCESS;
-	UNICODE_STRING    PortName = {0};
+	UNICODE_STRING    PortName = { 0, 0, NULL };
 	OBJECT_ATTRIBUTES ObjectAttributes;
 	HANDLE            Thread = (HANDLE) 0;
 	CLIENT_ID         Cid = {0, 0};
diff --git a/reactos/base/system/smss/smapiexec.c b/reactos/base/system/smss/smapiexec.c
index d81a029596f..b9614907603 100644
--- a/reactos/base/system/smss/smapiexec.c
+++ b/reactos/base/system/smss/smapiexec.c
@@ -41,12 +41,12 @@ SmCreateUserProcess (LPWSTR ImagePath,
 		     PLARGE_INTEGER Timeout OPTIONAL,
 		     PRTL_USER_PROCESS_INFORMATION UserProcessInfo OPTIONAL)
 {
-	UNICODE_STRING			ImagePathString = {0};
-	UNICODE_STRING			CommandLineString = {0};
-        UNICODE_STRING			SystemDirectory = {0};
+	UNICODE_STRING			ImagePathString   = { 0, 0, NULL };
+	UNICODE_STRING			CommandLineString = { 0, 0, NULL };
+	UNICODE_STRING			SystemDirectory   = { 0, 0, NULL };
 	PRTL_USER_PROCESS_PARAMETERS	ProcessParameters = NULL;
-	RTL_USER_PROCESS_INFORMATION		ProcessInfo = {0};
-	PRTL_USER_PROCESS_INFORMATION		pProcessInfo = & ProcessInfo;
+	RTL_USER_PROCESS_INFORMATION	ProcessInfo  = {0};
+	PRTL_USER_PROCESS_INFORMATION	pProcessInfo = & ProcessInfo;
 	NTSTATUS			Status = STATUS_SUCCESS;
 
 	DPRINT("SM: %s called\n", __FUNCTION__);