diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp
index a7590e51a43..ec2b15366e0 100644
--- a/base/applications/rapps/gui.cpp
+++ b/base/applications/rapps/gui.cpp
@@ -25,7 +25,7 @@
 #include <atlwin.h>
 #include <wininet.h>
 #include <shellutils.h>
-#include <rosctrls.h>
+#include <ui/rosctrls.h>
 #include <gdiplus.h>
 #include <math.h>
 
diff --git a/base/applications/rapps/include/appview.h b/base/applications/rapps/include/appview.h
index 206f99e37ab..d318c0903e7 100644
--- a/base/applications/rapps/include/appview.h
+++ b/base/applications/rapps/include/appview.h
@@ -14,7 +14,7 @@
 #include <atlwin.h>
 #include <wininet.h>
 #include <shellutils.h>
-#include <rosctrls.h>
+#include <ui/rosctrls.h>
 #include <gdiplus.h>
 #include <math.h>
 
diff --git a/base/applications/rapps/include/crichedit.h b/base/applications/rapps/include/crichedit.h
index e3cd93345d0..6c6a2222cef 100644
--- a/base/applications/rapps/include/crichedit.h
+++ b/base/applications/rapps/include/crichedit.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <rosctrls.h>
+#include <ui/rosctrls.h>
 
 class CRichEdit :
     public CWindow
diff --git a/base/applications/rapps/include/gui.h b/base/applications/rapps/include/gui.h
index 738379d7a1e..3a000b1ba60 100644
--- a/base/applications/rapps/include/gui.h
+++ b/base/applications/rapps/include/gui.h
@@ -15,7 +15,7 @@
 #include <atlwin.h>
 #include <wininet.h>
 #include <shellutils.h>
-#include <rosctrls.h>
+#include <ui/rosctrls.h>
 #include <gdiplus.h>
 #include <math.h>
 
diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp
index fbe85205b19..18d67d347c4 100644
--- a/base/applications/rapps/loaddlg.cpp
+++ b/base/applications/rapps/loaddlg.cpp
@@ -40,7 +40,7 @@
 
 #include <debug.h>
 
-#include <rosctrls.h>
+#include <ui/rosctrls.h>
 #include <windowsx.h>
 #include <process.h>
 #undef SubclassWindow
diff --git a/base/shell/explorer/precomp.h b/base/shell/explorer/precomp.h
index 86c5b80a284..efce3c2a233 100644
--- a/base/shell/explorer/precomp.h
+++ b/base/shell/explorer/precomp.h
@@ -43,8 +43,8 @@
 #include <shlguid_undoc.h>
 #include <undocshell.h>
 
-#include <rosctrls.h>
-#include <rosdlgs.h>
+#include <ui/rosctrls.h>
+#include <ui/rosdlgs.h>
 #include <shellutils.h>
 
 #include "tmschema.h"
diff --git a/dll/shellext/acppage/precomp.h b/dll/shellext/acppage/precomp.h
index 129b6f84479..7f239da884d 100644
--- a/dll/shellext/acppage/precomp.h
+++ b/dll/shellext/acppage/precomp.h
@@ -17,7 +17,7 @@
 #include <atlsimpcoll.h>
 #include <atlstr.h>
 #include <atlwin.h>
-#include <rosdlgs.h>
+#include <ui/rosdlgs.h>
 
 ULONG DbgPrint(PCH Format,...);
 #include <apphelp.h>
diff --git a/dll/shellext/zipfldr/precomp.h b/dll/shellext/zipfldr/precomp.h
index f21ce4873d5..b5845168073 100644
--- a/dll/shellext/zipfldr/precomp.h
+++ b/dll/shellext/zipfldr/precomp.h
@@ -12,7 +12,7 @@
 #include <atlcom.h>
 #include <atlcoll.h>
 #include <atlstr.h>
-#include <rosdlgs.h>
+#include <ui/rosdlgs.h>
 #include <shlwapi.h>
 #include <shellapi.h>
 #include <strsafe.h>
diff --git a/dll/win32/browseui/CAutoComplete.h b/dll/win32/browseui/CAutoComplete.h
index af3bddabde7..97d633c5db2 100644
--- a/dll/win32/browseui/CAutoComplete.h
+++ b/dll/win32/browseui/CAutoComplete.h
@@ -21,8 +21,8 @@
  */
 #pragma once
 
-#include "atltypes.h"
-#include "rosctrls.h"
+#include <atltypes.h>
+#include <ui/rosctrls.h>
 
 class CACListView;
 class CACScrollBar;
diff --git a/dll/win32/browseui/internettoolbar.cpp b/dll/win32/browseui/internettoolbar.cpp
index 5c35bfdcaa3..bacc5110ade 100644
--- a/dll/win32/browseui/internettoolbar.cpp
+++ b/dll/win32/browseui/internettoolbar.cpp
@@ -1037,7 +1037,7 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::InitNew()
     hResult = IUnknown_GetWindow(menuBar, &fMenuBandWindow);
     fMenuBar.Attach(menuBar.Detach());                  // transfer the ref count
 
-    // FIXME: The ros Rebar does not properly support fixed-size items such as the brandband,
+    // FIXME: The ROS Rebar does not properly support fixed-size items such as the brandband,
     // and it will put them in their own row, sized to take up the whole row.
 #if 0
     /* Create and attach the brand/logo to the rebar */
diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp
index 1a15523491d..8a4fc939789 100644
--- a/dll/win32/shell32/CDefView.cpp
+++ b/dll/win32/shell32/CDefView.cpp
@@ -36,7 +36,7 @@ TODO:
 #include "precomp.h"
 
 #include <atlwin.h>
-#include <rosctrls.h>
+#include <ui/rosctrls.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
diff --git a/dll/win32/shell32/shellmenu/shellmenu.h b/dll/win32/shell32/shellmenu/shellmenu.h
index 1cc7c7a0cd1..411239240e8 100644
--- a/dll/win32/shell32/shellmenu/shellmenu.h
+++ b/dll/win32/shell32/shellmenu/shellmenu.h
@@ -52,7 +52,7 @@
 #include <undocuser.h>
 
 #include <shellutils.h>
-#include <rosctrls.h>
+#include <ui/rosctrls.h>
 #include "../shresdef.h"
 
 #include <wine/debug.h>
diff --git a/dll/win32/shell32/wine/brsfolder.c b/dll/win32/shell32/wine/brsfolder.c
index b9983d1f1f0..84c7c63a5f0 100644
--- a/dll/win32/shell32/wine/brsfolder.c
+++ b/dll/win32/shell32/wine/brsfolder.c
@@ -40,7 +40,7 @@
 #include "shresdef.h"
 #ifdef __REACTOS__
     #include <shlwapi.h>
-    #include "layout.h" /* Resizable window */
+    #include "ui/layout.h" /* Resizable window */
 #endif
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
diff --git a/sdk/include/reactos/layout.h b/sdk/include/reactos/ui/layout.h
similarity index 100%
rename from sdk/include/reactos/layout.h
rename to sdk/include/reactos/ui/layout.h
diff --git a/sdk/include/reactos/rosctrls.h b/sdk/include/reactos/ui/rosctrls.h
similarity index 100%
rename from sdk/include/reactos/rosctrls.h
rename to sdk/include/reactos/ui/rosctrls.h
diff --git a/sdk/include/reactos/rosdlgs.h b/sdk/include/reactos/ui/rosdlgs.h
similarity index 100%
rename from sdk/include/reactos/rosdlgs.h
rename to sdk/include/reactos/ui/rosdlgs.h