diff --git a/.clang-format b/.clang-format
index f3202c42..c7365809 100644
--- a/.clang-format
+++ b/.clang-format
@@ -71,7 +71,7 @@ ConstructorInitializerAllOnOneLineOrOnePerLine: false
 BreakConstructorInitializers: BeforeComma
 BreakInheritanceList: BeforeComma
 ReflowComments: true
-SortIncludes: true
+SortIncludes: false
 Cpp11BracedListStyle: false
 DerivePointerAlignment: false
 DisableFormat: false
diff --git a/src/kiwano-imgui/ImGuiModule.cpp b/src/kiwano-imgui/ImGuiModule.cpp
index fea5b179..2cb8fcdf 100644
--- a/src/kiwano-imgui/ImGuiModule.cpp
+++ b/src/kiwano-imgui/ImGuiModule.cpp
@@ -1,13 +1,14 @@
 // Copyright (C) 2019 Nomango
 
-#include <kiwano-imgui/ImGuiModule.h>
-#include <kiwano-imgui/imgui_impl.h>
+
 #include <kiwano/core/Common.h>
 #include <kiwano/core/event/KeyEvent.h>
 #include <kiwano/core/event/MouseEvent.h>
 #include <kiwano/platform/Input.h>
 #include <kiwano/platform/Window.h>
 #include <kiwano/render/Renderer.h>
+#include <kiwano-imgui/ImGuiModule.h>
+#include <kiwano-imgui/imgui_impl.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano-imgui/imgui_impl_dx10.cpp b/src/kiwano-imgui/imgui_impl_dx10.cpp
index 78eedecf..8bd81ed6 100644
--- a/src/kiwano-imgui/imgui_impl_dx10.cpp
+++ b/src/kiwano-imgui/imgui_impl_dx10.cpp
@@ -3,8 +3,8 @@
 #include <kiwano-imgui/imgui_impl_dx10.h>
 
 // DirectX
-#include <d3d10.h>
 #include <d3d10_1.h>
+#include <d3d10.h>
 #include <d3dcompiler.h>
 #include <stdio.h>
 
diff --git a/src/kiwano-network/HttpClient.cpp b/src/kiwano-network/HttpClient.cpp
index b98a6f50..cbee5f69 100644
--- a/src/kiwano-network/HttpClient.cpp
+++ b/src/kiwano-network/HttpClient.cpp
@@ -18,14 +18,14 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include <3rd-party/curl/curl.h>  // CURL
 #include <codecvt>
-#include <kiwano-network/HttpClient.h>
-#include <kiwano-network/HttpRequest.h>
-#include <kiwano-network/HttpResponse.hpp>
+#include <thread>
 #include <kiwano/core/Logger.h>
 #include <kiwano/platform/Application.h>
-#include <thread>
+#include <kiwano-network/HttpRequest.h>
+#include <kiwano-network/HttpResponse.hpp>
+#include <kiwano-network/HttpClient.h>
+#include <3rd-party/curl/curl.h>  // CURL
 
 namespace
 {
diff --git a/src/kiwano/core/event/Event.h b/src/kiwano/core/event/Event.h
index 3e0f63c5..de6df3a3 100644
--- a/src/kiwano/core/event/Event.h
+++ b/src/kiwano/core/event/Event.h
@@ -19,7 +19,6 @@
 // THE SOFTWARE.
 
 #pragma once
-#include <kiwano/core/Keys.h>
 #include <kiwano/core/SmartPtr.hpp>
 #include <kiwano/core/event/EventType.h>
 #include <kiwano/math/math.h>
diff --git a/src/kiwano/math/Rect.hpp b/src/kiwano/math/Rect.hpp
index 4ddeb05c..cc2dfa4d 100644
--- a/src/kiwano/math/Rect.hpp
+++ b/src/kiwano/math/Rect.hpp
@@ -151,8 +151,7 @@ public:
 
     static inline RectT Infinite()
     {
-        return RectT{ -math::constants::FLOAT_MAX, -math::constants::FLOAT_MAX, math::constants::FLOAT_MAX,
-                      math::constants::FLOAT_MAX };
+        return RectT{ -math::FLOAT_MAX, -math::FLOAT_MAX, math::FLOAT_MAX, math::FLOAT_MAX };
     }
 };
 }  // namespace math
diff --git a/src/kiwano/platform/Input.h b/src/kiwano/platform/Input.h
index 60ee9f20..aa6f2f18 100644
--- a/src/kiwano/platform/Input.h
+++ b/src/kiwano/platform/Input.h
@@ -21,6 +21,7 @@
 #pragma once
 #include <kiwano/core/Common.h>
 #include <kiwano/core/Component.h>
+#include <kiwano/core/Keys.h>
 #include <kiwano/core/event/Event.h>
 #include <kiwano/macros.h>
 #include <kiwano/math/math.h>
diff --git a/src/kiwano/render/Brush.h b/src/kiwano/render/Brush.h
index de5a825d..c88b6ec3 100644
--- a/src/kiwano/render/Brush.h
+++ b/src/kiwano/render/Brush.h
@@ -20,7 +20,7 @@
 
 #pragma once
 #include <kiwano/core/ObjectBase.h>
-#include <kiwano/render/dx/D2DDeviceResources.h>
+#include <kiwano/render/DirectX/D2DDeviceResources.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/render/DirectX/D2DDeviceResources.cpp b/src/kiwano/render/DirectX/D2DDeviceResources.cpp
index 140cc1eb..feb93632 100644
--- a/src/kiwano/render/DirectX/D2DDeviceResources.cpp
+++ b/src/kiwano/render/DirectX/D2DDeviceResources.cpp
@@ -18,8 +18,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include <kiwano/render/DirectX/D2DDeviceResources.h>
 #include <kiwano/core/Logger.h>
-#include <kiwano/render/dx/D2DDeviceResources.h>
 
 #pragma comment(lib, "d2d1.lib")
 #pragma comment(lib, "dwrite.lib")
diff --git a/src/kiwano/render/DirectX/D2DDeviceResources.h b/src/kiwano/render/DirectX/D2DDeviceResources.h
index bd85b307..c9758739 100644
--- a/src/kiwano/render/DirectX/D2DDeviceResources.h
+++ b/src/kiwano/render/DirectX/D2DDeviceResources.h
@@ -19,11 +19,11 @@
 // THE SOFTWARE.
 
 #pragma once
+#include <kiwano/core/Resource.h>
+#include <kiwano/render/DirectX/helper.h>
 #include <d2d1.h>
 #include <d2d1_1.h>
 #include <dwrite.h>
-#include <kiwano/core/Resource.h>
-#include <kiwano/render/dx/helper.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/render/DirectX/D3D10DeviceResources.cpp b/src/kiwano/render/DirectX/D3D10DeviceResources.cpp
index f6fc6e67..3d16b278 100644
--- a/src/kiwano/render/DirectX/D3D10DeviceResources.cpp
+++ b/src/kiwano/render/DirectX/D3D10DeviceResources.cpp
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 #include <kiwano/core/Logger.h>
-#include <kiwano/render/dx/D3D10DeviceResources.h>
+#include <kiwano/render/DirectX/D3D10DeviceResources.h>
 
 #pragma comment(lib, "d3d10_1.lib")
 
diff --git a/src/kiwano/render/DirectX/D3D10DeviceResources.h b/src/kiwano/render/DirectX/D3D10DeviceResources.h
index 63913080..90037349 100644
--- a/src/kiwano/render/DirectX/D3D10DeviceResources.h
+++ b/src/kiwano/render/DirectX/D3D10DeviceResources.h
@@ -19,11 +19,10 @@
 // THE SOFTWARE.
 
 #pragma once
-
-#include <d3d10_1.h>
 #include <kiwano/macros.h>
-#include <kiwano/render/dx/D3DDeviceResourcesBase.h>
-#include <kiwano/render/dx/helper.h>
+#include <kiwano/render/DirectX/helper.h>
+#include <kiwano/render/DirectX/D3DDeviceResourcesBase.h>
+#include <d3d10_1.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/render/DirectX/D3D11DeviceResources.cpp b/src/kiwano/render/DirectX/D3D11DeviceResources.cpp
index aeda770a..4d5414dc 100644
--- a/src/kiwano/render/DirectX/D3D11DeviceResources.cpp
+++ b/src/kiwano/render/DirectX/D3D11DeviceResources.cpp
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 #include <kiwano/core/Logger.h>
-#include <kiwano/render/dx/D3D11DeviceResources.h>
+#include <kiwano/render/DirectX/D3D11DeviceResources.h>
 
 #pragma warning(push)
 #pragma warning(disable : 4800)
diff --git a/src/kiwano/render/DirectX/D3D11DeviceResources.h b/src/kiwano/render/DirectX/D3D11DeviceResources.h
index 7d1d7177..d99742ed 100644
--- a/src/kiwano/render/DirectX/D3D11DeviceResources.h
+++ b/src/kiwano/render/DirectX/D3D11DeviceResources.h
@@ -19,11 +19,10 @@
 // THE SOFTWARE.
 
 #pragma once
-
-#include <d3d11.h>
 #include <kiwano/macros.h>
-#include <kiwano/render/dx/D3DDeviceResourcesBase.h>
-#include <kiwano/render/dx/helper.h>
+#include <kiwano/render/DirectX/helper.h>
+#include <kiwano/render/DirectX/D3DDeviceResourcesBase.h>
+#include <d3d11.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/render/DirectX/FontCollectionLoader.cpp b/src/kiwano/render/DirectX/FontCollectionLoader.cpp
index 99e88d20..da19bd2b 100644
--- a/src/kiwano/render/DirectX/FontCollectionLoader.cpp
+++ b/src/kiwano/render/DirectX/FontCollectionLoader.cpp
@@ -18,7 +18,7 @@
 // _Out_ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include <kiwano/render/dx/FontCollectionLoader.h>
+#include <kiwano/render/DirectX/FontCollectionLoader.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/render/DirectX/FontCollectionLoader.h b/src/kiwano/render/DirectX/FontCollectionLoader.h
index 8249016c..6dd44f43 100644
--- a/src/kiwano/render/DirectX/FontCollectionLoader.h
+++ b/src/kiwano/render/DirectX/FontCollectionLoader.h
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 #pragma once
-#include <kiwano/render/dx/D2DDeviceResources.h>
+#include <kiwano/render/DirectX/D2DDeviceResources.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/render/DirectX/TextRenderer.cpp b/src/kiwano/render/DirectX/TextRenderer.cpp
index 7137e260..45e9b8d4 100644
--- a/src/kiwano/render/DirectX/TextRenderer.cpp
+++ b/src/kiwano/render/DirectX/TextRenderer.cpp
@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include <kiwano/render/dx/TextRenderer.h>
+#include <kiwano/render/DirectX/TextRenderer.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/render/DirectX/TextRenderer.h b/src/kiwano/render/DirectX/TextRenderer.h
index d5f900ad..28db9c7d 100644
--- a/src/kiwano/render/DirectX/TextRenderer.h
+++ b/src/kiwano/render/DirectX/TextRenderer.h
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 #pragma once
-#include <kiwano/render/dx/D2DDeviceResources.h>
+#include <kiwano/render/DirectX/D2DDeviceResources.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/render/DirectX/helper.h b/src/kiwano/render/DirectX/helper.h
index f2ae95eb..d29ba1eb 100644
--- a/src/kiwano/render/DirectX/helper.h
+++ b/src/kiwano/render/DirectX/helper.h
@@ -19,11 +19,11 @@
 // THE SOFTWARE.
 
 #pragma once
-#include <d2d1.h>
 #include <kiwano/math/math.h>
+#include <kiwano/render/Color.h>
 #include <kiwano/platform/win32/ComPtr.hpp>
 #include <kiwano/platform/win32/helper.h>
-#include <kiwano/render/Color.h>
+#include <d2d1.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/render/Font.h b/src/kiwano/render/Font.h
index e4fed4bf..2316e731 100644
--- a/src/kiwano/render/Font.h
+++ b/src/kiwano/render/Font.h
@@ -19,10 +19,10 @@
 // THE SOFTWARE.
 
 #pragma once
-#include <dwrite.h>
 #include <kiwano/core/ObjectBase.h>
 #include <kiwano/core/Resource.h>
 #include <kiwano/platform/win32/ComPtr.hpp>
+#include <dwrite.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/render/Geometry.h b/src/kiwano/render/Geometry.h
index d320c956..c13ecc81 100644
--- a/src/kiwano/render/Geometry.h
+++ b/src/kiwano/render/Geometry.h
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 #pragma once
-#include <kiwano/render/dx/D2DDeviceResources.h>
+#include <kiwano/render/DirectX/D2DDeviceResources.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/render/RenderContext.h b/src/kiwano/render/RenderContext.h
index ee66a1c9..0d805f0b 100644
--- a/src/kiwano/render/RenderContext.h
+++ b/src/kiwano/render/RenderContext.h
@@ -26,7 +26,7 @@
 #include <kiwano/render/LayerArea.h>
 #include <kiwano/render/TextLayout.h>
 #include <kiwano/render/Texture.h>
-#include <kiwano/render/dx/TextRenderer.h>
+#include <kiwano/render/DirectX/TextRenderer.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/render/Renderer.h b/src/kiwano/render/Renderer.h
index 2b1024d7..42ccb3be 100644
--- a/src/kiwano/render/Renderer.h
+++ b/src/kiwano/render/Renderer.h
@@ -25,12 +25,12 @@
 #include <kiwano/render/GifImage.h>
 #include <kiwano/render/RenderContext.h>
 #include <kiwano/render/TextStyle.hpp>
-#include <kiwano/render/dx/FontCollectionLoader.h>
+#include <kiwano/render/DirectX/FontCollectionLoader.h>
 
 #if defined(KGE_USE_DIRECTX10)
-#include <kiwano/render/dx/D3D10DeviceResources.h>
+#include <kiwano/render/DirectX/D3D10DeviceResources.h>
 #else
-#include <kiwano/render/dx/D3D11DeviceResources.h>
+#include <kiwano/render/DirectX/D3D11DeviceResources.h>
 #endif
 
 namespace kiwano
diff --git a/src/kiwano/render/StrokeStyle.h b/src/kiwano/render/StrokeStyle.h
index 10c254f1..92ce71db 100644
--- a/src/kiwano/render/StrokeStyle.h
+++ b/src/kiwano/render/StrokeStyle.h
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 #pragma once
-#include <kiwano/render/dx/D2DDeviceResources.h>
+#include <kiwano/render/DirectX/D2DDeviceResources.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/render/Texture.h b/src/kiwano/render/Texture.h
index 62b591fb..70191976 100644
--- a/src/kiwano/render/Texture.h
+++ b/src/kiwano/render/Texture.h
@@ -20,7 +20,7 @@
 
 #pragma once
 #include <kiwano/core/ObjectBase.h>
-#include <kiwano/render/dx/D2DDeviceResources.h>
+#include <kiwano/render/DirectX/D2DDeviceResources.h>
 
 namespace kiwano
 {