diff --git a/dll/win32/setupapi/dirid.c b/dll/win32/setupapi/dirid.c
index f82eceb02cd..c23eb7c8532 100644
--- a/dll/win32/setupapi/dirid.c
+++ b/dll/win32/setupapi/dirid.c
@@ -20,6 +20,8 @@
 
 #include "setupapi_private.h"
 
+#include <winspool.h>
+
 #define MAX_SYSTEM_DIRID DIRID_PRINTPROCESSOR
 #define MIN_CSIDL_DIRID 0x4000
 #define MAX_CSIDL_DIRID 0x403f
diff --git a/dll/win32/setupapi/setupapi_private.h b/dll/win32/setupapi/setupapi_private.h
index 020ae2b9866..0928a50befb 100644
--- a/dll/win32/setupapi/setupapi_private.h
+++ b/dll/win32/setupapi/setupapi_private.h
@@ -33,7 +33,6 @@
 #include <winuser.h>
 #include <wingdi.h>
 #include <winreg.h>
-#include <winspool.h>
 #include <wincon.h>
 
 #include <commdlg.h>
diff --git a/sdk/tools/winesync/setupapi.cfg b/sdk/tools/winesync/setupapi.cfg
index 55690e9fa06..558bd916dd4 100644
--- a/sdk/tools/winesync/setupapi.cfg
+++ b/sdk/tools/winesync/setupapi.cfg
@@ -2,10 +2,12 @@ directories:
   dlls/setupapi/tests: modules/rostests/winetests/setupapi
 files:
   dlls/setupapi/dialog.c: dll/win32/setupapi/dialog.c
+  dlls/setupapi/dirid.c: dll/win32/setupapi/dirid.c
+  dlls/setupapi/diskspace.c: dll/win32/setupapi/diskspace.c
   dlls/setupapi/parser.c: dll/win32/setupapi/parser.c
   dlls/setupapi/query.c: dll/win32/setupapi/query.c
   dlls/setupapi/queue.c: dll/win32/setupapi/queue.c
   dlls/setupapi/setupcab.c: dll/win32/setupapi/setupcab.c
   dlls/setupapi/stringtable.c: dll/win32/setupapi/stringtable_wine.c
 tags:
-  wine: c65d98065c0038e0919f40bec4a9dc978fb2ade9
+  wine: wine-4.8