diff --git a/dll/win32/setupapi/CMakeLists.txt b/dll/win32/setupapi/CMakeLists.txt
index 4c0f1ce0682..2b3b4bae4a9 100644
--- a/dll/win32/setupapi/CMakeLists.txt
+++ b/dll/win32/setupapi/CMakeLists.txt
@@ -4,11 +4,7 @@ include_directories(
     ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl
     ${CMAKE_CURRENT_BINARY_DIR})
 
-add_definitions(
-    -D_SETUPAPI_
-    -D_CFGMGR32_
-)
-
+add_definitions(-D_SETUPAPI_ -D_CFGMGR32_)
 remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
 
 add_rpc_files(client ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/pnp.idl)
diff --git a/dll/win32/setupapi/devclass.c b/dll/win32/setupapi/devclass.c
index c3bc47adb7c..2bb7fcebbc5 100644
--- a/dll/win32/setupapi/devclass.c
+++ b/dll/win32/setupapi/devclass.c
@@ -572,7 +572,7 @@ SetupDiGetClassImageListExW(
                 }
                 else if(!DllName)
                 {
-                    hIcon = LoadImage(hInstance, MAKEINTRESOURCE(miniIconIndex), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
+                    hIcon = LoadImage(SETUPAPI_hInstance, MAKEINTRESOURCE(miniIconIndex), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
                     list->IconIndexes[i] = ImageList_AddIcon(ClassImageListData->ImageList, hIcon);
                 }
 
@@ -593,7 +593,7 @@ SetupDiGetClassImageListExW(
         /* Finally, add the overlay icons to the image list */
         for (i = 0; i <= 2; i++)
         {
-            hIcon = LoadImage(hInstance, MAKEINTRESOURCE(500 + i), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
+            hIcon = LoadImage(SETUPAPI_hInstance, MAKEINTRESOURCE(500 + i), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
             if (hIcon)
             {
                 idx = ImageList_AddIcon(ClassImageListData->ImageList, hIcon);
@@ -676,7 +676,7 @@ SetupDiLoadClassIcon(
             if(DllName)
                 iconIndex = UNKNOWN_ICON_INDEX;
 
-            hIcon = LoadImage(hInstance, MAKEINTRESOURCE(iconIndex), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR);
+            hIcon = LoadImage(SETUPAPI_hInstance, MAKEINTRESOURCE(iconIndex), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR);
 
             if(!hIcon)
                 goto cleanup;
diff --git a/dll/win32/setupapi/dialog.c b/dll/win32/setupapi/dialog.c
index b1611dc32ba..d7a2d7664c1 100644
--- a/dll/win32/setupapi/dialog.c
+++ b/dll/win32/setupapi/dialog.c
@@ -49,7 +49,7 @@ static void promptdisk_init(HWND hwnd, struct promptdisk_params *params)
         WCHAR format[256];
         WCHAR unknown[256];
         DWORD_PTR args[2];
-        LoadStringW(hInstance, IDS_PROMPTDISK, format,
+        LoadStringW(SETUPAPI_hInstance, IDS_PROMPTDISK, format,
             sizeof(format)/sizeof(format[0]));
 
         args[0] = (DWORD_PTR)params->FileSought;
@@ -57,7 +57,7 @@ static void promptdisk_init(HWND hwnd, struct promptdisk_params *params)
             args[1] = (DWORD_PTR)params->DiskName;
         else
         {
-            LoadStringW(hInstance, IDS_UNKNOWN, unknown,
+            LoadStringW(SETUPAPI_hInstance, IDS_UNKNOWN, unknown,
                 sizeof(unknown)/sizeof(unknown[0]));
             args[1] = (DWORD_PTR)unknown;
         }
@@ -66,10 +66,10 @@ static void promptdisk_init(HWND hwnd, struct promptdisk_params *params)
                        (__ms_va_list*)args);
         SetDlgItemTextW(hwnd, IDC_FILENEEDED, message);
 
-        LoadStringW(hInstance, IDS_INFO, message,
+        LoadStringW(SETUPAPI_hInstance, IDS_INFO, message,
             sizeof(message)/sizeof(message[0]));
         SetDlgItemTextW(hwnd, IDC_INFO, message);
-        LoadStringW(hInstance, IDS_COPYFROM, message,
+        LoadStringW(SETUPAPI_hInstance, IDS_COPYFROM, message,
             sizeof(message)/sizeof(message[0]));
         SetDlgItemTextW(hwnd, IDC_COPYFROM, message);
     }
@@ -272,7 +272,7 @@ UINT WINAPI SetupPromptForDiskW(HWND hwndParent, PCWSTR DialogTitle, PCWSTR Disk
     params.PathBufferSize = PathBufferSize;
     params.PathRequiredSize = PathRequiredSize;
 
-    ret = DialogBoxParamW(hInstance, MAKEINTRESOURCEW(IDPROMPTFORDISK),
+    ret = DialogBoxParamW(SETUPAPI_hInstance, MAKEINTRESOURCEW(IDPROMPTFORDISK),
         hwndParent, promptdisk_proc, (LPARAM)&params);
 
     if(ret == DPROMPT_CANCEL)
diff --git a/dll/win32/setupapi/misc.c b/dll/win32/setupapi/misc.c
index 9f92f71bf41..857c64cca94 100644
--- a/dll/win32/setupapi/misc.c
+++ b/dll/win32/setupapi/misc.c
@@ -911,7 +911,7 @@ VOID WINAPI AssertFail(LPSTR lpFile, UINT uLine, LPSTR lpMessage)
 
     TRACE("%s %u %s\n", lpFile, uLine, lpMessage);
 
-    GetModuleFileNameA(hInstance, szModule, MAX_PATH);
+    GetModuleFileNameA(SETUPAPI_hInstance, szModule, MAX_PATH);
     lpName = strrchr(szModule, '\\');
     if (lpName != NULL)
         lpName++;
diff --git a/dll/win32/setupapi/setupapi_private.h b/dll/win32/setupapi/setupapi_private.h
index 7a11aa680ba..84226416676 100644
--- a/dll/win32/setupapi/setupapi_private.h
+++ b/dll/win32/setupapi/setupapi_private.h
@@ -58,6 +58,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
 #undef __WINESRC__
 #endif
 
+#ifdef __REACTOS__
+#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0]))
+#endif
+
 #include "resource.h"
 
 #define SETUP_DEVICE_INFO_SET_MAGIC 0xd00ff057
@@ -245,7 +249,7 @@ struct FileLog /* HSPFILELOG */
     LPWSTR LogName;
 };
 
-extern HINSTANCE hInstance;
+extern HINSTANCE SETUPAPI_hInstance;
 extern OSVERSIONINFOEXW OsVersionInfo;
 
 /*
diff --git a/dll/win32/setupapi/setupcab.c b/dll/win32/setupapi/setupcab.c
index 42f6192c224..efd150fd9ee 100644
--- a/dll/win32/setupapi/setupcab.c
+++ b/dll/win32/setupapi/setupcab.c
@@ -29,7 +29,7 @@
 #include <share.h>
 #include <fdi.h>
 
-HINSTANCE hInstance = NULL;
+HINSTANCE SETUPAPI_hInstance = NULL;
 OSVERSIONINFOEXW OsVersionInfo;
 
 static HINSTANCE CABINET_hInstance = NULL;
@@ -655,7 +655,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
         OsVersionInfo.dwOSVersionInfoSize = sizeof(OsVersionInfo);
         if (!GetVersionExW((POSVERSIONINFOW)&OsVersionInfo))
             return FALSE;
-        hInstance = (HINSTANCE)hinstDLL;
+        SETUPAPI_hInstance = hinstDLL;
         break;
     case DLL_PROCESS_DETACH:
         if (lpvReserved) break;