diff --git a/Support/Sources/COM_ABI/combaseapi.c b/Support/Sources/COM_ABI/combaseapi.c
index de6285c2..c6ad1fee 100644
--- a/Support/Sources/COM_ABI/combaseapi.c
+++ b/Support/Sources/COM_ABI/combaseapi.c
@@ -1,4 +1,4 @@
-#include "SWRT/windows/combaseapi.h"
+#include "SWRT/winapi/combaseapi.h"
 
 #include <Windows.h>
 #include <combaseapi.h>
diff --git a/Support/Sources/COM_ABI/include/SWRT/modules/COM.h b/Support/Sources/COM_ABI/include/SWRT/modules/COM.h
index c2ca2a20..cd8c8912 100644
--- a/Support/Sources/COM_ABI/include/SWRT/modules/COM.h
+++ b/Support/Sources/COM_ABI/include/SWRT/modules/COM.h
@@ -1,7 +1,7 @@
-#include "SWRT/windows/BaseTsd.h"
-#include "SWRT/windows/combaseapi.h"
-#include "SWRT/windows/guiddef.h"
-#include "SWRT/windows/oaidl.h"
-#include "SWRT/windows/objidl.h"
-#include "SWRT/windows/oleauto.h"
-#include "SWRT/windows/unknwn.h"
\ No newline at end of file
+#include "SWRT/winapi/BaseTsd.h"
+#include "SWRT/winapi/combaseapi.h"
+#include "SWRT/winapi/guiddef.h"
+#include "SWRT/winapi/oaidl.h"
+#include "SWRT/winapi/objidl.h"
+#include "SWRT/winapi/oleauto.h"
+#include "SWRT/winapi/unknwn.h"
\ No newline at end of file
diff --git a/Support/Sources/COM_ABI/include/SWRT/windows/BaseTsd.h b/Support/Sources/COM_ABI/include/SWRT/winapi/BaseTsd.h
similarity index 100%
rename from Support/Sources/COM_ABI/include/SWRT/windows/BaseTsd.h
rename to Support/Sources/COM_ABI/include/SWRT/winapi/BaseTsd.h
diff --git a/Support/Sources/COM_ABI/include/SWRT/windows/combaseapi.h b/Support/Sources/COM_ABI/include/SWRT/winapi/combaseapi.h
similarity index 63%
rename from Support/Sources/COM_ABI/include/SWRT/windows/combaseapi.h
rename to Support/Sources/COM_ABI/include/SWRT/winapi/combaseapi.h
index 51dea897..45c3ab6c 100644
--- a/Support/Sources/COM_ABI/include/SWRT/windows/combaseapi.h
+++ b/Support/Sources/COM_ABI/include/SWRT/winapi/combaseapi.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "SWRT/windows/BaseTsd.h"
-#include "SWRT/windows/unknwn.h"
+#include "SWRT/winapi/BaseTsd.h"
+#include "SWRT/winapi/unknwn.h"
 
 SWRT_HResult SWRT_CoCreateFreeThreadedMarshaler(SWRT_IUnknown* punkOuter, SWRT_IUnknown** ppunkMarshal);
\ No newline at end of file
diff --git a/Support/Sources/COM_ABI/include/SWRT/windows/guiddef.h b/Support/Sources/COM_ABI/include/SWRT/winapi/guiddef.h
similarity index 100%
rename from Support/Sources/COM_ABI/include/SWRT/windows/guiddef.h
rename to Support/Sources/COM_ABI/include/SWRT/winapi/guiddef.h
diff --git a/Support/Sources/COM_ABI/include/SWRT/windows/oaidl.h b/Support/Sources/COM_ABI/include/SWRT/winapi/oaidl.h
similarity index 96%
rename from Support/Sources/COM_ABI/include/SWRT/windows/oaidl.h
rename to Support/Sources/COM_ABI/include/SWRT/winapi/oaidl.h
index 4473a287..302abbbe 100644
--- a/Support/Sources/COM_ABI/include/SWRT/windows/oaidl.h
+++ b/Support/Sources/COM_ABI/include/SWRT/winapi/oaidl.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "SWRT/windows/wtypes.h"
-#include "SWRT/windows/unknwn.h"
+#include "SWRT/winapi/wtypes.h"
+#include "SWRT/winapi/unknwn.h"
 
 typedef struct SWRT_ICreateErrorInfo {
     struct SWRT_ICreateErrorInfo_VirtualTable* VirtualTable;
diff --git a/Support/Sources/COM_ABI/include/SWRT/windows/objidl.h b/Support/Sources/COM_ABI/include/SWRT/winapi/objidl.h
similarity index 94%
rename from Support/Sources/COM_ABI/include/SWRT/windows/objidl.h
rename to Support/Sources/COM_ABI/include/SWRT/winapi/objidl.h
index 9bb9fa5a..532a7c16 100644
--- a/Support/Sources/COM_ABI/include/SWRT/windows/objidl.h
+++ b/Support/Sources/COM_ABI/include/SWRT/winapi/objidl.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "SWRT/windows/guiddef.h"
-#include "SWRT/windows/oleauto.h"
-#include "SWRT/windows/unknwn.h"
+#include "SWRT/winapi/guiddef.h"
+#include "SWRT/winapi/oleauto.h"
+#include "SWRT/winapi/unknwn.h"
 
 // IAgileObject
 typedef struct SWRT_IAgileObject {
diff --git a/Support/Sources/COM_ABI/include/SWRT/windows/oleauto.h b/Support/Sources/COM_ABI/include/SWRT/winapi/oleauto.h
similarity index 88%
rename from Support/Sources/COM_ABI/include/SWRT/windows/oleauto.h
rename to Support/Sources/COM_ABI/include/SWRT/winapi/oleauto.h
index 015a189b..89bf2883 100644
--- a/Support/Sources/COM_ABI/include/SWRT/windows/oleauto.h
+++ b/Support/Sources/COM_ABI/include/SWRT/winapi/oleauto.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <stdint.h>
-#include "SWRT/windows/wtypes.h"
-#include "SWRT/windows/oaidl.h"
+#include "SWRT/winapi/wtypes.h"
+#include "SWRT/winapi/oaidl.h"
 
 SWRT_HResult SWRT_CreateErrorInfo(SWRT_ICreateErrorInfo ** pperrinfo);
 SWRT_HResult SWRT_GetErrorInfo(uint32_t dwReserved, SWRT_IErrorInfo** pperrinfo);
diff --git a/Support/Sources/COM_ABI/include/SWRT/windows/unknwn.h b/Support/Sources/COM_ABI/include/SWRT/winapi/unknwn.h
similarity index 84%
rename from Support/Sources/COM_ABI/include/SWRT/windows/unknwn.h
rename to Support/Sources/COM_ABI/include/SWRT/winapi/unknwn.h
index 8aeeeb12..e1a5f3a0 100644
--- a/Support/Sources/COM_ABI/include/SWRT/windows/unknwn.h
+++ b/Support/Sources/COM_ABI/include/SWRT/winapi/unknwn.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "SWRT/windows/guiddef.h"
-#include "SWRT/windows/BaseTsd.h"
+#include "SWRT/winapi/guiddef.h"
+#include "SWRT/winapi/BaseTsd.h"
 
 // IUnknown
 typedef struct SWRT_IUnknown {
diff --git a/Support/Sources/COM_ABI/include/SWRT/windows/wtypes.h b/Support/Sources/COM_ABI/include/SWRT/winapi/wtypes.h
similarity index 100%
rename from Support/Sources/COM_ABI/include/SWRT/windows/wtypes.h
rename to Support/Sources/COM_ABI/include/SWRT/winapi/wtypes.h
diff --git a/Support/Sources/COM_ABI/include/module.modulemap b/Support/Sources/COM_ABI/include/module.modulemap
index c4ea8765..e349a117 100644
--- a/Support/Sources/COM_ABI/include/module.modulemap
+++ b/Support/Sources/COM_ABI/include/module.modulemap
@@ -1,13 +1,13 @@
 module COM_ABI {
     header "SWRT/modules/COM.h"
-    header "SWRT/windows/BaseTsd.h"
-    header "SWRT/windows/combaseapi.h"
-    header "SWRT/windows/guiddef.h"
-    header "SWRT/windows/oaidl.h"
-    header "SWRT/windows/objidl.h"
-    header "SWRT/windows/oleauto.h"
-    header "SWRT/windows/unknwn.h"
-    header "SWRT/windows/wtypes.h"
+    header "SWRT/winapi/BaseTsd.h"
+    header "SWRT/winapi/combaseapi.h"
+    header "SWRT/winapi/guiddef.h"
+    header "SWRT/winapi/oaidl.h"
+    header "SWRT/winapi/objidl.h"
+    header "SWRT/winapi/oleauto.h"
+    header "SWRT/winapi/unknwn.h"
+    header "SWRT/winapi/wtypes.h"
     export *
 }
 
diff --git a/Support/Sources/COM_ABI/oleauto.c b/Support/Sources/COM_ABI/oleauto.c
index c8f5be1f..cba63371 100644
--- a/Support/Sources/COM_ABI/oleauto.c
+++ b/Support/Sources/COM_ABI/oleauto.c
@@ -1,4 +1,4 @@
-#include "SWRT/windows/oleauto.h"
+#include "SWRT/winapi/oleauto.h"
 
 #include <Windows.h>
 #include <oleauto.h>
diff --git a/Support/Sources/WindowsRuntime_ABI/include/SWRT/modules/WindowsRuntime.h b/Support/Sources/WindowsRuntime_ABI/include/SWRT/modules/WindowsRuntime.h
index 15c8de62..6f30ce09 100644
--- a/Support/Sources/WindowsRuntime_ABI/include/SWRT/modules/WindowsRuntime.h
+++ b/Support/Sources/WindowsRuntime_ABI/include/SWRT/modules/WindowsRuntime.h
@@ -1,13 +1,13 @@
 #include "SWRT/modules/COM.h"
 
-#include "SWRT/windows/activation.h"
-#include "SWRT/windows/eventtoken.h"
-#include "SWRT/windows/inspectable.h"
-#include "SWRT/windows/memorybuffer.h"
-#include "SWRT/windows/restrictederrorinfo.h"
-#include "SWRT/windows/roapi.h"
-#include "SWRT/windows/robuffer.h"
-#include "SWRT/windows/roerrorapi.h"
-#include "SWRT/windows/weakreference.h"
-#include "SWRT/windows/winstring.h"
-#include "SWRT/windows/windows.foundation.ireference.h"
\ No newline at end of file
+#include "SWRT/winapi/activation.h"
+#include "SWRT/winapi/eventtoken.h"
+#include "SWRT/winapi/inspectable.h"
+#include "SWRT/winapi/memorybuffer.h"
+#include "SWRT/winapi/restrictederrorinfo.h"
+#include "SWRT/winapi/roapi.h"
+#include "SWRT/winapi/robuffer.h"
+#include "SWRT/winapi/roerrorapi.h"
+#include "SWRT/winapi/weakreference.h"
+#include "SWRT/winapi/winstring.h"
+#include "SWRT/winapi/windows.foundation.ireference.h"
\ No newline at end of file
diff --git a/Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/activation.h b/Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/activation.h
similarity index 95%
rename from Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/activation.h
rename to Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/activation.h
index 75fca034..662243ee 100644
--- a/Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/activation.h
+++ b/Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/activation.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "SWRT/windows/inspectable.h"
+#include "SWRT/winapi/inspectable.h"
 
 // IActivationFactory
 typedef struct SWRT_IActivationFactory {
diff --git a/Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/eventtoken.h b/Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/eventtoken.h
similarity index 100%
rename from Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/eventtoken.h
rename to Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/eventtoken.h
diff --git a/Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/inspectable.h b/Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/inspectable.h
similarity index 91%
rename from Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/inspectable.h
rename to Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/inspectable.h
index 17d7ffca..9f57d75d 100644
--- a/Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/inspectable.h
+++ b/Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/inspectable.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "SWRT/windows/unknwn.h"
-#include "SWRT/windows/winstring.h"
+#include "SWRT/winapi/unknwn.h"
+#include "SWRT/winapi/winstring.h"
 
 // TrustLevel
 typedef int32_t SWRT_TrustLevel;
diff --git a/Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/memorybuffer.h b/Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/memorybuffer.h
similarity index 95%
rename from Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/memorybuffer.h
rename to Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/memorybuffer.h
index 894c2386..47abef54 100644
--- a/Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/memorybuffer.h
+++ b/Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/memorybuffer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "SWRT/windows/unknwn.h"
+#include "SWRT/winapi/unknwn.h"
 
 typedef struct SWRT_IMemoryBufferByteAccess SWRT_IMemoryBufferByteAccess;
 
diff --git a/Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/restrictederrorinfo.h b/Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/restrictederrorinfo.h
similarity index 97%
rename from Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/restrictederrorinfo.h
rename to Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/restrictederrorinfo.h
index 5373c05b..e2568a64 100644
--- a/Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/restrictederrorinfo.h
+++ b/Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/restrictederrorinfo.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "SWRT/windows/oleauto.h"
-#include "SWRT/windows/unknwn.h"
+#include "SWRT/winapi/oleauto.h"
+#include "SWRT/winapi/unknwn.h"
 
 typedef struct SWRT_ILanguageExceptionErrorInfo {
     struct SWRT_ILanguageExceptionErrorInfo_VirtualTable* VirtualTable;
diff --git a/Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/roapi.h b/Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/roapi.h
similarity index 81%
rename from Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/roapi.h
rename to Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/roapi.h
index 8b134cbd..4623129c 100644
--- a/Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/roapi.h
+++ b/Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/roapi.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "SWRT/windows/activation.h"
-#include "SWRT/windows/BaseTsd.h"
-#include "SWRT/windows/winstring.h"
+#include "SWRT/winapi/activation.h"
+#include "SWRT/winapi/BaseTsd.h"
+#include "SWRT/winapi/winstring.h"
 
 typedef enum SWRT_RO_INIT_TYPE {
   SWRT_RO_INIT_SINGLETHREADED = 0,
diff --git a/Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/robuffer.h b/Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/robuffer.h
similarity index 94%
rename from Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/robuffer.h
rename to Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/robuffer.h
index 141d171e..ba46b07d 100644
--- a/Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/robuffer.h
+++ b/Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/robuffer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "SWRT/windows/unknwn.h"
+#include "SWRT/winapi/unknwn.h"
 
 typedef struct SWRT_IBufferByteAccess SWRT_IBufferByteAccess;
 
diff --git a/Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/roerrorapi.h b/Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/roerrorapi.h
similarity index 92%
rename from Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/roerrorapi.h
rename to Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/roerrorapi.h
index d194813b..2653452e 100644
--- a/Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/roerrorapi.h
+++ b/Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/roerrorapi.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <stdbool.h>
-#include "SWRT/windows/unknwn.h"
-#include "SWRT/windows/restrictederrorinfo.h"
-#include "SWRT/windows/winstring.h"
+#include "SWRT/winapi/unknwn.h"
+#include "SWRT/winapi/restrictederrorinfo.h"
+#include "SWRT/winapi/winstring.h"
 
 typedef enum {
     SWRT_RO_ERROR_REPORTING_NONE               = 0x00000000,
diff --git a/Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/weakreference.h b/Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/weakreference.h
similarity index 96%
rename from Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/weakreference.h
rename to Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/weakreference.h
index aadc2380..f0e459eb 100644
--- a/Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/weakreference.h
+++ b/Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/weakreference.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "SWRT/windows/inspectable.h"
+#include "SWRT/winapi/inspectable.h"
 
 typedef struct SWRT_IWeakReference {
     struct SWRT_IWeakReference_VirtualTable* VirtualTable;
diff --git a/Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/windows.foundation.h b/Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/windows.foundation.h
similarity index 99%
rename from Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/windows.foundation.h
rename to Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/windows.foundation.h
index a723bab8..96554bae 100644
--- a/Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/windows.foundation.h
+++ b/Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/windows.foundation.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "SWRT/windows/inspectable.h"
+#include "SWRT/winapi/inspectable.h"
 
 // Windows.Foundation.PropertyType
 typedef int32_t SWRT_WindowsFoundation_PropertyType;
diff --git a/Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/windows.foundation.ireference.h b/Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/windows.foundation.ireference.h
similarity index 98%
rename from Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/windows.foundation.ireference.h
rename to Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/windows.foundation.ireference.h
index 640b6462..0717a880 100644
--- a/Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/windows.foundation.ireference.h
+++ b/Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/windows.foundation.ireference.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "SWRT/windows/inspectable.h"
+#include "SWRT/winapi/inspectable.h"
 
 // Windows.Foundation.IReference<T>
 typedef struct SWRT_WindowsFoundation_IReference {
diff --git a/Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/winstring.h b/Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/winstring.h
similarity index 95%
rename from Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/winstring.h
rename to Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/winstring.h
index 74c9f195..bbc229ac 100644
--- a/Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/winstring.h
+++ b/Support/Sources/WindowsRuntime_ABI/include/SWRT/winapi/winstring.h
@@ -2,7 +2,7 @@
 
 #include <stdint.h>
 #include <uchar.h>
-#include "SWRT/windows/BaseTsd.h"
+#include "SWRT/winapi/BaseTsd.h"
 
 typedef struct SWRT_HString_* SWRT_HString;
 typedef struct SWRT_HStringBuffer_* SWRT_HStringBuffer;
diff --git a/Support/Sources/WindowsRuntime_ABI/include/module.modulemap b/Support/Sources/WindowsRuntime_ABI/include/module.modulemap
index e7015acc..7179a136 100644
--- a/Support/Sources/WindowsRuntime_ABI/include/module.modulemap
+++ b/Support/Sources/WindowsRuntime_ABI/include/module.modulemap
@@ -1,19 +1,19 @@
 module WindowsRuntime_ABI {
     header "SWRT/modules/WindowsRuntime.h"
-    header "SWRT/windows/activation.h"
-    header "SWRT/windows/eventtoken.h"
-    header "SWRT/windows/inspectable.h"
-    header "SWRT/windows/memorybuffer.h"
-    header "SWRT/windows/restrictederrorinfo.h"
-    header "SWRT/windows/roapi.h"
-    header "SWRT/windows/robuffer.h"
-    header "SWRT/windows/roerrorapi.h"
-    header "SWRT/windows/weakreference.h"
-    header "SWRT/windows/winstring.h"
+    header "SWRT/winapi/activation.h"
+    header "SWRT/winapi/eventtoken.h"
+    header "SWRT/winapi/inspectable.h"
+    header "SWRT/winapi/memorybuffer.h"
+    header "SWRT/winapi/restrictederrorinfo.h"
+    header "SWRT/winapi/roapi.h"
+    header "SWRT/winapi/robuffer.h"
+    header "SWRT/winapi/roerrorapi.h"
+    header "SWRT/winapi/weakreference.h"
+    header "SWRT/winapi/winstring.h"
     export *
 }
 
 module SWRT_WindowsFoundation {
-    header "SWRT/windows/windows.foundation.h"
+    header "SWRT/winapi/windows.foundation.h"
     export *
 }
diff --git a/Support/Sources/WindowsRuntime_ABI/roapi.c b/Support/Sources/WindowsRuntime_ABI/roapi.c
index 895e2121..90d3654a 100644
--- a/Support/Sources/WindowsRuntime_ABI/roapi.c
+++ b/Support/Sources/WindowsRuntime_ABI/roapi.c
@@ -1,4 +1,4 @@
-#include "SWRT/windows/roapi.h"
+#include "SWRT/winapi/roapi.h"
 
 #include <Windows.h>
 #include <roapi.h>
diff --git a/Support/Sources/WindowsRuntime_ABI/roerrorapi.c b/Support/Sources/WindowsRuntime_ABI/roerrorapi.c
index d54b82a4..97522882 100644
--- a/Support/Sources/WindowsRuntime_ABI/roerrorapi.c
+++ b/Support/Sources/WindowsRuntime_ABI/roerrorapi.c
@@ -1,4 +1,4 @@
-#include "SWRT/windows/roerrorapi.h"
+#include "SWRT/winapi/roerrorapi.h"
 
 #include <Windows.h>
 #include <roerrorapi.h>
diff --git a/Support/Sources/WindowsRuntime_ABI/winstring.c b/Support/Sources/WindowsRuntime_ABI/winstring.c
index c7a03fb5..5a82ece9 100644
--- a/Support/Sources/WindowsRuntime_ABI/winstring.c
+++ b/Support/Sources/WindowsRuntime_ABI/winstring.c
@@ -1,4 +1,4 @@
-#include "SWRT/windows/winstring.h"
+#include "SWRT/winapi/winstring.h"
 
 #include <winstring.h>
 
diff --git a/Support/Tests/ABI/include/SWRT_ICOMTest.h b/Support/Tests/ABI/include/SWRT_ICOMTest.h
index f0ab6d8d..52c2d86e 100644
--- a/Support/Tests/ABI/include/SWRT_ICOMTest.h
+++ b/Support/Tests/ABI/include/SWRT_ICOMTest.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "SWRT/windows/unknwn.h"
+#include "SWRT/winapi/unknwn.h"
 
 // ICOMTest
 typedef struct SWRT_ICOMTest {
diff --git a/Support/Tests/ABI/include/SWRT_ICOMTest2.h b/Support/Tests/ABI/include/SWRT_ICOMTest2.h
index b427b8c1..bde1a48c 100644
--- a/Support/Tests/ABI/include/SWRT_ICOMTest2.h
+++ b/Support/Tests/ABI/include/SWRT_ICOMTest2.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "SWRT/windows/unknwn.h"
+#include "SWRT/winapi/unknwn.h"
 
 // ICOMTest2
 typedef struct SWRT_ICOMTest2 {
diff --git a/Support/Tests/ABI/include/SWRT_IWinRTTest.h b/Support/Tests/ABI/include/SWRT_IWinRTTest.h
index 3baf38cc..051cd5d7 100644
--- a/Support/Tests/ABI/include/SWRT_IWinRTTest.h
+++ b/Support/Tests/ABI/include/SWRT_IWinRTTest.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "SWRT/windows/inspectable.h"
+#include "SWRT/winapi/inspectable.h"
 
 // IWinRTTest
 typedef struct SWRT_IWinRTTest {