diff --git a/reactos/dll/cpl/desk/advmon.c b/reactos/dll/cpl/desk/advmon.c
index 5a2bd8fa656..aba9b9a97e0 100644
--- a/reactos/dll/cpl/desk/advmon.c
+++ b/reactos/dll/cpl/desk/advmon.c
@@ -86,7 +86,9 @@ DisplayAdvancedSettings(HWND hWndParent, PDISPLAY_DEVICE_ENTRY DisplayDevice)
     HPSXA hpsxaDev, hpsxaDisp;
     BOOL Ret;
     IDataObject *pdo;
+#ifdef _MSC_VER
     HMODULE hShell32 = NULL;
+#endif
     CPSEAE msvc_SHCreatePropSheetExtArrayEx;
 
     /* silence gcc warning */
@@ -140,8 +142,10 @@ DisplayAdvancedSettings(HWND hWndParent, PDISPLAY_DEVICE_ENTRY DisplayDevice)
 
     IDataObject_Release(pdo);
 
+#ifdef _MSC_VER
     if (hShell32)
         FreeLibrary(hShell32);
+#endif
 
     return Ret;
 }
diff --git a/reactos/dll/cpl/desk/settings.c b/reactos/dll/cpl/desk/settings.c
index 5887fc37b37..d0aacdf50b2 100644
--- a/reactos/dll/cpl/desk/settings.c
+++ b/reactos/dll/cpl/desk/settings.c
@@ -243,8 +243,6 @@ ByeBye:
 		HeapFree(GetProcessHeap(), 0, name);
 	if (key != NULL)
 		HeapFree(GetProcessHeap(), 0, key);
-	if (devid != NULL)
-		HeapFree(GetProcessHeap(), 0, devid);
 	return FALSE;
 }