diff --git a/reactos/lib/shell32/control.c b/reactos/lib/shell32/control.c
index 72c697742a6..826f0db6b15 100644
--- a/reactos/lib/shell32/control.c
+++ b/reactos/lib/shell32/control.c
@@ -171,7 +171,7 @@ static BOOL	Control_Localize(const CPanel* panel, unsigned cx, unsigned cy,
     RECT	rc;
 
     GetClientRect(panel->hWnd, &rc);
-    for (applet = panel->first; applet; applet = applet = applet->next) {
+    for (applet = panel->first; applet; applet = applet->next) {
         for (i = 0; i < applet->count; i++) {
 	    if (!applet->info[i].dwSize) continue;
 	    if (x + XSTEP >= rc.right - rc.left) {
@@ -201,7 +201,7 @@ static LRESULT Control_WndProc_Paint(const CPanel* panel, WPARAM wParam)
     hdc = (wParam) ? (HDC)wParam : BeginPaint(panel->hWnd, &ps);
     hOldFont = SelectObject(hdc, GetStockObject(ANSI_VAR_FONT));
     GetClientRect(panel->hWnd, &rc);
-    for (applet = panel->first; applet; applet = applet = applet->next) {
+    for (applet = panel->first; applet; applet = applet->next) {
         for (i = 0; i < applet->count; i++) {
 	    if (x + XSTEP >= rc.right - rc.left) {
 	        x = 0;
diff --git a/reactos/lib/shell32/shell32_main.h b/reactos/lib/shell32/shell32_main.h
index 934af5855d3..6ecdabe776c 100644
--- a/reactos/lib/shell32/shell32_main.h
+++ b/reactos/lib/shell32/shell32_main.h
@@ -44,7 +44,6 @@ extern HMODULE	huser32;
 extern HINSTANCE shell32_hInstance;
 extern HIMAGELIST	ShellSmallIconList;
 extern HIMAGELIST	ShellBigIconList;
-extern HDPA		sic_hdpa;
 
 BOOL WINAPI Shell_GetImageList(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList);
 
diff --git a/reactos/lib/shell32/shellole.c b/reactos/lib/shell32/shellole.c
index e53f21f21b2..ccced91b89a 100644
--- a/reactos/lib/shell32/shellole.c
+++ b/reactos/lib/shell32/shellole.c
@@ -297,7 +297,7 @@ DWORD WINAPI SHCLSIDFromStringAW (LPVOID clsid, CLSID *id)
  */
 
 /* set the vtable later */
-extern ICOM_VTABLE(IMalloc) VT_Shell_IMalloc32;
+static ICOM_VTABLE(IMalloc) VT_Shell_IMalloc32;
 
 /* this is the static object instance */
 typedef struct {
@@ -305,10 +305,10 @@ typedef struct {
 	DWORD dummy;
 } _ShellMalloc;
 
-_ShellMalloc Shell_Malloc = { &VT_Shell_IMalloc32,1};
+static _ShellMalloc Shell_Malloc = { &VT_Shell_IMalloc32,1};
 
 /* this is the global allocator of shell32 */
-IMalloc * ShellTaskAllocator = NULL;
+static IMalloc * ShellTaskAllocator = NULL;
 
 /******************************************************************************
  *              IShellMalloc_QueryInterface        [VTABLE]