More namespace dependency fixes (#709)

* Namespace depenency improvments: Controls, Input, Globalization, WindowsAndMessaging * Namespace refactoring for FileSystem, IO, Ioctl
microsoft · Oct 26, 2021 · 41de513 · 41de513
1 parent 485061c
commit 41de513
Show file tree

Hide file tree

Showing 33 changed files with 344 additions and 381 deletions.
diff --git a/generation/WinSDK/ConstantsScraper.header.txt b/generation/WinSDK/ConstantsScraper.header.txt
@@ -25,5 +25,5 @@ using static Windows.Win32.System.Threading.Apis; // Various constants
 using static Windows.Win32.NetworkManagement.Dns.Apis; // Various constants
 using static Windows.Win32.NetworkManagement.IpHelper.Apis; // Various constants
 using static Windows.Win32.Networking.Clustering.Apis; // Various constants
-
+using static Windows.Win32.System.Ioctl.Apis; // Various constants
 
diff --git a/generation/WinSDK/Partitions/Base/main.cpp b/generation/WinSDK/Partitions/Base/main.cpp
@@ -33,7 +33,6 @@
 #include <storprop.h>
 #include <ioapiset.h>
 #include <dbt.h>
-#include <ntddstor.h>
 #include <atlthunk.h>
 #include <lmserver.h>
 #include <windowsceip.h>

diff --git a/generation/WinSDK/Partitions/Base/settings.rsp b/generation/WinSDK/Partitions/Base/settings.rsp
@@ -31,19 +31,16 @@ _D3DVERTEXBLENDFLAGS
 _D3DTEXTURETRANSFORMFLAGS
 PENCLAVE_ROUTINE
 LPENCLAVE_ROUTINE
-_VIRTUAL_STORAGE_TYPE
 --traverse
 <IncludeRoot>/shared/apdevpkey.h
 <IncludeRoot>/shared/devpkey.h
-<IncludeRoot>/shared/ntddstor.h
 <IncludeRoot>/um/dbt.h
 <IncludeRoot>/shared/devpropdef.h
 <IncludeRoot>/shared/ioevent.h
 <IncludeRoot>/um/d3dnthal.h
 <IncludeRoot>/um/d3dcaps.h
 <IncludeRoot>/um/d3dtypes.h
 <IncludeRoot>/um/winddi.h
-<IncludeRoot>/um/winioctl.h
 <IncludeRoot>/shared/wtypes.h
 <IncludeRoot>/um/rpcnsip.h
 <IncludeRoot>/um/mmiscapi2.h

diff --git a/generation/WinSDK/Partitions/Controls.RichEdit/main.cpp b/generation/WinSDK/Partitions/Controls.RichEdit/main.cpp
@@ -0,0 +1,12 @@
+#define SECURITY_WIN32 // For sspi.h
+#define QCC_OS_GROUP_WINDOWS
+
+#include "intrinfix.h"
+
+#include "windows.fixed.h"
+#include <sdkddkver.h>
+
+#include <richedit.h>
+#include <textserv.h>
+#include <richole.h>
+#include <tom.h>
diff --git a/generation/WinSDK/Partitions/Controls.RichEdit/settings.rsp b/generation/WinSDK/Partitions/Controls.RichEdit/settings.rsp
@@ -0,0 +1,10 @@
+--exclude
+UiaRect
+--traverse
+<IncludeRoot>/um/Richedit.h
+<IncludeRoot>/um/TextServ.h
+<IncludeRoot>/um/RichOle.h
+<IncludeRoot>/um/TOM.h
+--namespace
+Windows.Win32.UI.Controls.RichEdit
+
diff --git a/generation/WinSDK/Partitions/Controls/main.cpp b/generation/WinSDK/Partitions/Controls/main.cpp
@@ -12,10 +12,6 @@
 #include <commoncontrols.h>
 #include <shlobj.h>
 #include <prsht.h>
-#include <richedit.h>
-#include <tom.h>
-#include <richole.h>
-#include <textserv.h>
 #include <dpa_dsa.h>
 #include <uxtheme.h>
 #include <commctrl.h>

diff --git a/generation/WinSDK/Partitions/Controls/settings.rsp b/generation/WinSDK/Partitions/Controls/settings.rsp
@@ -5,10 +5,6 @@ UiaRect
 <IncludeRoot>/shared/windowsx.h
 <IncludeRoot>/um/commoncontrols.h
 <IncludeRoot>/um/prsht.h
-<IncludeRoot>/um/Richedit.h
-<IncludeRoot>/um/TOM.h
-<IncludeRoot>/um/RichOle.h
-<IncludeRoot>/um/TextServ.h
 <IncludeRoot>/um/dpa_dsa.h
 <IncludeRoot>/um/Uxtheme.h
 <IncludeRoot>/um/CommCtrl.h

diff --git a/generation/WinSDK/Partitions/DlgBox/settings.rsp b/generation/WinSDK/Partitions/DlgBox/settings.rsp
@@ -3,4 +3,4 @@
 <IncludeRoot>/shared/cderr.h
 <IncludeRoot>/um/colordlg.h
 --namespace
-Windows.Win32.UI.WindowsAndMessaging
+Windows.Win32.UI.Controls.Dialogs
diff --git a/generation/WinSDK/Partitions/Fs/main.cpp b/generation/WinSDK/Partitions/Fs/main.cpp
@@ -17,7 +17,6 @@
 #include <processenv.h>
 #include <minwinbase.h>
 #include <winioctl.h>
-#include <ioapiset.h>
 #include <fileapi.h>
 #include <ntdddisk.h>
 #include <dskquota.h>
@@ -36,4 +35,5 @@
 #include <fttypes.h>
 #include <ioringapi.h>
 #include <ntioring_x.h>
-
+#include <winioctl.h>
+#include <ntddstor.h>
diff --git a/generation/WinSDK/Partitions/Fs/settings.rsp b/generation/WinSDK/Partitions/Fs/settings.rsp
@@ -14,7 +14,6 @@ DumpLogRecords
 <IncludeRoot>/um/fileapi.h
 <IncludeRoot>/um/fileapifromapp.h
 <IncludeRoot>/um/FileHC.h
-<IncludeRoot>/um/ioapiset.h
 <IncludeRoot>/um/ktmw32.h
 <IncludeRoot>/um/LMShare.h
 <IncludeRoot>/um/lmstats.h
@@ -28,5 +27,6 @@ DumpLogRecords
 <IncludeRoot>/um/wofapi.h
 <IncludeRoot>/um/ioringapi.h
 <IncludeRoot>/um/ntioring_x.h
+<IncludeRoot>/shared/ntddstor.h
 --namespace
 Windows.Win32.Storage.FileSystem
diff --git a/generation/WinSDK/Partitions/IO/main.cpp b/generation/WinSDK/Partitions/IO/main.cpp
@@ -0,0 +1,24 @@
+#define SECURITY_WIN32 // For sspi.h
+
+#include "intrinfix.h"
+
+#include "windows.fixed.h"
+#include <sdkddkver.h>
+
+#include <mmsystem.h>
+
+// Headers needed for COM
+#include <objbase.h>
+#include <ObjIdl.h>
+#include <combaseapi.h>
+
+#include <winbase.h>
+#include <winnt.h>
+
+#define USERMODE_DRIVER
+#include <winddi.h>
+#undef USERMODE_DRIVER
+
+#include <winuser.h>
+
+#include <ioapiset.h>
diff --git a/generation/WinSDK/Partitions/IO/settings.rsp b/generation/WinSDK/Partitions/IO/settings.rsp
@@ -0,0 +1,5 @@
+--traverse
+<IncludeRoot>/um/ioapiset.h
+--namespace
+Windows.Win32.System.IO
+
diff --git a/generation/WinSDK/Partitions/Input.Ime/main.cpp b/generation/WinSDK/Partitions/Input.Ime/main.cpp
@@ -0,0 +1,21 @@
+#define SECURITY_WIN32 // For sspi.h
+#define QCC_OS_GROUP_WINDOWS
+
+#include "intrinfix.h"
+
+#include "windows.fixed.h"
+#include <sdkddkver.h>
+
+#include <winbase.h>
+#include <winnt.h>
+#include <winuser.h>
+
+#include <msime.h>
+#include <imm.h>
+#include <immdev.h>
+#include <imepad.h>
+#include <msimeapi.h>
+
+#define _DDKIMM_H_ // Keeps INPUTCONTEXT and IMEINFO from coming in again
+#include <dimm.h>
+
diff --git a/generation/WinSDK/Partitions/Input.Ime/settings.rsp b/generation/WinSDK/Partitions/Input.Ime/settings.rsp
@@ -0,0 +1,10 @@
+--traverse
+<IncludeRoot>/um/msime.h
+<IncludeRoot>/um/imm.h
+<IncludeRoot>/um/immdev.h
+<IncludeRoot>/um/imepad.h
+<IncludeRoot>/um/msimeapi.h
+<IncludeRoot>/um/dimm.h
+--namespace
+Windows.Win32.UI.Input.Ime
+
diff --git a/generation/WinSDK/Partitions/InputRadial/settings.rsp b/generation/WinSDK/Partitions/InputRadial/settings.rsp
@@ -1,4 +1,4 @@
 --traverse
 <IncludeRoot>/um/RadialControllerInterop.h
 --namespace
-Windows.Win32.UI.RadialInput
+Windows.Win32.UI.Input.Radial
diff --git a/generation/WinSDK/Partitions/Input_Ink/settings.rsp b/generation/WinSDK/Partitions/Input_Ink/settings.rsp
@@ -2,4 +2,4 @@
 <IncludeRoot>/um/InkPresenterDesktop.h
 <IncludeRoot>/um/inkrenderer.h
 --namespace
-Windows.Win32.UI.InkInput
+Windows.Win32.UI.Input.Ink
diff --git a/generation/WinSDK/Partitions/Intl/main.cpp b/generation/WinSDK/Partitions/Intl/main.cpp
@@ -17,11 +17,6 @@
 #include <datetimeapi.h>
 #include <spellcheckprovider.h>
 #include <spellcheck.h>
-#include <msime.h>
-#include <imm.h>
-#include <immdev.h>
-#include <imepad.h>
-#include <msimeapi.h>
 #include <usp10.h>
 #include <muiload.h>
 #include <gb18030.h>
@@ -32,6 +27,3 @@
 #include <icui18n.h>
 #include <ime_cmodes.h>
 #include <mlang.h>
-
-#define _DDKIMM_H_ // Keeps INPUTCONTEXT and IMEINFO from coming in again
-#include <dimm.h>
diff --git a/generation/WinSDK/Partitions/Intl/settings.rsp b/generation/WinSDK/Partitions/Intl/settings.rsp
@@ -5,16 +5,10 @@
 <IncludeRoot>/um/datetimeapi.h
 <IncludeRoot>/um/spellcheckprovider.h
 <IncludeRoot>/um/spellcheck.h
-<IncludeRoot>/um/msime.h
-<IncludeRoot>/um/imm.h
-<IncludeRoot>/um/immdev.h
-<IncludeRoot>/um/imepad.h
-<IncludeRoot>/um/msimeapi.h
 <IncludeRoot>/um/usp10.h
 <IncludeRoot>/um/muiload.h
 <IncludeRoot>/um/gb18030.h
 <IncludeRoot>/um/icu.h
-<IncludeRoot>/um/dimm.h
 <IncludeRoot>/um/bcp47mrm.h
 <IncludeRoot>/um/elssrvc.h
 <IncludeRoot>/um/icucommon.h

diff --git a/generation/WinSDK/Partitions/Ioctl/main.cpp b/generation/WinSDK/Partitions/Ioctl/main.cpp
@@ -0,0 +1,11 @@
+#define SECURITY_WIN32 // For sspi.h
+#define QCC_OS_GROUP_WINDOWS
+
+#include "intrinfix.h"
+
+#include "windows.fixed.h"
+#include <sdkddkver.h>
+
+#include <minwinbase.h>
+#include <winioctl.h>
+#include <ntddstor.h>
diff --git a/generation/WinSDK/Partitions/Ioctl/settings.rsp b/generation/WinSDK/Partitions/Ioctl/settings.rsp
@@ -0,0 +1,7 @@
+--exclude
+_VIRTUAL_STORAGE_TYPE
+--traverse
+<IncludeRoot>/shared/ntddstor.h
+<IncludeRoot>/um/winioctl.h
+--namespace
+Windows.Win32.System.Ioctl
diff --git a/generation/WinSDK/Partitions/KeyboardAndMouseInput/settings.rsp b/generation/WinSDK/Partitions/KeyboardAndMouseInput/settings.rsp
@@ -1,4 +1,4 @@
 --traverse
 <IncludeRoot>/um/kbd.h
 --namespace
-Windows.Win32.UI.KeyboardAndMouseInput
+Windows.Win32.UI.Input.KeyboardAndMouse
diff --git a/generation/WinSDK/Partitions/WinTouch/settings.rsp b/generation/WinSDK/Partitions/WinTouch/settings.rsp
@@ -5,4 +5,4 @@ NaN
 --traverse
 <IncludeRoot>/um/manipulations.h
 --namespace
-Windows.Win32.UI.TouchInput
+Windows.Win32.UI.Input.Touch
diff --git a/generation/WinSDK/Partitions/Xinput/settings.rsp b/generation/WinSDK/Partitions/Xinput/settings.rsp
@@ -1,4 +1,4 @@
 --traverse
 <IncludeRoot>/um/Xinput.h
 --namespace
-Windows.Win32.UI.XInput
+Windows.Win32.UI.Input.XboxController
diff --git a/generation/WinSDK/Windows.Win32.proj b/generation/WinSDK/Windows.Win32.proj
@@ -47,11 +47,11 @@
     <ShowEmitWinmdOutputDetails>true</ShowEmitWinmdOutputDetails>
 
     <!-- To regenerate this list; remove the property and the build will indicate what names can safely go here as a build optimization -->
-    <ExcludeFromCrossarch>Cos;ActiveDirectory;AllJoyn;Antimalware;ApplicationVerifier;Audio;Authorization;Automation;Bits;Bluetooth;Buses;CEIP;Certificates;Cloudapi;CmpApi;Communication;CompositionSwapchain;Console;Credentials;Cryptography;DataXchg;DebuggerExtensions;Dedup;DeviceAccess;DeviceQuery;DevLic;Direct2D;Direct3D10;Direct3D11;Direct3D12;Direct3DDxgi;Direct3DHlsl;DirectComp;DirectDraw;DirectManipulation;DirectML;DirectWrite;Display;DShow;DTC;Dwm;Eap;EapHost;Edp;Enstor;Environment;Etw;Fax;FileHistory;Fs;Fsrm;FunctionDiscovery;GameMode;GamingDvcInfo;Gdi;Gpmc;HostComputeSystem;HostComputeNetwork;HtmlHelp;HttpServer;Identity;IdentityProvider;Ifsk;ImagingDevice;IMapi;IndexSrv;InputRadial;Input_Ink;Input_IntContext;InternetConnectionWizard;InternetExplorer;Intl;Isolation;JobObjects;Kernel;KeyboardAndMouseInput;Ldap;LibraryLoader;Lwef;MachineLearning;MadCap;MagApi;Mapi;Mbn;MdmReg;Memory;MessageQueuing;Mi;MixedReality;MixedRealityInterop;Mmc;Monitor;MsChap;MsCs;MsTv;MsXml;Ndf;Ndis;NetMgmt;NetShell;NetworkAccessProtection;Nla;Nps;NWifi;Of;Opc;OpenGL;P2p;Parcon;PicAcq;Pipes;Pla;Policy;Power;PrintTicket;Proc_Snap;ProjFs;Properties;PWM;Qos;Rdc;Rdp;RealTimeCommunications;Registry;RemoteAssist;Rm;Rpc;RstMgr;SecBitomet;Security;Security.AppLocker;Security.ConfigurationSnapin;Security.Cryptography.Catalog;Security.Cryptography;Security.Cryptography.Sip;Security.DiagnosticDataQuery;Security.DirectoryServices;Security.LicenseProtection;Security.Tpm;Security.WinTrust;Security.WinWlx;SecurityCenter;Sens;SerPorts;Services;Setup;Shutdown;SideShow;Smi;Speech;Sr;SwDevice;Tapi3;TaskSchd;Tbs;Tcui;Threading;Time;ToolHelp;Tsf;Ual;UiAnimation;UpdateAssessment;Upnp;Vhd;VirtualDiskService;VSS;Wab;Wcm;Wcn;Wcs;Wds;WebDav;WebServicesOnDevices;WebSock;Wec;Wer;Wes;Wibe;Wic;Win32_Tile_Badge_Notif;WinAuto;WinContacts;WindowsConnectionManager;WindowsFilteringPlatform;WindowsFirewall;WindowsRibbon;WindowsSetupAndMigration;WinInet;WinLocation;WinRm;WinSat;WinSync;WinTouch;Wmdm;WmFormat;Wmi;Wmlss;Wmp;Wnet;wnv;WpdSdk;Wsb;Wsl;Wsw;Wua;Xaml_Diagnostics;Xaudio2;Xblidp;Xinput;XmlLite;Xps;XpsPrinting;AppxPackaging;Ado;Foundation;Hypervisor;Hid;Com;Com.CallObj;Com.ChannelCreds;Com.Events;Com.StructuredStorage;Com.Urlmon;ComOle;PsApi;RRas;Wia;WinSensors;Tablet;TermServ;TransactionServer;WinRT;Snmp;SystemInformation;Iis</ExcludeFromCrossarch>
+    <ExcludeFromCrossarch>Cos;ActiveDirectory;AllJoyn;Antimalware;ApplicationVerifier;Audio;Authorization;Automation;Bits;Bluetooth;Buses;CEIP;Certificates;Cloudapi;CmpApi;Communication;CompositionSwapchain;Console;Controls.RichEdit;Credentials;Cryptography;DataXchg;DebuggerExtensions;Dedup;DeviceAccess;DeviceQuery;DevLic;Direct2D;Direct3D10;Direct3D11;Direct3D12;Direct3DDxgi;Direct3DHlsl;DirectComp;DirectDraw;DirectManipulation;DirectML;DirectWrite;Display;DShow;DTC;Dwm;Eap;EapHost;Edp;Enstor;Environment;Etw;Fax;FileHistory;Fs;Fsrm;FunctionDiscovery;GameMode;GamingDvcInfo;Gdi;Gpmc;HostComputeSystem;HostComputeNetwork;HtmlHelp;HttpServer;Identity;IdentityProvider;Ifsk;ImagingDevice;IMapi;IndexSrv;InputRadial;Input_Ink;Input_IntContext;Input.Ime;InternetConnectionWizard;InternetExplorer;Intl;IO;Isolation;JobObjects;Kernel;KeyboardAndMouseInput;Ldap;LibraryLoader;Lwef;MachineLearning;MadCap;MagApi;Mapi;Mbn;MdmReg;Memory;MessageQueuing;Mi;MixedReality;MixedRealityInterop;Mmc;Monitor;MsChap;MsCs;MsTv;MsXml;Ndf;Ndis;NetMgmt;NetShell;NetworkAccessProtection;Nla;Nps;NWifi;Of;Opc;OpenGL;P2p;Parcon;PicAcq;Pipes;Pla;Policy;Power;PrintTicket;Proc_Snap;ProjFs;Properties;PWM;Qos;Rdc;Rdp;RealTimeCommunications;Registry;RemoteAssist;Rm;Rpc;RstMgr;SecBitomet;Security;Security.AppLocker;Security.ConfigurationSnapin;Security.Cryptography.Catalog;Security.Cryptography;Security.Cryptography.Sip;Security.DiagnosticDataQuery;Security.DirectoryServices;Security.LicenseProtection;Security.Tpm;Security.WinTrust;Security.WinWlx;SecurityCenter;Sens;SerPorts;Services;Setup;Shutdown;SideShow;Smi;Speech;Sr;SwDevice;Tapi3;TaskSchd;Tbs;Tcui;Threading;Time;ToolHelp;Tsf;Ual;UiAnimation;UpdateAssessment;Upnp;Vhd;VirtualDiskService;VSS;Wab;Wcm;Wcn;Wcs;Wds;WebDav;WebServicesOnDevices;WebSock;Wec;Wer;Wes;Wibe;Wic;Win32_Tile_Badge_Notif;WinAuto;WinContacts;WindowsConnectionManager;WindowsFilteringPlatform;WindowsFirewall;WindowsRibbon;WindowsSetupAndMigration;WinInet;WinLocation;WinRm;WinSat;WinSync;WinTouch;Wmdm;WmFormat;Wmi;Wmlss;Wmp;Wnet;wnv;WpdSdk;Wsb;Wsl;Wsw;Wua;Xaml_Diagnostics;Xaudio2;Xblidp;Xinput;XmlLite;Xps;XpsPrinting;AppxPackaging;Ado;Foundation;Hypervisor;Hid;Com;Com.CallObj;Com.ChannelCreds;Com.Events;Com.StructuredStorage;Com.Urlmon;ComOle;PsApi;RRas;Wia;WinSensors;Tablet;TermServ;TransactionServer;WinRT;Snmp;SystemInformation;Iis</ExcludeFromCrossarch>
 
     <!-- Set to false because the WinSDK assets are already in this project -->
     <UseWinSDKAssets>false</UseWinSDKAssets>
-  </PropertyGroup> 
+  </PropertyGroup>
 
   <ItemGroup>
     <ManualCs Include="manual\*.cs"/>

diff --git a/generation/WinSDK/autoTypes.json b/generation/WinSDK/autoTypes.json
@@ -98,7 +98,7 @@
     "ValueType": "DECLARE_HANDLE"
   },
   {
-    "Namespace": "Windows.Win32.UI.TouchInput",
+    "Namespace": "Windows.Win32.UI.Input.Touch",
     "Name": "HGESTUREINFO",
     "ValueType": "DECLARE_HANDLE"
   },
@@ -158,7 +158,7 @@
     "ValueType": "DECLARE_HANDLE"
   },
   {
-    "Namespace": "Windows.Win32.UI.KeyboardAndMouseInput",
+    "Namespace": "Windows.Win32.UI.Input",
     "Name": "HRAWINPUT",
     "ValueType": "DECLARE_HANDLE"
   },
@@ -183,7 +183,7 @@
     "ValueType": "DECLARE_HANDLE"
   },
   {
-    "Namespace": "Windows.Win32.UI.TouchInput",
+    "Namespace": "Windows.Win32.UI.Input.Touch",
     "Name": "HTOUCHINPUT",
     "ValueType": "DECLARE_HANDLE"
   },
@@ -831,7 +831,7 @@
     "ValueType": "DECLARE_HANDLE"
   },
   {
-    "Namespace": "Windows.Win32.System.SystemServices",
+    "Namespace": "Windows.Win32.UI.HiDpi",
     "Name": "DPI_AWARENESS_CONTEXT",
     "ValueType": "DECLARE_HANDLE"
   },

diff --git a/generation/WinSDK/enums.json b/generation/WinSDK/enums.json
@@ -3799,6 +3799,7 @@
   },
   {
     "type": "uint",
+    "namespace": "Windows.Win32.Graphics.Gdi",
     "name": "TEXT_ALIGN_OPTIONS",
     "members": [
       {
@@ -4312,6 +4313,7 @@
   },
   {
     "name": "SCROLLBAR_CONSTANTS",
+    "namespace": "Windows.Win32.UI.WindowsAndMessaging",
     "flags": true,
     "members": [
       {
@@ -9525,6 +9527,7 @@
   },
   {
     "name": "IMAGE_FLAGS",
+    "namespace": "Windows.Win32.UI.WindowsAndMessaging",
     "flags": true,
     "members": [
       {
@@ -23883,11 +23886,11 @@
     ],
     "uses": [
       {
-        "struct": "tttoolinfoa",
+        "struct": "TTTOOLINFOA",
         "field": "uFlags"
       },
       {
-        "struct": "tttoolinfow",
+        "struct": "TTTOOLINFOW",
         "field": "uFlags"
       }
     ]

diff --git a/generation/WinSDK/manual/Dfs.cs b/generation/WinSDK/manual/Dfs.cs
@@ -7,6 +7,6 @@ namespace Windows.Win32.Storage.IscsiDisc
 {
     public static unsafe partial class Apis
     {
-        public const uint IOCTL_SCSI_BASE = Windows.Win32.System.SystemServices.Apis.FILE_DEVICE_CONTROLLER;
+        public const uint IOCTL_SCSI_BASE = Windows.Win32.System.Ioctl.Apis.FILE_DEVICE_CONTROLLER;
     }
 }
diff --git a/generation/WinSDK/manual/Ioctl.cs b/generation/WinSDK/manual/Ioctl.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Runtime.InteropServices;
+using Windows.Win32.Interop;
+
+namespace Windows.Win32.System.Ioctl
+{
+    public static unsafe partial class Apis
+    {
+        public const uint IOCTL_STORAGE_BASE = FILE_DEVICE_MASS_STORAGE;
+        public const uint IOCTL_SCMBUS_BASE = FILE_DEVICE_PERSISTENT_MEMORY;
+        public const uint IOCTL_DISK_BASE = (uint)Windows.Win32.Storage.FileSystem.FILE_DEVICE_TYPE.FILE_DEVICE_DISK;
+        public const uint IOCTL_CHANGER_BASE = FILE_DEVICE_CHANGER;
+        public const uint FILE_SPECIAL_ACCESS = 0;
+        public const uint FILE_DEVICE_UNKNOWN = 0x00000022;
+    }
+}
diff --git a/generation/WinSDK/manual/Scsi.cs b/generation/WinSDK/manual/Scsi.cs
@@ -7,6 +7,6 @@ namespace Windows.Win32.Storage.DistributedFileSystem
 {
     public static unsafe partial class Apis
     {
-        public const uint FSCTL_DFS_BASE = (uint)Windows.Win32.System.SystemServices.Apis.FILE_DEVICE_DFS;
+        public const uint FSCTL_DFS_BASE = (uint)Windows.Win32.System.Ioctl.Apis.FILE_DEVICE_DFS;
     }
 }
diff --git a/generation/WinSDK/manual/SystemServices.cs b/generation/WinSDK/manual/SystemServices.cs
@@ -14,11 +14,5 @@ public static unsafe partial class Apis
         public const uint _MM_HINT_T1  = 2;
         public const uint _MM_HINT_T2  = 3;
         public const uint _MM_HINT_NTA = 0;
-
-        public const uint IOCTL_STORAGE_BASE = FILE_DEVICE_MASS_STORAGE;
-        public const uint IOCTL_SCMBUS_BASE = FILE_DEVICE_PERSISTENT_MEMORY;
-        public const uint IOCTL_DISK_BASE = (uint)Windows.Win32.Storage.FileSystem.FILE_DEVICE_TYPE.FILE_DEVICE_DISK;
-        public const uint IOCTL_CHANGER_BASE = FILE_DEVICE_CHANGER;
-        public const uint FILE_SPECIAL_ACCESS = 0;
     }
 }