diff --git a/dlls/cfgmgr32/main.c b/dlls/cfgmgr32/main.c
index 7d48a96be85..b545d761f68 100644
--- a/dlls/cfgmgr32/main.c
+++ b/dlls/cfgmgr32/main.c
@@ -17,6 +17,7 @@
  */
 
 #include "wine/debug.h"
+#include "winreg.h"
 #include "cfgmgr32.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
diff --git a/dlls/cfgmgr32/tests/cfgmgr32.c b/dlls/cfgmgr32/tests/cfgmgr32.c
index aa1a2100ee1..22344c45afc 100644
--- a/dlls/cfgmgr32/tests/cfgmgr32.c
+++ b/dlls/cfgmgr32/tests/cfgmgr32.c
@@ -17,6 +17,7 @@
  */
 
 #include "wine/test.h"
+#include "winreg.h"
 #include "cfgmgr32.h"
 
 static void test_CM_MapCrToWin32Err(void)
diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h
index 3eefbf87f63..7b5d5f19298 100644
--- a/dlls/hidclass.sys/hid.h
+++ b/dlls/hidclass.sys/hid.h
@@ -22,6 +22,7 @@
 #include "winbase.h"
 #include "winternl.h"
 #include "winioctl.h"
+#include "winreg.h"
 #include "ddk/wdm.h"
 #include "hidusage.h"
 #include "ddk/hidport.h"
diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c
index e2c5b10da9e..9a43de8fd76 100644
--- a/dlls/win32u/sysparams.c
+++ b/dlls/win32u/sysparams.c
@@ -31,7 +31,7 @@
 #define WIN32_NO_STATUS
 #include "ntgdi_private.h"
 #include "ntuser_private.h"
-#include "devpropdef.h"
+#include "winreg.h"
 #include "cfgmgr32.h"
 #include "d3dkmdt.h"
 #include "wine/wingdi16.h"
diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c
index f07e6b31bd5..26764fa78ef 100644
--- a/dlls/winexinput.sys/main.c
+++ b/dlls/winexinput.sys/main.c
@@ -27,6 +27,7 @@
 #include "winbase.h"
 #include "winternl.h"
 #include "winioctl.h"
+#include "winreg.h"
 
 #include "cfgmgr32.h"
 #include "ddk/wdm.h"
diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h
index ee1846b0e97..0893e42b399 100644
--- a/include/cfgmgr32.h
+++ b/include/cfgmgr32.h
@@ -19,15 +19,13 @@
 #ifndef _CFGMGR32_H_
 #define _CFGMGR32_H_
 
-/* FIXME: #include <cfg.h> */
+#include <cfg.h>
+#include <devpropdef.h>
 
 #ifndef GUID_DEFINED
 # include <guiddef.h>
 #endif
 
-#include <winreg.h>
-#include <devpropdef.h>
-
 /* cfgmgr32 doesn't use the normal convention, it adds an underscore before A/W */
 #ifdef WINE_NO_UNICODE_MACROS
 # define DECL_WINELIB_CFGMGR32_TYPE_AW(type)  /* nothing */
@@ -193,23 +191,6 @@ typedef CHAR *DEVNODEID_A, *DEVINSTID_A;
 typedef WCHAR *DEVNODEID_W, *DEVINSTID_W;
 typedef ULONG REGDISPOSITION;
 
-typedef enum _PNP_VETO_TYPE
-{
-    PNP_VetoTypeUnknown,
-    PNP_VetoLegacyDevice,
-    PNP_VetoPendingClose,
-    PNP_VetoWindowsApp,
-    PNP_VetoWindowsService,
-    PNP_VetoOutstandingOpen,
-    PNP_VetoDevice,
-    PNP_VetoDriver,
-    PNP_VetoIllegalDeviceRequest,
-    PNP_VetoInsufficientPower,
-    PNP_VetoNonDisableable,
-    PNP_VetoLegacyDriver,
-    PNP_VetoInsufficientRights
-} PNP_VETO_TYPE, *PPNP_VETO_TYPE;
-
 typedef enum _CM_NOTIFY_FILTER_TYPE
 {
     CM_NOTIFY_FILTER_TYPE_DEVICEINTERFACE,