diff --git a/modules/rostests/winetests/setupapi/misc.c b/modules/rostests/winetests/setupapi/misc.c
index 8a2d926ef7e..b08720f37f1 100644
--- a/modules/rostests/winetests/setupapi/misc.c
+++ b/modules/rostests/winetests/setupapi/misc.c
@@ -53,6 +53,7 @@ static CHAR CURR_DIR[MAX_PATH];
  *  - copy styles
  */
 
+static void (WINAPI *pMyFree)(void*);
 static BOOL (WINAPI *pSetupGetFileCompressionInfoExA)(PCSTR, PSTR, DWORD, PDWORD, PDWORD, PDWORD, PUINT);
 static BOOL (WINAPI *pSetupQueryInfOriginalFileInformationA)(PSP_INF_INFORMATION, UINT, PSP_ALTPLATFORM_INFO, PSP_ORIGINAL_FILE_INFO_A);
 
@@ -476,7 +477,7 @@ static void test_SetupGetFileCompressionInfo(void)
     ok(target_size == sizeof(uncompressed), "got %ld\n", target_size);
     ok(type == FILE_COMPRESSION_NONE, "got %d, expected FILE_COMPRESSION_NONE\n", type);
 
-    MyFree(name);
+    pMyFree(name);
     DeleteFileA(source);
 }
 
@@ -913,6 +914,7 @@ START_TEST(misc)
 {
     HMODULE hsetupapi = GetModuleHandleA("setupapi.dll");
 
+    pMyFree = (void*)GetProcAddress(hsetupapi, "MyFree");
     pSetupGetFileCompressionInfoExA = (void*)GetProcAddress(hsetupapi, "SetupGetFileCompressionInfoExA");
     pSetupQueryInfOriginalFileInformationA = (void*)GetProcAddress(hsetupapi, "SetupQueryInfOriginalFileInformationA");
 
diff --git a/sdk/include/psdk/setupapi.h b/sdk/include/psdk/setupapi.h
index 2bac7e336b7..23ecf6fceec 100644
--- a/sdk/include/psdk/setupapi.h
+++ b/sdk/include/psdk/setupapi.h
@@ -1162,21 +1162,8 @@ typedef SP_REGISTER_CONTROL_STATUSA SP_REGISTER_CONTROL_STATUS, *PSP_REGISTER_CO
 #endif /* UNICODE */
 
 
-WINSETUPAPI LONG WINAPI AddTagToGroupOrderList(PCWSTR, DWORD, DWORD);
-WINSETUPAPI VOID WINAPI AssertFail(LPSTR, UINT, LPSTR);
-WINSETUPAPI DWORD WINAPI CaptureStringArg(PCWSTR, PWSTR*);
-WINSETUPAPI BOOL WINAPI DelayedMove(PCWSTR, PCWSTR);
-WINSETUPAPI BOOL WINAPI DoesUserHavePrivilege(PCWSTR);
-WINSETUPAPI BOOL WINAPI FileExists(PCWSTR, PWIN32_FIND_DATAW);
-WINSETUPAPI DWORD WINAPI GetSetFileTimestamp(PCWSTR, PFILETIME, PFILETIME, PFILETIME, BOOLEAN);
 WINSETUPAPI VOID WINAPI InstallHinfSectionA(_In_ HWND, _In_ HINSTANCE, _In_ PCSTR, _In_ INT);
 WINSETUPAPI VOID WINAPI InstallHinfSectionW(_In_ HWND, _In_ HINSTANCE, _In_ PCWSTR, _In_ INT);
-WINSETUPAPI BOOL WINAPI IsUserAdmin(VOID);
-WINSETUPAPI VOID WINAPI MyFree(PVOID);
-WINSETUPAPI PVOID WINAPI MyMalloc(DWORD);
-WINSETUPAPI PVOID WINAPI MyRealloc(PVOID, DWORD);
-WINSETUPAPI LONG WINAPI QueryRegistryValue(HKEY, PCWSTR, PBYTE*, PDWORD, PDWORD);
-WINSETUPAPI DWORD WINAPI RetreiveFileSecurity(PCWSTR, PSECURITY_DESCRIPTOR*);
 
 WINSETUPAPI BOOL WINAPI SetupAddInstallSectionToDiskSpaceListA(_In_ HDSKSPC, _In_ HINF, _In_opt_ HINF, _In_ PCSTR, _Reserved_ PVOID, _Reserved_ UINT);
 WINSETUPAPI BOOL WINAPI SetupAddInstallSectionToDiskSpaceListW(_In_ HDSKSPC, _In_ HINF, _In_opt_ HINF, _In_ PCWSTR, _Reserved_ PVOID, _Reserved_ UINT);
@@ -2378,30 +2365,6 @@ SetupUninstallOEMInfW(
   _In_ DWORD Flags,
   _In_ PVOID Reserved);
 
-WINSETUPAPI DWORD WINAPI StampFileSecurity(PCWSTR, PSECURITY_DESCRIPTOR);
-
-
-WINSETUPAPI DWORD WINAPI pSetupCaptureAndConvertAnsiArg(PCSTR, PWSTR*);
-WINSETUPAPI VOID WINAPI pSetupCenterWindowRelativeToParent(HWND);
-WINSETUPAPI BOOL WINAPI pSetupConcatenatePaths(LPWSTR, LPCWSTR, DWORD, LPDWORD);
-WINSETUPAPI PWSTR WINAPI pSetupDuplicateString(PCWSTR);
-WINSETUPAPI BOOL WINAPI pSetupEnablePrivilege(PCWSTR, BOOL);
-WINSETUPAPI PWSTR WINAPI pSetupGetFileTitle(PCWSTR);
-WINSETUPAPI BOOL WINAPI pSetupGetVersionInfoFromImage(LPWSTR, PULARGE_INTEGER, LPWORD);
-WINSETUPAPI DWORD WINAPI pSetupGuidFromString(PCWSTR, LPGUID);
-WINSETUPAPI BOOL WINAPI pSetupIsGuidNull(LPGUID);
-WINSETUPAPI BOOL WINAPI pSetupIsUserAdmin(VOID);
-WINSETUPAPI PWSTR WINAPI pSetupMultiByteToUnicode(PCSTR, UINT);
-WINSETUPAPI DWORD WINAPI pSetupOpenAndMapForRead(PCWSTR, PDWORD, PHANDLE, PHANDLE, PVOID*);
-WINSETUPAPI DWORD WINAPI pSetupStringFromGuid(LPGUID, PWSTR, DWORD);
-
-WINSETUPAPI PSTR WINAPI pSetupUnicodeToMultiByte(PCWSTR lpUnicodeStr, UINT uCodePage);
-WINSETUPAPI BOOL WINAPI pSetupUnmapAndCloseFile(HANDLE, HANDLE, PVOID);
-
-
-WINSETUPAPI DWORD WINAPI TakeOwnershipOfFile(PCWSTR);
-WINSETUPAPI PSTR WINAPI UnicodeToMultiByte(PCWSTR lpUnicodeStr, UINT uCodePage);
-
 
 /* for backward compatability */
 #define SetupDiCreateInterfaceDeviceW	SetupDiCreateDeviceInterfaceW
@@ -2670,4 +2633,3 @@ WINSETUPAPI PSTR WINAPI UnicodeToMultiByte(PCWSTR lpUnicodeStr, UINT uCodePage);
 
 #include <poppack.h>
 #endif /* _SETUPAPI_H_ */
-
diff --git a/sdk/include/reactos/setupapi_undoc.h b/sdk/include/reactos/setupapi_undoc.h
index 12a4354b260..2dc74e16987 100644
--- a/sdk/include/reactos/setupapi_undoc.h
+++ b/sdk/include/reactos/setupapi_undoc.h
@@ -33,6 +33,50 @@ WINSETUPAPI BOOL   WINAPI pSetupStringTableSetExtraData(HSTRING_TABLE, DWORD, LP
 WINSETUPAPI LPWSTR WINAPI pSetupStringTableStringFromId(HSTRING_TABLE, DWORD);
 WINSETUPAPI BOOL   WINAPI pSetupStringTableStringFromIdEx(HSTRING_TABLE, DWORD, LPWSTR, LPDWORD);
 
+
+WINSETUPAPI LONG WINAPI AddTagToGroupOrderList(PCWSTR lpGroupName, DWORD dwUnknown2, DWORD dwUnknown3); // Not exported
+WINSETUPAPI VOID WINAPI AssertFail(LPSTR, UINT, LPSTR);                                                 // Not exported
+WINSETUPAPI DWORD WINAPI CaptureStringArg(PCWSTR lpSrc, PWSTR* lpDst);                                  // Not exported
+WINSETUPAPI BOOL WINAPI DelayedMove(PCWSTR lpExistingFileName, PCWSTR lpNewFileName);                   // Not exported
+WINSETUPAPI BOOL WINAPI DoesUserHavePrivilege(PCWSTR lpPrivilegeName);
+WINSETUPAPI PWSTR WINAPI DuplicateString(PCWSTR lpSrc);                                                 // Not exported
+WINSETUPAPI BOOL WINAPI EnablePrivilege(PCWSTR lpPrivilegeName, BOOL bEnable);                          // Not exported
+
+WINSETUPAPI BOOL WINAPI FileExists(PCWSTR lpFileName, PWIN32_FIND_DATAW lpFileFindData);                // Not exported
+WINSETUPAPI DWORD WINAPI GetSetFileTimestamp(PCWSTR, PFILETIME, PFILETIME, PFILETIME, BOOLEAN);         // Not exported
+
+WINSETUPAPI BOOL WINAPI IsUserAdmin(VOID);
+WINSETUPAPI PWSTR WINAPI MultiByteToUnicode(PCSTR lpMultiByteStr, UINT uCodePage);                      // Not exported
+WINSETUPAPI VOID WINAPI MyFree(PVOID lpMem);
+WINSETUPAPI PVOID WINAPI MyMalloc(DWORD dwSize);
+WINSETUPAPI PVOID WINAPI MyRealloc(PVOID lpSrc, DWORD dwSize);
+WINSETUPAPI DWORD WINAPI OpenAndMapForRead(PCWSTR, PDWORD, PHANDLE, PHANDLE, PVOID*);                   // Not exported
+WINSETUPAPI LONG WINAPI QueryRegistryValue(HKEY, PCWSTR, PBYTE*, PDWORD, PDWORD);                       // Not exported
+/* RetreiveFileSecurity is not a typo, as per Microsoft's dlls */
+WINSETUPAPI DWORD WINAPI RetreiveFileSecurity(PCWSTR, PSECURITY_DESCRIPTOR*);                           // Not exported
+WINSETUPAPI DWORD WINAPI StampFileSecurity(PCWSTR, PSECURITY_DESCRIPTOR);                               // Not exported
+WINSETUPAPI DWORD WINAPI TakeOwnershipOfFile(PCWSTR);                                                   // Not exported
+WINSETUPAPI PSTR WINAPI UnicodeToMultiByte(PCWSTR lpUnicodeStr, UINT uCodePage);
+WINSETUPAPI BOOL WINAPI UnmapAndCloseFile(HANDLE, HANDLE, PVOID);                                       // Not exported
+
+
+WINSETUPAPI DWORD WINAPI pSetupCaptureAndConvertAnsiArg(PCSTR, PWSTR*);
+WINSETUPAPI VOID WINAPI pSetupCenterWindowRelativeToParent(HWND);
+WINSETUPAPI BOOL WINAPI pSetupConcatenatePaths(LPWSTR, LPCWSTR, DWORD, LPDWORD);
+WINSETUPAPI PWSTR WINAPI pSetupDuplicateString(PCWSTR);
+WINSETUPAPI BOOL WINAPI pSetupEnablePrivilege(PCWSTR, BOOL);
+WINSETUPAPI PWSTR WINAPI pSetupGetFileTitle(PCWSTR);
+WINSETUPAPI BOOL WINAPI pSetupGetVersionInfoFromImage(LPWSTR, PULARGE_INTEGER, LPWORD);
+WINSETUPAPI DWORD WINAPI pSetupGuidFromString(PCWSTR, LPGUID);
+WINSETUPAPI BOOL WINAPI pSetupIsGuidNull(LPGUID);
+WINSETUPAPI BOOL WINAPI pSetupIsUserAdmin(VOID);
+WINSETUPAPI PWSTR WINAPI pSetupMultiByteToUnicode(PCSTR, UINT);
+WINSETUPAPI DWORD WINAPI pSetupOpenAndMapForRead(PCWSTR, PDWORD, PHANDLE, PHANDLE, PVOID*);
+WINSETUPAPI DWORD WINAPI pSetupStringFromGuid(LPGUID, PWSTR, DWORD);
+
+WINSETUPAPI PSTR WINAPI pSetupUnicodeToMultiByte(PCWSTR lpUnicodeStr, UINT uCodePage);
+WINSETUPAPI BOOL WINAPI pSetupUnmapAndCloseFile(HANDLE, HANDLE, PVOID);
+
 #ifdef __cplusplus
 } // extern "C"
 #endif
diff --git a/sdk/tools/winesync/setupapi.cfg b/sdk/tools/winesync/setupapi.cfg
index a154d7a6559..8cc790115da 100644
--- a/sdk/tools/winesync/setupapi.cfg
+++ b/sdk/tools/winesync/setupapi.cfg
@@ -10,4 +10,4 @@ files:
   dlls/setupapi/setupcab.c: dll/win32/setupapi/setupcab.c
   dlls/setupapi/stringtable.c: dll/win32/setupapi/stringtable_wine.c
 tags:
-  wine: a1ae33a3efb7231adf683484e9de66f84abb04d1
+  wine: 1172e66e5b7fa96decf89f8866e71b77e5773ec7