diff --git a/.clang-format b/.clang-format
index 82a7135f..d4faf2af 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,7 +1,7 @@
 ---
 BasedOnStyle: LLVM
 
-SortIncludes: false
+SortIncludes: true
 
 BreakBeforeBraces: Custom
 BraceWrapping:
diff --git a/bauer/templates/app/source/AppController.h b/bauer/templates/app/source/AppController.h
index e567543a..96921fc6 100644
--- a/bauer/templates/app/source/AppController.h
+++ b/bauer/templates/app/source/AppController.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/UIAppControllerBase.h>
 #include "MainViewController.h"
+#include <bdn/UIAppControllerBase.h>
 
 using namespace bdn;
 
diff --git a/examples/reddit/src/reddit.cpp b/examples/reddit/src/reddit.cpp
index de909568..a4cbb957 100644
--- a/examples/reddit/src/reddit.cpp
+++ b/examples/reddit/src/reddit.cpp
@@ -1,7 +1,7 @@
 #include <bdn/foundation.h>
-#include <bdn/ui.h>
-#include <bdn/net.h>
 #include <bdn/log.h>
+#include <bdn/net.h>
+#include <bdn/ui.h>
 
 #include <nlohmann/json.hpp>
 
diff --git a/framework/foundation/include/bdn/AbortedError.h b/framework/foundation/include/bdn/AbortedError.h
index 229180cc..b3921dac 100644
--- a/framework/foundation/include/bdn/AbortedError.h
+++ b/framework/foundation/include/bdn/AbortedError.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <stdexcept>
 #include <bdn/String.h>
+#include <stdexcept>
 
 namespace bdn
 {
diff --git a/framework/foundation/include/bdn/AppLaunchInfo.h b/framework/foundation/include/bdn/AppLaunchInfo.h
index ca4b1931..eb0ff888 100644
--- a/framework/foundation/include/bdn/AppLaunchInfo.h
+++ b/framework/foundation/include/bdn/AppLaunchInfo.h
@@ -2,8 +2,8 @@
 
 #include <vector>
 
-#include <bdn/String.h>
 #include <bdn/Base.h>
+#include <bdn/String.h>
 
 namespace bdn
 {
diff --git a/framework/foundation/include/bdn/AppRunnerBase.h b/framework/foundation/include/bdn/AppRunnerBase.h
index 7261835b..951e84f0 100644
--- a/framework/foundation/include/bdn/AppRunnerBase.h
+++ b/framework/foundation/include/bdn/AppRunnerBase.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/AppLaunchInfo.h>
 #include <bdn/AppControllerBase.h>
+#include <bdn/AppLaunchInfo.h>
 #include <bdn/IDispatcher.h>
 
 #include <functional>
diff --git a/framework/foundation/include/bdn/Base.h b/framework/foundation/include/bdn/Base.h
index c4cc1238..e3fab0ac 100644
--- a/framework/foundation/include/bdn/Base.h
+++ b/framework/foundation/include/bdn/Base.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <memory>
 #include <atomic>
+#include <memory>
 
 namespace bdn
 {
diff --git a/framework/foundation/include/bdn/Dip.h b/framework/foundation/include/bdn/Dip.h
index cfc3e4dc..c2962aaa 100644
--- a/framework/foundation/include/bdn/Dip.h
+++ b/framework/foundation/include/bdn/Dip.h
@@ -2,8 +2,9 @@
 
 #include <map>
 
-#include <bdn/round.h>
+#include <bdn/Base.h>
 #include <bdn/Rect.h>
+#include <bdn/round.h>
 
 namespace bdn
 {
diff --git a/framework/foundation/include/bdn/Factory.h b/framework/foundation/include/bdn/Factory.h
index f28a2fd5..bc1b465f 100644
--- a/framework/foundation/include/bdn/Factory.h
+++ b/framework/foundation/include/bdn/Factory.h
@@ -2,8 +2,8 @@
 
 #include <bdn/String.h>
 
-#include <map>
 #include <functional>
+#include <map>
 #include <optional>
 
 namespace bdn
diff --git a/framework/foundation/include/bdn/GenericDispatcher.h b/framework/foundation/include/bdn/GenericDispatcher.h
index 617796c9..375676b2 100644
--- a/framework/foundation/include/bdn/GenericDispatcher.h
+++ b/framework/foundation/include/bdn/GenericDispatcher.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <bdn/Base.h>
 #include <bdn/AppRunnerBase.h>
+#include <bdn/Base.h>
+#include <bdn/DanglingFunctionError.h>
 #include <bdn/IDispatcher.h>
+#include <bdn/InvalidArgumentError.h>
 #include <bdn/Signal.h>
 #include <bdn/ThreadRunnableBase.h>
 #include <bdn/log.h>
-#include <bdn/InvalidArgumentError.h>
-#include <bdn/DanglingFunctionError.h>
 
 #include <chrono>
 #include <functional>
diff --git a/framework/foundation/include/bdn/IAsyncOp.h b/framework/foundation/include/bdn/IAsyncOp.h
index 689d5a8f..f4be32b2 100644
--- a/framework/foundation/include/bdn/IAsyncOp.h
+++ b/framework/foundation/include/bdn/IAsyncOp.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <bdn/UnfinishedError.h>
 #include <bdn/AbortedError.h>
-#include <bdn/OneShotStateNotifier.h>
 #include <bdn/IAsyncNotifier.h>
+#include <bdn/OneShotStateNotifier.h>
+#include <bdn/UnfinishedError.h>
 
 namespace bdn
 {
diff --git a/framework/foundation/include/bdn/IDispatcher.h b/framework/foundation/include/bdn/IDispatcher.h
index 7dfe2636..59beb9e6 100644
--- a/framework/foundation/include/bdn/IDispatcher.h
+++ b/framework/foundation/include/bdn/IDispatcher.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <map>
 #include <chrono>
+#include <map>
 
 namespace bdn
 {
diff --git a/framework/foundation/include/bdn/Margin.h b/framework/foundation/include/bdn/Margin.h
index 2bcf5146..0ca53e25 100644
--- a/framework/foundation/include/bdn/Margin.h
+++ b/framework/foundation/include/bdn/Margin.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <ostream>
+
 namespace bdn
 {
 
diff --git a/framework/foundation/include/bdn/NotifierBase.h b/framework/foundation/include/bdn/NotifierBase.h
index 89436501..62573024 100644
--- a/framework/foundation/include/bdn/NotifierBase.h
+++ b/framework/foundation/include/bdn/NotifierBase.h
@@ -1,8 +1,8 @@
 #pragma once
 
+#include <bdn/DanglingFunctionError.h>
 #include <bdn/IAsyncNotifier.h>
 #include <bdn/ISyncNotifier.h>
-#include <bdn/DanglingFunctionError.h>
 
 #include <functional>
 #include <map>
diff --git a/framework/foundation/include/bdn/Number.h b/framework/foundation/include/bdn/Number.h
index 2d99a4a6..01e1eb7c 100644
--- a/framework/foundation/include/bdn/Number.h
+++ b/framework/foundation/include/bdn/Number.h
@@ -3,8 +3,8 @@
 #include <bdn/config.h>
 
 // needed so that we can provide specializations for std::hash
-#include <functional>
 #include <cmath>
+#include <functional>
 
 namespace bdn
 {
diff --git a/framework/foundation/include/bdn/ProgrammingError.h b/framework/foundation/include/bdn/ProgrammingError.h
index 576d3552..8b87a284 100644
--- a/framework/foundation/include/bdn/ProgrammingError.h
+++ b/framework/foundation/include/bdn/ProgrammingError.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <stdexcept>
 #include <bdn/String.h>
+#include <stdexcept>
 
 namespace bdn
 {
diff --git a/framework/foundation/include/bdn/Rect.h b/framework/foundation/include/bdn/Rect.h
index 96dc6728..5d92f1f8 100644
--- a/framework/foundation/include/bdn/Rect.h
+++ b/framework/foundation/include/bdn/Rect.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <bdn/Margin.h>
-#include <bdn/Size.h>
 #include <bdn/Point.h>
+#include <bdn/Size.h>
 
 namespace bdn
 {
diff --git a/framework/foundation/include/bdn/Size.h b/framework/foundation/include/bdn/Size.h
index d992aa99..df0b2efe 100644
--- a/framework/foundation/include/bdn/Size.h
+++ b/framework/foundation/include/bdn/Size.h
@@ -2,8 +2,8 @@
 
 #include <bdn/Margin.h>
 
-#include <limits>
 #include <cmath>
+#include <limits>
 
 namespace bdn
 {
diff --git a/framework/foundation/include/bdn/StopWatch.h b/framework/foundation/include/bdn/StopWatch.h
index a2044f92..60b24d2b 100644
--- a/framework/foundation/include/bdn/StopWatch.h
+++ b/framework/foundation/include/bdn/StopWatch.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <chrono>
 #include <bdn/IDispatcher.h>
+#include <chrono>
 
 namespace bdn
 {
diff --git a/framework/foundation/include/bdn/String.h b/framework/foundation/include/bdn/String.h
index cc3458b9..2e3a10ed 100644
--- a/framework/foundation/include/bdn/String.h
+++ b/framework/foundation/include/bdn/String.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <string>
-#include <locale>
-#include <codecvt>
 #include <algorithm>
 #include <cctype>
+#include <codecvt>
+#include <locale>
+#include <string>
 
 namespace bdn
 {
diff --git a/framework/foundation/include/bdn/Switch.h b/framework/foundation/include/bdn/Switch.h
index 69f393bc..4398da55 100644
--- a/framework/foundation/include/bdn/Switch.h
+++ b/framework/foundation/include/bdn/Switch.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <bdn/TriState.h>
+#include <bdn/ClickEvent.h>
 #include <bdn/SwitchCore.h>
+#include <bdn/TriState.h>
 #include <bdn/View.h>
-#include <bdn/ClickEvent.h>
 
 #include <bdn/SimpleNotifier.h>
 
diff --git a/framework/foundation/include/bdn/config.h b/framework/foundation/include/bdn/config.h
index ab7089cf..1227b6c6 100644
--- a/framework/foundation/include/bdn/config.h
+++ b/framework/foundation/include/bdn/config.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <cstdint>
 #include <climits>
 #include <cstddef>
+#include <cstdint>
 #include <ostream>
 
 #include <bdn/platform.h>
diff --git a/framework/foundation/include/bdn/errno.h b/framework/foundation/include/bdn/errno.h
index da579502..f3c661df 100644
--- a/framework/foundation/include/bdn/errno.h
+++ b/framework/foundation/include/bdn/errno.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/SystemError.h>
 #include <bdn/ErrorFields.h>
+#include <bdn/SystemError.h>
 #include <bdn/config.h>
 
 #include <cerrno>
diff --git a/framework/foundation/include/bdn/func.h b/framework/foundation/include/bdn/func.h
index cbd3a6ba..3a560b42 100644
--- a/framework/foundation/include/bdn/func.h
+++ b/framework/foundation/include/bdn/func.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <utility>
 #include <functional>
+#include <utility>
 
 #include <bdn/DanglingFunctionError.h>
 
diff --git a/framework/foundation/include/bdn/mainThread.h b/framework/foundation/include/bdn/mainThread.h
index 99a9bb84..6133e977 100644
--- a/framework/foundation/include/bdn/mainThread.h
+++ b/framework/foundation/include/bdn/mainThread.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <bdn/ISimpleCallable.h>
-#include <bdn/IDispatcher.h>
-#include <bdn/DanglingFunctionError.h>
 #include <bdn/AppRunnerBase.h>
+#include <bdn/DanglingFunctionError.h>
+#include <bdn/IDispatcher.h>
+#include <bdn/ISimpleCallable.h>
 
 #include <future>
 
diff --git a/framework/foundation/include/bdn/property/Backing.h b/framework/foundation/include/bdn/property/Backing.h
index f3780a6c..cd51d183 100644
--- a/framework/foundation/include/bdn/property/Backing.h
+++ b/framework/foundation/include/bdn/property/Backing.h
@@ -1,13 +1,12 @@
 #pragma once
 
-#include <bdn/property/Property.h>
-#include <bdn/property/IValueAccessor.h>
 #include <bdn/SimpleNotifier.h>
-
+#include <bdn/property/IValueAccessor.h>
 #include <memory>
 
 namespace bdn
 {
+    template <class ValType> class Property;
 
     template <class ValType> class Backing : virtual public IValueAccessor<ValType>
     {
@@ -57,4 +56,4 @@ namespace bdn
       protected:
         mutable notifier_t_ptr _pOnChange;
     };
-}
\ No newline at end of file
+}
diff --git a/framework/foundation/include/bdn/property/Property.h b/framework/foundation/include/bdn/property/Property.h
index 1d16b96b..d3302d4a 100644
--- a/framework/foundation/include/bdn/property/Property.h
+++ b/framework/foundation/include/bdn/property/Property.h
@@ -3,12 +3,12 @@
 #include <bdn/NotifierBase.h>
 #include <bdn/property/IValueAccessor.h>
 
-#include <bdn/property/property_forward_decl.h>
-#include <bdn/property/InternalValueBacking.h>
-#include <bdn/property/GetterSetterBacking.h>
 #include <bdn/property/GetterSetter.h>
-#include <bdn/property/SetterBacking.h>
+#include <bdn/property/GetterSetterBacking.h>
+#include <bdn/property/InternalValueBacking.h>
 #include <bdn/property/Setter.h>
+#include <bdn/property/SetterBacking.h>
+#include <bdn/property/property_forward_decl.h>
 
 #include <bdn/func.h>
 
diff --git a/framework/foundation/platforms/android/include/bdn/android/Dispatcher.h b/framework/foundation/platforms/android/include/bdn/android/Dispatcher.h
index 1978a75b..1af23458 100644
--- a/framework/foundation/platforms/android/include/bdn/android/Dispatcher.h
+++ b/framework/foundation/platforms/android/include/bdn/android/Dispatcher.h
@@ -2,8 +2,8 @@
 
 #include <bdn/IDispatcher.h>
 
-#include <bdn/android/JNativeDispatcher.h>
 #include <bdn/android/JLooper.h>
+#include <bdn/android/JNativeDispatcher.h>
 
 namespace bdn
 {
diff --git a/framework/foundation/platforms/android/include/bdn/android/JBaseBundle.h b/framework/foundation/platforms/android/include/bdn/android/JBaseBundle.h
index e55d9d30..a9a36d12 100644
--- a/framework/foundation/platforms/android/include/bdn/android/JBaseBundle.h
+++ b/framework/foundation/platforms/android/include/bdn/android/JBaseBundle.h
@@ -1,8 +1,8 @@
 #pragma once
 
+#include <bdn/java/ArrayOfObjects.h>
 #include <bdn/java/JObject.h>
 #include <bdn/java/JString.h>
-#include <bdn/java/ArrayOfObjects.h>
 
 namespace bdn
 {
diff --git a/framework/foundation/platforms/android/include/bdn/android/JContext.h b/framework/foundation/platforms/android/include/bdn/android/JContext.h
index 5faf768a..b02914ec 100644
--- a/framework/foundation/platforms/android/include/bdn/android/JContext.h
+++ b/framework/foundation/platforms/android/include/bdn/android/JContext.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <bdn/java/JObject.h>
-#include <bdn/android/JResources.h>
 #include <bdn/android/JIntent.h>
+#include <bdn/android/JResources.h>
+#include <bdn/java/JObject.h>
 
 namespace bdn
 {
diff --git a/framework/foundation/platforms/android/include/bdn/android/JIntent.h b/framework/foundation/platforms/android/include/bdn/android/JIntent.h
index 7f0b697e..940e7258 100644
--- a/framework/foundation/platforms/android/include/bdn/android/JIntent.h
+++ b/framework/foundation/platforms/android/include/bdn/android/JIntent.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <bdn/java/JObject.h>
 #include <bdn/android/JBundle.h>
 #include <bdn/android/JUri.h>
+#include <bdn/java/JObject.h>
 
 namespace bdn
 {
@@ -23,10 +23,10 @@ namespace bdn
                 return javaClass().newInstance_(constructorId, string, uri);
             }
 
-            JIntent(String string, JUri uri) : JTObject(createIntentInstance(string, uri)) {}
+            JIntent(String string, JUri uri) : JTObject<kIntentClassName>(createIntentInstance(string, uri)) {}
 
           public:
-            using java::JTObject<kIntentClassName>::JTObject;
+            using JTObject<kIntentClassName>::JTObject;
 
             java::Method<String()> getAction{this, "getAction"};
             java::Method<JBundle()> getExtras{this, "getExtras"};
diff --git a/framework/foundation/platforms/android/include/bdn/android/JResources.h b/framework/foundation/platforms/android/include/bdn/android/JResources.h
index da3bab3b..e104a2e4 100644
--- a/framework/foundation/platforms/android/include/bdn/android/JResources.h
+++ b/framework/foundation/platforms/android/include/bdn/android/JResources.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/java/JObject.h>
 #include <bdn/android/JConfiguration.h>
+#include <bdn/java/JObject.h>
 
 namespace bdn
 {
diff --git a/framework/foundation/platforms/android/include/bdn/java/ArrayOfObjects.h b/framework/foundation/platforms/android/include/bdn/java/ArrayOfObjects.h
index 9b255503..3e7fc9c0 100644
--- a/framework/foundation/platforms/android/include/bdn/java/ArrayOfObjects.h
+++ b/framework/foundation/platforms/android/include/bdn/java/ArrayOfObjects.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/java/JObject.h>
 #include <bdn/java/Env.h>
+#include <bdn/java/JObject.h>
 
 namespace bdn
 {
diff --git a/framework/foundation/platforms/android/include/bdn/java/Field.h b/framework/foundation/platforms/android/include/bdn/java/Field.h
index bc6c6904..5158afea 100644
--- a/framework/foundation/platforms/android/include/bdn/java/Field.h
+++ b/framework/foundation/platforms/android/include/bdn/java/Field.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <bdn/java/FieldAccessor.h>
-#include <bdn/java/Reference.h>
 #include <bdn/java/ObjectFieldKind.h>
+#include <bdn/java/Reference.h>
 #include <bdn/java/StaticFieldKind.h>
 
 namespace bdn
diff --git a/framework/foundation/platforms/android/include/bdn/java/JByteBuffer.h b/framework/foundation/platforms/android/include/bdn/java/JByteBuffer.h
index 8612dd23..dfeaeb4c 100644
--- a/framework/foundation/platforms/android/include/bdn/java/JByteBuffer.h
+++ b/framework/foundation/platforms/android/include/bdn/java/JByteBuffer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/java/JObject.h>
 #include <bdn/java/Env.h>
+#include <bdn/java/JObject.h>
 
 namespace bdn
 {
diff --git a/framework/foundation/platforms/android/include/bdn/java/JClass.h b/framework/foundation/platforms/android/include/bdn/java/JClass.h
index 6e803454..aa9f98f1 100644
--- a/framework/foundation/platforms/android/include/bdn/java/JClass.h
+++ b/framework/foundation/platforms/android/include/bdn/java/JClass.h
@@ -19,11 +19,11 @@ namespace bdn
     }
 }
 
+#include <bdn/java/MethodCaller.h>
 #include <bdn/java/MethodId.h>
 #include <bdn/java/Reference.h>
-#include <bdn/java/TypeConversion.h>
-#include <bdn/java/MethodCaller.h>
 #include <bdn/java/StaticMethodCaller.h>
+#include <bdn/java/TypeConversion.h>
 
 namespace bdn
 {
diff --git a/framework/foundation/platforms/android/include/bdn/java/JNativeException.h b/framework/foundation/platforms/android/include/bdn/java/JNativeException.h
index acd6638d..f4649fe4 100644
--- a/framework/foundation/platforms/android/include/bdn/java/JNativeException.h
+++ b/framework/foundation/platforms/android/include/bdn/java/JNativeException.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <bdn/java/JRuntimeException.h>
 #include <bdn/java/JNativeStrongPointer.h>
+#include <bdn/java/JRuntimeException.h>
 
-#include <bdn/SimpleFunctionCallable.h>
-#include <bdn/ExceptionReference.h>
 #include <bdn/ErrorInfo.h>
+#include <bdn/ExceptionReference.h>
+#include <bdn/SimpleFunctionCallable.h>
 
 #include <functional>
 
diff --git a/framework/foundation/platforms/android/include/bdn/java/JNativeRunnable.h b/framework/foundation/platforms/android/include/bdn/java/JNativeRunnable.h
index 7084c8d6..6b58abc1 100644
--- a/framework/foundation/platforms/android/include/bdn/java/JNativeRunnable.h
+++ b/framework/foundation/platforms/android/include/bdn/java/JNativeRunnable.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/java/JRunnable.h>
 #include <bdn/java/JNativeStrongPointer.h>
+#include <bdn/java/JRunnable.h>
 
 #include <bdn/SimpleFunctionCallable.h>
 
diff --git a/framework/foundation/platforms/android/include/bdn/java/JNativeStrongPointer.h b/framework/foundation/platforms/android/include/bdn/java/JNativeStrongPointer.h
index fd9df8a8..4a95bb5c 100644
--- a/framework/foundation/platforms/android/include/bdn/java/JNativeStrongPointer.h
+++ b/framework/foundation/platforms/android/include/bdn/java/JNativeStrongPointer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/java/JObject.h>
 #include <bdn/java/JByteBuffer.h>
+#include <bdn/java/JObject.h>
 
 namespace bdn
 {
diff --git a/framework/foundation/platforms/android/include/bdn/java/JString.h b/framework/foundation/platforms/android/include/bdn/java/JString.h
index e171bb17..045ddc49 100644
--- a/framework/foundation/platforms/android/include/bdn/java/JString.h
+++ b/framework/foundation/platforms/android/include/bdn/java/JString.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/java/JCharSequence.h>
 #include <bdn/java/Env.h>
+#include <bdn/java/JCharSequence.h>
 
 namespace bdn
 {
diff --git a/framework/foundation/platforms/android/include/bdn/java/MethodId.h b/framework/foundation/platforms/android/include/bdn/java/MethodId.h
index f9433534..899ca515 100644
--- a/framework/foundation/platforms/android/include/bdn/java/MethodId.h
+++ b/framework/foundation/platforms/android/include/bdn/java/MethodId.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/String.h>
 #include <bdn/ProgrammingError.h>
+#include <bdn/String.h>
 
 namespace bdn
 {
diff --git a/framework/foundation/platforms/android/include/bdn/java/NativeWeakPointer.h b/framework/foundation/platforms/android/include/bdn/java/NativeWeakPointer.h
index 69669bbe..479432f1 100644
--- a/framework/foundation/platforms/android/include/bdn/java/NativeWeakPointer.h
+++ b/framework/foundation/platforms/android/include/bdn/java/NativeWeakPointer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/java/JObject.h>
 #include <bdn/java/JByteBuffer.h>
+#include <bdn/java/JObject.h>
 
 #include <memory>
 
diff --git a/framework/foundation/platforms/android/src/Dispatcher.cpp b/framework/foundation/platforms/android/src/Dispatcher.cpp
index ea383d2f..65e00fd0 100644
--- a/framework/foundation/platforms/android/src/Dispatcher.cpp
+++ b/framework/foundation/platforms/android/src/Dispatcher.cpp
@@ -1,5 +1,5 @@
-#include <bdn/android/Dispatcher.h>
 #include <bdn/InvalidArgumentError.h>
+#include <bdn/android/Dispatcher.h>
 
 #include <bdn/java/JNativeStrongPointer.h>
 
diff --git a/framework/foundation/platforms/android/src/java/Env.cpp b/framework/foundation/platforms/android/src/java/Env.cpp
index 2c64af7d..d982df3c 100644
--- a/framework/foundation/platforms/android/src/java/Env.cpp
+++ b/framework/foundation/platforms/android/src/java/Env.cpp
@@ -1,8 +1,8 @@
 
 #include <bdn/java/Env.h>
 
-#include <bdn/java/JavaException.h>
 #include <bdn/java/JNativeException.h>
+#include <bdn/java/JavaException.h>
 
 extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
 {
diff --git a/framework/foundation/platforms/android/src/java/JNativeRunnable.cpp b/framework/foundation/platforms/android/src/java/JNativeRunnable.cpp
index ec0a1079..498d9c0e 100644
--- a/framework/foundation/platforms/android/src/java/JNativeRunnable.cpp
+++ b/framework/foundation/platforms/android/src/java/JNativeRunnable.cpp
@@ -1,8 +1,8 @@
 
 #include <bdn/java/JNativeRunnable.h>
 
-#include <bdn/java/Env.h>
 #include <bdn/entry.h>
+#include <bdn/java/Env.h>
 
 extern "C" JNIEXPORT void JNICALL Java_io_boden_java_NativeRunnable_nativeRun(JNIEnv *pEnv, jobject rawSelf,
                                                                               jobject rawNativeObject)
diff --git a/framework/foundation/platforms/android/src/java/JNativeStrongPointer.cpp b/framework/foundation/platforms/android/src/java/JNativeStrongPointer.cpp
index ac97242e..8d885dc6 100644
--- a/framework/foundation/platforms/android/src/java/JNativeStrongPointer.cpp
+++ b/framework/foundation/platforms/android/src/java/JNativeStrongPointer.cpp
@@ -1,9 +1,9 @@
 
 #include <bdn/java/JNativeStrongPointer.h>
 
-#include <bdn/java/Env.h>
-#include <bdn/entry.h>
 #include <bdn/Base.h>
+#include <bdn/entry.h>
+#include <bdn/java/Env.h>
 
 extern "C" JNIEXPORT void JNICALL Java_io_boden_java_NativeStrongPointer_disposed(JNIEnv *pEnv, jobject rawSelf,
                                                                                   jobject rawByteBuffer)
diff --git a/framework/foundation/platforms/android/src/platform/androidplatform.cpp b/framework/foundation/platforms/android/src/platform/androidplatform.cpp
index fbffbf88..f38e7735 100644
--- a/framework/foundation/platforms/android/src/platform/androidplatform.cpp
+++ b/framework/foundation/platforms/android/src/platform/androidplatform.cpp
@@ -1,7 +1,7 @@
 
-#include <bdn/platform/androidplatform.h>
-#include <bdn/java/Env.h>
 #include <bdn/debug.h>
+#include <bdn/java/Env.h>
+#include <bdn/platform/androidplatform.h>
 
 #include <cassert>
 #include <sys/types.h>
diff --git a/framework/foundation/platforms/foundationkit/include/bdn/foundationkit/MainDispatcher.hh b/framework/foundation/platforms/foundationkit/include/bdn/foundationkit/MainDispatcher.hh
index 3d260fd0..3c29dcf9 100644
--- a/framework/foundation/platforms/foundationkit/include/bdn/foundationkit/MainDispatcher.hh
+++ b/framework/foundation/platforms/foundationkit/include/bdn/foundationkit/MainDispatcher.hh
@@ -3,8 +3,8 @@
 #include <bdn/Base.h>
 #include <bdn/IDispatcher.h>
 
-#include <mutex>
 #include <list>
+#include <mutex>
 
 #import <CoreFoundation/CoreFoundation.h>
 
diff --git a/framework/foundation/platforms/foundationkit/src/MainDispatcher.mm b/framework/foundation/platforms/foundationkit/src/MainDispatcher.mm
index 79a364c8..8ff42598 100644
--- a/framework/foundation/platforms/foundationkit/src/MainDispatcher.mm
+++ b/framework/foundation/platforms/foundationkit/src/MainDispatcher.mm
@@ -1,10 +1,10 @@
 
 #import <bdn/foundationkit/MainDispatcher.hh>
 
+#include <bdn/InvalidArgumentError.h>
+#include <bdn/entry.h>
 #include <bdn/log.h>
 #include <bdn/mainThread.h>
-#include <bdn/entry.h>
-#include <bdn/InvalidArgumentError.h>
 #include <iostream>
 
 #import <Foundation/Foundation.h>
diff --git a/framework/foundation/platforms/foundationkit/src/exceptionUtil.mm b/framework/foundation/platforms/foundationkit/src/exceptionUtil.mm
index 3f59629a..06094965 100644
--- a/framework/foundation/platforms/foundationkit/src/exceptionUtil.mm
+++ b/framework/foundation/platforms/foundationkit/src/exceptionUtil.mm
@@ -5,8 +5,8 @@
 #import <bdn/foundationkit/objectUtil.hh>
 #import <bdn/foundationkit/stringUtil.hh>
 
-#include <bdn/ExceptionReference.h>
 #include <bdn/ErrorInfo.h>
+#include <bdn/ExceptionReference.h>
 
 #import <Foundation/Foundation.h>
 
diff --git a/framework/foundation/platforms/ios/src/AppRunner.mm b/framework/foundation/platforms/ios/src/AppRunner.mm
index 4380929f..ca46b524 100644
--- a/framework/foundation/platforms/ios/src/AppRunner.mm
+++ b/framework/foundation/platforms/ios/src/AppRunner.mm
@@ -5,8 +5,8 @@
 #import <bdn/foundationkit/MainDispatcher.hh>
 #import <bdn/foundationkit/objectUtil.hh>
 
-#include <bdn/entry.h>
 #include <bdn/ExceptionReference.h>
+#include <bdn/entry.h>
 
 #include <bdn/AppControllerBase.h>
 
diff --git a/framework/foundation/platforms/ios/src/platform/iosplatform.mm b/framework/foundation/platforms/ios/src/platform/iosplatform.mm
index cc31f3a8..3dcb569b 100644
--- a/framework/foundation/platforms/ios/src/platform/iosplatform.mm
+++ b/framework/foundation/platforms/ios/src/platform/iosplatform.mm
@@ -1,14 +1,14 @@
 
-#include <bdn/platform/iosplatform.h>
 #include <bdn/debug.h>
+#include <bdn/platform/iosplatform.h>
 
 #include <bdn/AppRunnerBase.h>
 
 #include <cassert>
+#include <iostream>
+#include <sys/sysctl.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <sys/sysctl.h>
-#include <iostream>
 
 #include <csignal>
 
diff --git a/framework/foundation/platforms/mac/include/bdn/mac/util.hh b/framework/foundation/platforms/mac/include/bdn/mac/util.hh
index 9bc63b0d..91bf4e9b 100644
--- a/framework/foundation/platforms/mac/include/bdn/mac/util.hh
+++ b/framework/foundation/platforms/mac/include/bdn/mac/util.hh
@@ -1,8 +1,8 @@
 #pragma once
 
 #import <AppKit/AppKit.h>
-#import <bdn/foundationkit/stringUtil.hh>
 #include <Availability.h>
+#import <bdn/foundationkit/stringUtil.hh>
 
 #include <bdn/Rect.h>
 
diff --git a/framework/foundation/platforms/mac/src/platform/macplatform.cpp b/framework/foundation/platforms/mac/src/platform/macplatform.cpp
index ad733f78..3e2977f8 100644
--- a/framework/foundation/platforms/mac/src/platform/macplatform.cpp
+++ b/framework/foundation/platforms/mac/src/platform/macplatform.cpp
@@ -1,13 +1,13 @@
 
-#include <bdn/platform/macplatform.h>
 #include <bdn/debug.h>
+#include <bdn/platform/macplatform.h>
 
 #include <bdn/AppRunnerBase.h>
 
 #include <cassert>
+#include <sys/sysctl.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <sys/sysctl.h>
 
 #include <iostream>
 
diff --git a/framework/foundation/src/AppRunnerBase.cpp b/framework/foundation/src/AppRunnerBase.cpp
index 5326e4ba..dce4801c 100644
--- a/framework/foundation/src/AppRunnerBase.cpp
+++ b/framework/foundation/src/AppRunnerBase.cpp
@@ -2,8 +2,8 @@
 #include <bdn/AppRunnerBase.h>
 #include <bdn/debug.h>
 
-#include <bdn/log.h>
 #include <bdn/UnhandledException.h>
+#include <bdn/log.h>
 
 namespace bdn
 {
diff --git a/framework/foundation/src/GenericDispatcher.cpp b/framework/foundation/src/GenericDispatcher.cpp
index 9da77502..526babe5 100644
--- a/framework/foundation/src/GenericDispatcher.cpp
+++ b/framework/foundation/src/GenericDispatcher.cpp
@@ -2,8 +2,8 @@
 #include <bdn/GenericDispatcher.h>
 
 #include <bdn/AppRunnerBase.h>
-#include <iostream>
 #include <bdn/log.h>
+#include <iostream>
 
 namespace bdn
 {
diff --git a/framework/foundation/src/IDispatcher.cpp b/framework/foundation/src/IDispatcher.cpp
index bab49b45..2a29448d 100644
--- a/framework/foundation/src/IDispatcher.cpp
+++ b/framework/foundation/src/IDispatcher.cpp
@@ -1,6 +1,6 @@
 
-#include <bdn/IDispatcher.h>
 #include <bdn/AppRunnerBase.h>
+#include <bdn/IDispatcher.h>
 
 namespace bdn
 {
diff --git a/framework/foundation/src/ProgrammingError.cpp b/framework/foundation/src/ProgrammingError.cpp
index e8375c89..072e117d 100644
--- a/framework/foundation/src/ProgrammingError.cpp
+++ b/framework/foundation/src/ProgrammingError.cpp
@@ -1,8 +1,8 @@
 
 #include <bdn/ProgrammingError.h>
 
-#include <bdn/log.h>
 #include <bdn/debug.h>
+#include <bdn/log.h>
 
 #include <cassert>
 
diff --git a/framework/foundation/src/genericAppEntry.cpp b/framework/foundation/src/genericAppEntry.cpp
index 26a1b92c..498ed844 100644
--- a/framework/foundation/src/genericAppEntry.cpp
+++ b/framework/foundation/src/genericAppEntry.cpp
@@ -1,8 +1,8 @@
 
 #include <bdn/genericAppEntry.h>
 
-#include <bdn/entry.h>
 #include <bdn/GenericAppRunner.h>
+#include <bdn/entry.h>
 
 namespace bdn
 {
diff --git a/framework/foundation/src/localeUtil.cpp b/framework/foundation/src/localeUtil.cpp
index 4d7c2aeb..b5e467f9 100644
--- a/framework/foundation/src/localeUtil.cpp
+++ b/framework/foundation/src/localeUtil.cpp
@@ -1,8 +1,8 @@
 
 #include <bdn/localeUtil.h>
 
-#include <locale>
 #include <cstring>
+#include <locale>
 
 namespace bdn
 {
diff --git a/framework/net/include/bdn/HTTPResponse.h b/framework/net/include/bdn/HTTPResponse.h
index bf8cf27c..66d857bc 100644
--- a/framework/net/include/bdn/HTTPResponse.h
+++ b/framework/net/include/bdn/HTTPResponse.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/HTTPRequest.h>
 #include <bdn/Base.h>
+#include <bdn/HTTPRequest.h>
 
 namespace bdn
 {
diff --git a/framework/net/platforms/android/include/HTTP.h b/framework/net/platforms/android/include/HTTP.h
index 555410ec..30becd9d 100644
--- a/framework/net/platforms/android/include/HTTP.h
+++ b/framework/net/platforms/android/include/HTTP.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/java/JObject.h>
 #include <bdn/java/JNativeStrongPointer.h>
+#include <bdn/java/JObject.h>
 #include <bdn/java/JString.h>
 
 namespace bdn
diff --git a/framework/net/platforms/android/include/VolleyAdapter.h b/framework/net/platforms/android/include/VolleyAdapter.h
index f2f39e64..b1c3440e 100644
--- a/framework/net/platforms/android/include/VolleyAdapter.h
+++ b/framework/net/platforms/android/include/VolleyAdapter.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/java/JObject.h>
 #include <bdn/java/JNativeStrongPointer.h>
+#include <bdn/java/JObject.h>
 #include <bdn/java/JString.h>
 
 #include <bdn/HTTP.h>
@@ -18,13 +18,12 @@ namespace bdn
             {
                 constexpr char kVolleyAdapterClassName[] = "io/boden/java/VolleyAdapter";
 
-                class JVolleyAdapter : public bdn::java::JTObject<kVolleyAdapterClassName>
+                class JVolleyAdapter : public java::JTObject<kVolleyAdapterClassName>
                 {
                   public:
-                    using JTObject::JTObject;
+                    using JTObject<kVolleyAdapterClassName>::JTObject;
 
-                    bdn::java::Method<void(int, String, std::shared_ptr<bdn::net::HTTPResponse>)> request{this,
-                                                                                                          "request"};
+                    java::Method<void(int, String, std::shared_ptr<bdn::net::HTTPResponse>)> request{this, "request"};
 
                     static constexpr int toVolleyRequestMethod(bdn::net::http::Method bdnHttpMethod)
                     {
diff --git a/framework/net/platforms/android/src/HTTP.cpp b/framework/net/platforms/android/src/HTTP.cpp
index 01a6e873..9d424bc1 100644
--- a/framework/net/platforms/android/src/HTTP.cpp
+++ b/framework/net/platforms/android/src/HTTP.cpp
@@ -1,14 +1,14 @@
-#include <bdn/config.h>
+#include <bdn/AppRunnerBase.h>
 #include <bdn/HTTP.h>
 #include <bdn/HTTPRequest.h>
 #include <bdn/HTTPResponse.h>
-#include <bdn/AppRunnerBase.h>
+#include <bdn/config.h>
 #include <bdn/entry.h>
 #include <bdn/log.h>
 #include <ostream>
 
-#include "VolleyAdapter.h"
 #include "../../../include/bdn/HTTPRequest.h"
+#include "VolleyAdapter.h"
 
 namespace bdn
 {
diff --git a/framework/net/platforms/mac/src/HTTP.mm b/framework/net/platforms/mac/src/HTTP.mm
index c9d164a4..f747a856 100644
--- a/framework/net/platforms/mac/src/HTTP.mm
+++ b/framework/net/platforms/mac/src/HTTP.mm
@@ -1,8 +1,8 @@
-#include <bdn/config.h>
+#include <bdn/AppRunnerBase.h>
 #include <bdn/HTTP.h>
 #include <bdn/HTTPRequest.h>
 #include <bdn/HTTPResponse.h>
-#include <bdn/AppRunnerBase.h>
+#include <bdn/config.h>
 
 #ifdef BDN_PLATFORM_OSX
 #import <bdn/mac/util.hh>
diff --git a/framework/testing/include/bdn/test.h b/framework/testing/include/bdn/test.h
index 083edcda..13c1bd6c 100644
--- a/framework/testing/include/bdn/test.h
+++ b/framework/testing/include/bdn/test.h
@@ -102,19 +102,19 @@
 #define INTERNAL_BDN_STRINGIFY2(expr) #expr
 #define INTERNAL_BDN_STRINGIFY(expr) INTERNAL_BDN_STRINGIFY2(expr)
 
-#include <sstream>
-#include <stdexcept>
 #include <algorithm>
 #include <list>
+#include <sstream>
+#include <stdexcept>
 
-#include <bdn/Size.h>
-#include <bdn/Rect.h>
 #include <bdn/Margin.h>
+#include <bdn/ProgrammingError.h>
+#include <bdn/Rect.h>
+#include <bdn/Size.h>
 #include <bdn/UILength.h>
 #include <bdn/UIMargin.h>
 #include <bdn/UISize.h>
 #include <bdn/property/Property.h>
-#include <bdn/ProgrammingError.h>
 #include <bdn/test/ExpectProgrammingError.h>
 
 // #included from: catch_compiler_capabilities.h
@@ -605,8 +605,8 @@ namespace bdn
 #endif
 
 #include <memory>
-#include <vector>
 #include <stdlib.h>
+#include <vector>
 
 namespace bdn
 {
@@ -1664,11 +1664,11 @@ namespace bdn
 // #included from: catch_tostring.h
 #define TWOBLUECUBES_BDN_TOSTRING_H_INCLUDED
 
-#include <sstream>
+#include <cstddef>
 #include <iomanip>
 #include <limits>
+#include <sstream>
 #include <vector>
-#include <cstddef>
 
 #ifdef __OBJC__
 // #included from: catch_objc_arc.hpp
@@ -2198,8 +2198,8 @@ namespace bdn
 
 #include <string>
 
-#include <bdn/debug.h>
 #include <bdn/IDispatcher.h>
+#include <bdn/debug.h>
 
 // #included from: catch_interfaces_runner.h
 #define TWOBLUECUBES_BDN_INTERFACES_RUNNER_H_INCLUDED
diff --git a/framework/testing/include/bdn/test/MockButtonCore.h b/framework/testing/include/bdn/test/MockButtonCore.h
index 8a03a0e0..0fcae597 100644
--- a/framework/testing/include/bdn/test/MockButtonCore.h
+++ b/framework/testing/include/bdn/test/MockButtonCore.h
@@ -2,8 +2,8 @@
 
 #include <bdn/test/MockViewCore.h>
 
-#include <bdn/IButtonCore.h>
 #include <bdn/Button.h>
+#include <bdn/IButtonCore.h>
 
 namespace bdn
 {
diff --git a/framework/testing/include/bdn/test/MockCheckboxCore.h b/framework/testing/include/bdn/test/MockCheckboxCore.h
index 8c097a1a..420e60d9 100644
--- a/framework/testing/include/bdn/test/MockCheckboxCore.h
+++ b/framework/testing/include/bdn/test/MockCheckboxCore.h
@@ -2,8 +2,8 @@
 
 #include <bdn/test/MockViewCore.h>
 
-#include <bdn/CheckboxCore.h>
 #include <bdn/Checkbox.h>
+#include <bdn/CheckboxCore.h>
 
 namespace bdn
 {
diff --git a/framework/testing/include/bdn/test/MockSwitchCore.h b/framework/testing/include/bdn/test/MockSwitchCore.h
index 27650eb6..50796830 100644
--- a/framework/testing/include/bdn/test/MockSwitchCore.h
+++ b/framework/testing/include/bdn/test/MockSwitchCore.h
@@ -2,8 +2,8 @@
 
 #include <bdn/test/MockViewCore.h>
 
-#include <bdn/SwitchCore.h>
 #include <bdn/Switch.h>
+#include <bdn/SwitchCore.h>
 
 namespace bdn
 {
diff --git a/framework/testing/include/bdn/test/MockUIProvider.h b/framework/testing/include/bdn/test/MockUIProvider.h
index 188f7460..b00205b4 100644
--- a/framework/testing/include/bdn/test/MockUIProvider.h
+++ b/framework/testing/include/bdn/test/MockUIProvider.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/UIProvider.h>
 #include <bdn/LayoutCoordinator.h>
+#include <bdn/UIProvider.h>
 
 #include <bdn/ViewCoreTypeNotSupportedError.h>
 
diff --git a/framework/testing/include/bdn/test/MockViewCore.h b/framework/testing/include/bdn/test/MockViewCore.h
index b6c73bda..477cb381 100644
--- a/framework/testing/include/bdn/test/MockViewCore.h
+++ b/framework/testing/include/bdn/test/MockViewCore.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <bdn/IViewCore.h>
 #include <bdn/Dip.h>
-#include <bdn/test/MockUIProvider.h>
+#include <bdn/IViewCore.h>
 #include <bdn/round.h>
+#include <bdn/test/MockUIProvider.h>
 
 #include <bdn/test.h>
 
diff --git a/framework/testing/include/bdn/test/ScrollViewLayoutTesterBase.h b/framework/testing/include/bdn/test/ScrollViewLayoutTesterBase.h
index b45f15b8..8186e4ce 100644
--- a/framework/testing/include/bdn/test/ScrollViewLayoutTesterBase.h
+++ b/framework/testing/include/bdn/test/ScrollViewLayoutTesterBase.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <bdn/Button.h>
-#include <bdn/TextView.h>
 #include <bdn/Dip.h>
+#include <bdn/TextView.h>
 
 namespace bdn
 {
diff --git a/framework/testing/include/bdn/test/TestButtonCore.h b/framework/testing/include/bdn/test/TestButtonCore.h
index e1041c36..6bd63789 100644
--- a/framework/testing/include/bdn/test/TestButtonCore.h
+++ b/framework/testing/include/bdn/test/TestButtonCore.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/test/TestViewCore.h>
 #include <bdn/Button.h>
+#include <bdn/test/TestViewCore.h>
 
 namespace bdn
 {
diff --git a/framework/testing/include/bdn/test/TestCheckboxCore.h b/framework/testing/include/bdn/test/TestCheckboxCore.h
index 487e9d8a..c79ff17e 100644
--- a/framework/testing/include/bdn/test/TestCheckboxCore.h
+++ b/framework/testing/include/bdn/test/TestCheckboxCore.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/test/TestViewCore.h>
 #include <bdn/Checkbox.h>
+#include <bdn/test/TestViewCore.h>
 
 namespace bdn
 {
diff --git a/framework/testing/include/bdn/test/TestContainerViewCore.h b/framework/testing/include/bdn/test/TestContainerViewCore.h
index 6b2b217d..8cad6072 100644
--- a/framework/testing/include/bdn/test/TestContainerViewCore.h
+++ b/framework/testing/include/bdn/test/TestContainerViewCore.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <bdn/test/TestViewCore.h>
-#include <bdn/ContainerView.h>
 #include <bdn/ColumnView.h>
+#include <bdn/ContainerView.h>
+#include <bdn/test/TestViewCore.h>
 
 namespace bdn
 {
diff --git a/framework/testing/include/bdn/test/TestScrollViewCore.h b/framework/testing/include/bdn/test/TestScrollViewCore.h
index c32c8e60..302d4bdc 100644
--- a/framework/testing/include/bdn/test/TestScrollViewCore.h
+++ b/framework/testing/include/bdn/test/TestScrollViewCore.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <bdn/test/TestViewCore.h>
-#include <bdn/ScrollView.h>
 #include <bdn/IScrollViewCore.h>
+#include <bdn/ScrollView.h>
+#include <bdn/test/TestViewCore.h>
 
 #include <bdn/test/ScrollViewLayoutTesterBase.h>
 
diff --git a/framework/testing/include/bdn/test/TestSwitchCore.h b/framework/testing/include/bdn/test/TestSwitchCore.h
index 53cab23f..e3e061ed 100644
--- a/framework/testing/include/bdn/test/TestSwitchCore.h
+++ b/framework/testing/include/bdn/test/TestSwitchCore.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/test/TestViewCore.h>
 #include <bdn/Switch.h>
+#include <bdn/test/TestViewCore.h>
 
 namespace bdn
 {
diff --git a/framework/testing/include/bdn/test/TestTextFieldCore.h b/framework/testing/include/bdn/test/TestTextFieldCore.h
index 6172a427..917da6fb 100644
--- a/framework/testing/include/bdn/test/TestTextFieldCore.h
+++ b/framework/testing/include/bdn/test/TestTextFieldCore.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/test/TestViewCore.h>
 #include <bdn/TextField.h>
+#include <bdn/test/TestViewCore.h>
 
 namespace bdn
 {
diff --git a/framework/testing/include/bdn/test/TestTextViewCore.h b/framework/testing/include/bdn/test/TestTextViewCore.h
index a78b6477..976fe78b 100644
--- a/framework/testing/include/bdn/test/TestTextViewCore.h
+++ b/framework/testing/include/bdn/test/TestTextViewCore.h
@@ -2,7 +2,6 @@
 
 #include <bdn/TextView.h>
 #include <bdn/test/TestViewCore.h>
-#include <bdn/TextView.h>
 
 namespace bdn
 {
diff --git a/framework/testing/include/bdn/test/TestViewCore.h b/framework/testing/include/bdn/test/TestViewCore.h
index 2cb0b25c..efa9d8a8 100644
--- a/framework/testing/include/bdn/test/TestViewCore.h
+++ b/framework/testing/include/bdn/test/TestViewCore.h
@@ -1,12 +1,12 @@
 #pragma once
 
+#include <bdn/Button.h>
+#include <bdn/ColumnView.h>
+#include <bdn/UIProvider.h>
 #include <bdn/View.h>
 #include <bdn/Window.h>
 #include <bdn/test.h>
 #include <bdn/test/testCalcPreferredSize.h>
-#include <bdn/UIProvider.h>
-#include <bdn/Button.h>
-#include <bdn/ColumnView.h>
 
 using namespace std::chrono_literals;
 
diff --git a/framework/testing/include/bdn/test/TestWindowCore.h b/framework/testing/include/bdn/test/TestWindowCore.h
index d6c2b718..cf30f02c 100644
--- a/framework/testing/include/bdn/test/TestWindowCore.h
+++ b/framework/testing/include/bdn/test/TestWindowCore.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/test/TestViewCore.h>
 #include <bdn/Window.h>
+#include <bdn/test/TestViewCore.h>
 
 namespace bdn
 {
diff --git a/framework/testing/include/bdn/test/testCalcPreferredSize.h b/framework/testing/include/bdn/test/testCalcPreferredSize.h
index 67f83bbd..d59d752e 100644
--- a/framework/testing/include/bdn/test/testCalcPreferredSize.h
+++ b/framework/testing/include/bdn/test/testCalcPreferredSize.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/View.h>
 #include <bdn/TextView.h>
+#include <bdn/View.h>
 
 namespace bdn
 {
diff --git a/framework/testing/include/bdn/test/testDispatcher.h b/framework/testing/include/bdn/test/testDispatcher.h
index fffa1911..b1c6d6c6 100644
--- a/framework/testing/include/bdn/test/testDispatcher.h
+++ b/framework/testing/include/bdn/test/testDispatcher.h
@@ -3,8 +3,8 @@
 #include <bdn/IDispatcher.h>
 #include <bdn/InvalidArgumentError.h>
 
-#include <thread>
 #include <chrono>
+#include <thread>
 
 using namespace std::chrono_literals;
 
diff --git a/framework/testing/include/bdn/test/testView.h b/framework/testing/include/bdn/test/testView.h
index fafec058..008f8abe 100644
--- a/framework/testing/include/bdn/test/testView.h
+++ b/framework/testing/include/bdn/test/testView.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <bdn/test/MockUIProvider.h>
+#include <bdn/test/MockViewCore.h>
 #include <bdn/test/ViewWithTestExtensions.h>
 #include <bdn/test/testCalcPreferredSize.h>
-#include <bdn/test/MockViewCore.h>
 
 namespace bdn
 {
diff --git a/framework/testing/src/test.cpp b/framework/testing/src/test.cpp
index d2bca6d3..b592fa0a 100644
--- a/framework/testing/src/test.cpp
+++ b/framework/testing/src/test.cpp
@@ -39,18 +39,18 @@ DEALINGS IN THE SOFTWARE.
 
 #include <bdn/ErrorInfo.h>
 
-#include <bdn/AppRunnerBase.h>
 #include <bdn/AppControllerBase.h>
-#include <bdn/TestAppController.h>
-#include <bdn/Window.h>
+#include <bdn/AppRunnerBase.h>
 #include <bdn/ColumnView.h>
+#include <bdn/IDispatcher.h>
+#include <bdn/NotImplementedError.h>
+#include <bdn/TestAppController.h>
 #include <bdn/TextView.h>
-#include <bdn/mainThread.h>
+#include <bdn/Window.h>
+#include <bdn/config.h>
 #include <bdn/debug.h>
-#include <bdn/NotImplementedError.h>
+#include <bdn/mainThread.h>
 #include <bdn/platform/Hooks.h>
-#include <bdn/config.h>
-#include <bdn/IDispatcher.h>
 
 #include <cstring>
 
@@ -466,9 +466,9 @@ namespace bdn
     };
 }
 
-#include <streambuf>
-#include <ostream>
 #include <fstream>
+#include <ostream>
+#include <streambuf>
 
 namespace bdn
 {
@@ -537,11 +537,11 @@ namespace bdn
     };
 }
 
+#include <ctime>
+#include <iostream>
 #include <memory>
-#include <vector>
 #include <string>
-#include <iostream>
-#include <ctime>
+#include <vector>
 
 #ifndef BDN_CONFIG_CONSOLE_WIDTH
 #define BDN_CONFIG_CONSOLE_WIDTH 80
@@ -719,9 +719,9 @@ namespace bdn
 #define TBC_TEXT_FORMAT_H_INCLUDED
 #endif
 
+#include <sstream>
 #include <string>
 #include <vector>
-#include <sstream>
 
 // Use optional outer namespace
 #ifdef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE
@@ -874,10 +874,10 @@ namespace STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE
 
 #undef STITCH_TBC_TEXT_FORMAT_OPEN_NAMESPACE
 
-#include <map>
 #include <algorithm>
-#include <stdexcept>
+#include <map>
 #include <memory>
+#include <stdexcept>
 
 // Use optional outer namespace
 #ifdef STITCH_CLARA_OPEN_NAMESPACE
@@ -1780,9 +1780,9 @@ namespace bdn
 #endif
 #endif
 #ifndef TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED
+#include <sstream>
 #include <string>
 #include <vector>
-#include <sstream>
 
 // Use optional outer namespace
 #ifdef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE
@@ -2000,10 +2000,10 @@ namespace bdn
 // #included from: catch_interfaces_reporter.h
 #define TWOBLUECUBES_BDN_INTERFACES_REPORTER_H_INCLUDED
 
-#include <string>
-#include <ostream>
-#include <map>
 #include <assert.h>
+#include <map>
+#include <ostream>
+#include <string>
 
 namespace bdn
 {
@@ -2253,8 +2253,8 @@ namespace bdn
                                         Ptr<IStreamingReporter> const &additionalReporter);
 }
 
-#include <limits>
 #include <algorithm>
+#include <limits>
 
 namespace bdn
 {
@@ -2415,9 +2415,9 @@ namespace bdn
 // #included from: catch_test_case_tracker.hpp
 #define TWOBLUECUBES_BDN_TEST_CASE_TRACKER_HPP_INCLUDED
 
+#include <assert.h>
 #include <map>
 #include <string>
-#include <assert.h>
 #include <vector>
 
 namespace bdn
@@ -4000,8 +4000,8 @@ namespace bdn
 }
 
 #include <fstream>
-#include <stdlib.h>
 #include <limits>
+#include <stdlib.h>
 
 namespace bdn
 {
@@ -4307,12 +4307,12 @@ namespace bdn
 // #included from: catch_test_case_registry_impl.hpp
 #define TWOBLUECUBES_BDN_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED
 
-#include <vector>
-#include <set>
-#include <sstream>
-#include <iostream>
 #include <algorithm>
+#include <iostream>
 #include <random>
+#include <set>
+#include <sstream>
+#include <vector>
 
 namespace bdn
 {
@@ -4670,9 +4670,9 @@ namespace bdn
 // #included from: catch_stream.hpp
 #define TWOBLUECUBES_BDN_STREAM_HPP_INCLUDED
 
-#include <stdexcept>
 #include <cstdio>
 #include <iostream>
+#include <stdexcept>
 
 namespace bdn
 {
@@ -5047,9 +5047,9 @@ namespace bdn
 // #included from: catch_generators_impl.hpp
 #define TWOBLUECUBES_BDN_GENERATORS_IMPL_HPP_INCLUDED
 
-#include <vector>
-#include <string>
 #include <map>
+#include <string>
+#include <vector>
 
 namespace bdn
 {
@@ -6187,8 +6187,8 @@ namespace bdn
 
 } // end namespace bdn
 
-#include <map>
 #include <iostream>
+#include <map>
 
 namespace bdn
 {
@@ -6760,10 +6760,10 @@ namespace bdn
 // #included from: ../internal/catch_xmlwriter.hpp
 #define TWOBLUECUBES_BDN_XMLWRITER_HPP_INCLUDED
 
+#include <iomanip>
 #include <sstream>
 #include <string>
 #include <vector>
-#include <iomanip>
 
 namespace bdn
 {
diff --git a/framework/testing/src/test/MockUIProvider.cpp b/framework/testing/src/test/MockUIProvider.cpp
index bb34d39f..312725d1 100644
--- a/framework/testing/src/test/MockUIProvider.cpp
+++ b/framework/testing/src/test/MockUIProvider.cpp
@@ -1,15 +1,15 @@
 
-#include <bdn/test/MockUIProvider.h>
 #include <bdn/test.h>
+#include <bdn/test/MockUIProvider.h>
 
-#include <bdn/test/MockContainerViewCore.h>
-#include <bdn/test/MockWindowCore.h>
 #include <bdn/test/MockButtonCore.h>
 #include <bdn/test/MockCheckboxCore.h>
+#include <bdn/test/MockContainerViewCore.h>
+#include <bdn/test/MockScrollViewCore.h>
 #include <bdn/test/MockSwitchCore.h>
-#include <bdn/test/MockTextViewCore.h>
 #include <bdn/test/MockTextFieldCore.h>
-#include <bdn/test/MockScrollViewCore.h>
+#include <bdn/test/MockTextViewCore.h>
+#include <bdn/test/MockWindowCore.h>
 
 namespace bdn
 {
diff --git a/framework/ui/include/bdn/Button.h b/framework/ui/include/bdn/Button.h
index be5d0c93..8ec8a46a 100644
--- a/framework/ui/include/bdn/Button.h
+++ b/framework/ui/include/bdn/Button.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <bdn/View.h>
-#include <bdn/IButtonCore.h>
 #include <bdn/ClickEvent.h>
+#include <bdn/IButtonCore.h>
 #include <bdn/SimpleNotifier.h>
+#include <bdn/View.h>
 
 namespace bdn
 {
diff --git a/framework/ui/include/bdn/Checkbox.h b/framework/ui/include/bdn/Checkbox.h
index 7592774b..8eb96408 100644
--- a/framework/ui/include/bdn/Checkbox.h
+++ b/framework/ui/include/bdn/Checkbox.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <bdn/TriState.h>
-#include <bdn/View.h>
-#include <bdn/ClickEvent.h>
 #include <bdn/CheckboxCore.h>
+#include <bdn/ClickEvent.h>
 #include <bdn/SimpleNotifier.h>
+#include <bdn/TriState.h>
+#include <bdn/View.h>
 
 namespace bdn
 {
diff --git a/framework/ui/include/bdn/CheckboxCore.h b/framework/ui/include/bdn/CheckboxCore.h
index af220293..8e0184a8 100644
--- a/framework/ui/include/bdn/CheckboxCore.h
+++ b/framework/ui/include/bdn/CheckboxCore.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/TriState.h>
 #include <bdn/IViewCore.h>
+#include <bdn/TriState.h>
 
 namespace bdn
 {
diff --git a/framework/ui/include/bdn/IViewCore.h b/framework/ui/include/bdn/IViewCore.h
index 79c38827..78ed0153 100644
--- a/framework/ui/include/bdn/IViewCore.h
+++ b/framework/ui/include/bdn/IViewCore.h
@@ -5,9 +5,9 @@ namespace bdn
     class View;
 }
 
-#include <bdn/UIMargin.h>
 #include <bdn/Rect.h>
 #include <bdn/Size.h>
+#include <bdn/UIMargin.h>
 #include <bdn/round.h>
 #include <optional>
 
diff --git a/framework/ui/include/bdn/LayoutCoordinator.h b/framework/ui/include/bdn/LayoutCoordinator.h
index 5fb70cab..ed4475e4 100644
--- a/framework/ui/include/bdn/LayoutCoordinator.h
+++ b/framework/ui/include/bdn/LayoutCoordinator.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/Window.h>
 #include <bdn/View.h>
+#include <bdn/Window.h>
 
 #include <set>
 
diff --git a/framework/ui/include/bdn/LinearLayoutViewTypes.h b/framework/ui/include/bdn/LinearLayoutViewTypes.h
index 842ee384..f78e29a8 100644
--- a/framework/ui/include/bdn/LinearLayoutViewTypes.h
+++ b/framework/ui/include/bdn/LinearLayoutViewTypes.h
@@ -1,9 +1,9 @@
 #pragma once
 
+#include <bdn/Margin.h>
 #include <bdn/Point.h>
-#include <bdn/Size.h>
 #include <bdn/Rect.h>
-#include <bdn/Margin.h>
+#include <bdn/Size.h>
 
 #include <bdn/View.h>
 
diff --git a/framework/ui/include/bdn/ListView.h b/framework/ui/include/bdn/ListView.h
index f1faa160..a56e9ef0 100644
--- a/framework/ui/include/bdn/ListView.h
+++ b/framework/ui/include/bdn/ListView.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/View.h>
 #include <bdn/ListViewDataSource.h>
+#include <bdn/View.h>
 
 namespace bdn
 {
diff --git a/framework/ui/include/bdn/ListViewDataSource.h b/framework/ui/include/bdn/ListViewDataSource.h
index b1fbca07..bedb5504 100644
--- a/framework/ui/include/bdn/ListViewDataSource.h
+++ b/framework/ui/include/bdn/ListViewDataSource.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <string>
+#include <bdn/String.h>
 
 namespace bdn
 {
@@ -12,4 +12,4 @@ namespace bdn
         virtual size_t numberOfRows() = 0;
         virtual String labelTextForRowIndex(size_t rowIndex) = 0;
     };
-}
\ No newline at end of file
+}
diff --git a/framework/ui/include/bdn/PreferredViewSizeManager.h b/framework/ui/include/bdn/PreferredViewSizeManager.h
index 3638a744..17cc04b8 100644
--- a/framework/ui/include/bdn/PreferredViewSizeManager.h
+++ b/framework/ui/include/bdn/PreferredViewSizeManager.h
@@ -1,5 +1,9 @@
 #pragma once
 
+#include <bdn/Base.h>
+#include <bdn/Size.h>
+#include <map>
+
 namespace bdn
 {
 
diff --git a/framework/ui/include/bdn/ScrollViewLayoutHelper.h b/framework/ui/include/bdn/ScrollViewLayoutHelper.h
index 6fff6217..5e97ddae 100644
--- a/framework/ui/include/bdn/ScrollViewLayoutHelper.h
+++ b/framework/ui/include/bdn/ScrollViewLayoutHelper.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/ScrollView.h>
 #include <bdn/Dip.h>
+#include <bdn/ScrollView.h>
 
 namespace bdn
 {
diff --git a/framework/ui/include/bdn/StackCore.h b/framework/ui/include/bdn/StackCore.h
index 91f2a713..4c14ce2e 100644
--- a/framework/ui/include/bdn/StackCore.h
+++ b/framework/ui/include/bdn/StackCore.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/View.h>
 #include <bdn/String.h>
+#include <bdn/View.h>
 
 namespace bdn
 {
diff --git a/framework/ui/include/bdn/TextField.h b/framework/ui/include/bdn/TextField.h
index c84de48e..057ab956 100644
--- a/framework/ui/include/bdn/TextField.h
+++ b/framework/ui/include/bdn/TextField.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <bdn/View.h>
 #include <bdn/ITextFieldCore.h>
-#include <bdn/SubmitEvent.h>
 #include <bdn/SimpleNotifier.h>
+#include <bdn/SubmitEvent.h>
+#include <bdn/View.h>
 
 namespace bdn
 {
diff --git a/framework/ui/include/bdn/TextView.h b/framework/ui/include/bdn/TextView.h
index 70fcb75b..c64a1970 100644
--- a/framework/ui/include/bdn/TextView.h
+++ b/framework/ui/include/bdn/TextView.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/View.h>
 #include <bdn/ITextViewCore.h>
+#include <bdn/View.h>
 
 namespace bdn
 {
diff --git a/framework/ui/include/bdn/UIProvider.h b/framework/ui/include/bdn/UIProvider.h
index a772e8fb..a5ebd4e0 100644
--- a/framework/ui/include/bdn/UIProvider.h
+++ b/framework/ui/include/bdn/UIProvider.h
@@ -5,9 +5,9 @@ namespace bdn
     class UIProvider;
 }
 
+#include <bdn/Factory.h>
 #include <bdn/IViewCore.h>
 #include <bdn/View.h>
-#include <bdn/Factory.h>
 #include <bdn/ViewCoreTypeNotSupportedError.h>
 
 namespace bdn
diff --git a/framework/ui/include/bdn/UISize.h b/framework/ui/include/bdn/UISize.h
index 1c6d42a3..fb36fa33 100644
--- a/framework/ui/include/bdn/UISize.h
+++ b/framework/ui/include/bdn/UISize.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/UILength.h>
 #include <bdn/Size.h>
+#include <bdn/UILength.h>
 
 namespace bdn
 {
diff --git a/framework/ui/include/bdn/View.h b/framework/ui/include/bdn/View.h
index 8c9ce545..1cb4822f 100644
--- a/framework/ui/include/bdn/View.h
+++ b/framework/ui/include/bdn/View.h
@@ -7,13 +7,13 @@ namespace bdn
     class UIProvider; // included below
 }
 
+#include <bdn/PreferredViewSizeManager.h>
+#include <bdn/Rect.h>
 #include <bdn/UIMargin.h>
 #include <bdn/UISize.h>
-#include <bdn/Rect.h>
-#include <bdn/property/Property.h>
 #include <bdn/mainThread.h>
+#include <bdn/property/Property.h>
 #include <bdn/round.h>
-#include <bdn/PreferredViewSizeManager.h>
 
 #include <bdn/IViewCore.h>
 
diff --git a/framework/ui/platforms/android/include/bdn/android/ButtonCore.h b/framework/ui/platforms/android/include/bdn/android/ButtonCore.h
index 6515a841..29fe7142 100644
--- a/framework/ui/platforms/android/include/bdn/android/ButtonCore.h
+++ b/framework/ui/platforms/android/include/bdn/android/ButtonCore.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <bdn/android/ViewCore.h>
-#include <bdn/android/JButton.h>
-#include <bdn/IButtonCore.h>
 #include <bdn/Button.h>
+#include <bdn/IButtonCore.h>
+#include <bdn/android/JButton.h>
+#include <bdn/android/ViewCore.h>
 
 namespace bdn
 {
diff --git a/framework/ui/platforms/android/include/bdn/android/CheckboxCore.h b/framework/ui/platforms/android/include/bdn/android/CheckboxCore.h
index dfd6472b..a1cb86c0 100644
--- a/framework/ui/platforms/android/include/bdn/android/CheckboxCore.h
+++ b/framework/ui/platforms/android/include/bdn/android/CheckboxCore.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <bdn/android/ViewCore.h>
-#include <bdn/android/JCheckBox.h>
-#include <bdn/CheckboxCore.h>
 #include <bdn/Checkbox.h>
+#include <bdn/CheckboxCore.h>
+#include <bdn/android/JCheckBox.h>
 #include <bdn/android/JNativeViewCoreClickListener.h>
+#include <bdn/android/ViewCore.h>
 
 namespace bdn
 {
diff --git a/framework/ui/platforms/android/include/bdn/android/ContainerViewCore.h b/framework/ui/platforms/android/include/bdn/android/ContainerViewCore.h
index 0be3de5f..a56552b9 100644
--- a/framework/ui/platforms/android/include/bdn/android/ContainerViewCore.h
+++ b/framework/ui/platforms/android/include/bdn/android/ContainerViewCore.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <bdn/ContainerView.h>
-#include <bdn/android/ViewCore.h>
 #include <bdn/android/IParentViewCore.h>
 #include <bdn/android/JNativeViewGroup.h>
+#include <bdn/android/ViewCore.h>
 
 namespace bdn
 {
diff --git a/framework/ui/platforms/android/include/bdn/android/IParentViewCore.h b/framework/ui/platforms/android/include/bdn/android/IParentViewCore.h
index 81965ef5..3b9cf194 100644
--- a/framework/ui/platforms/android/include/bdn/android/IParentViewCore.h
+++ b/framework/ui/platforms/android/include/bdn/android/IParentViewCore.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <bdn/android/JView.h>
+
 namespace bdn
 {
     namespace android
diff --git a/framework/ui/platforms/android/include/bdn/android/JAdapterView.h b/framework/ui/platforms/android/include/bdn/android/JAdapterView.h
index f7c483d5..27a6cc0e 100644
--- a/framework/ui/platforms/android/include/bdn/android/JAdapterView.h
+++ b/framework/ui/platforms/android/include/bdn/android/JAdapterView.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/android/JViewGroup.h>
 #include <bdn/android/JNativeListAdapter.h>
+#include <bdn/android/JViewGroup.h>
 
 namespace bdn
 {
@@ -20,8 +20,8 @@ namespace bdn
             using JBaseViewGroup<javaClassName>::JBaseViewGroup;
             using JAdapterView = JBaseViewGroup<>;
 
-            Method<void(JListAdapter)> setAdapter{this, "setAdapter"};
-            Method<void(OnItemClickListener)> setOnItemClickListener{this, "setOnItemClickListener"};
+            java::Method<void(JListAdapter)> setAdapter{this, "setAdapter"};
+            java::Method<void(OnItemClickListener)> setOnItemClickListener{this, "setOnItemClickListener"};
         };
     }
 }
diff --git a/framework/ui/platforms/android/include/bdn/android/JCheckBox.h b/framework/ui/platforms/android/include/bdn/android/JCheckBox.h
index 6144df06..9ce0265a 100644
--- a/framework/ui/platforms/android/include/bdn/android/JCheckBox.h
+++ b/framework/ui/platforms/android/include/bdn/android/JCheckBox.h
@@ -16,7 +16,7 @@ namespace bdn
             using JBaseCompoundButton<kCheckBoxClassName>::JBaseCompoundButton;
 
           public:
-            Method<void(bool)> setChecked{this, "setChecked"};
+            java::Method<void(bool)> setChecked{this, "setChecked"};
         };
     }
 }
diff --git a/framework/ui/platforms/android/include/bdn/android/JCompoundButton.h b/framework/ui/platforms/android/include/bdn/android/JCompoundButton.h
index 0ac9c79f..81b4a48a 100644
--- a/framework/ui/platforms/android/include/bdn/android/JCompoundButton.h
+++ b/framework/ui/platforms/android/include/bdn/android/JCompoundButton.h
@@ -16,7 +16,7 @@ namespace bdn
             using JBaseTextView<javaClassName>::JBaseTextView;
 
           public:
-            Method<bool()> isChecked{this, "isChecked"};
+            java::Method<bool()> isChecked{this, "isChecked"};
         };
 
         using JCompountButton = JBaseCompoundButton<>;
diff --git a/framework/ui/platforms/android/include/bdn/android/JHorizontalScrollView.h b/framework/ui/platforms/android/include/bdn/android/JHorizontalScrollView.h
index c099dece..2c08c50c 100644
--- a/framework/ui/platforms/android/include/bdn/android/JHorizontalScrollView.h
+++ b/framework/ui/platforms/android/include/bdn/android/JHorizontalScrollView.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/android/JFrameLayout.h>
 #include <bdn/android/JContext.h>
+#include <bdn/android/JFrameLayout.h>
 #include <bdn/java/JString.h>
 
 namespace bdn
diff --git a/framework/ui/platforms/android/include/bdn/android/JInputMethodManager.h b/framework/ui/platforms/android/include/bdn/android/JInputMethodManager.h
index 6d7e08c7..bce1254e 100644
--- a/framework/ui/platforms/android/include/bdn/android/JInputMethodManager.h
+++ b/framework/ui/platforms/android/include/bdn/android/JInputMethodManager.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/java/JObject.h>
 #include <bdn/android/JIBinder.h>
+#include <bdn/java/JObject.h>
 
 namespace bdn
 {
diff --git a/framework/ui/platforms/android/include/bdn/android/JListAdapter.h b/framework/ui/platforms/android/include/bdn/android/JListAdapter.h
index 64d08e5d..142c8ac7 100644
--- a/framework/ui/platforms/android/include/bdn/android/JListAdapter.h
+++ b/framework/ui/platforms/android/include/bdn/android/JListAdapter.h
@@ -12,7 +12,7 @@ namespace bdn
         class JListAdapterBase : public java::JTObject<javaClassName, ConstructorArguments...>
         {
           public:
-            using JTObject<javaClassName, ConstructorArguments...>::JTObject;
+            using java::JTObject<javaClassName, ConstructorArguments...>::JTObject;
 
           public:
             java::Method<bool()> areAllItemsEnabled{this, "areAllItemsEnabled"};
diff --git a/framework/ui/platforms/android/include/bdn/android/JListView.h b/framework/ui/platforms/android/include/bdn/android/JListView.h
index 304951c6..1ba46066 100644
--- a/framework/ui/platforms/android/include/bdn/android/JListView.h
+++ b/framework/ui/platforms/android/include/bdn/android/JListView.h
@@ -15,9 +15,9 @@ namespace bdn
           public:
             using JBaseAdapterView<kListViewClassName>::JBaseAdapterView;
 
-            Method<void(int)> setDescendantFocusability{this, "setDescendantFocusability"};
-            Method<void(int)> setChoiceMode{this, "setChoiceMode"};
-            Method<void(bool)> setStackFromBottom{this, "setStackFromBottom"};
+            java::Method<void(int)> setDescendantFocusability{this, "setDescendantFocusability"};
+            java::Method<void(int)> setChoiceMode{this, "setChoiceMode"};
+            java::Method<void(bool)> setStackFromBottom{this, "setStackFromBottom"};
         };
     }
 }
diff --git a/framework/ui/platforms/android/include/bdn/android/JNativeAdapterViewOnItemClickListener.h b/framework/ui/platforms/android/include/bdn/android/JNativeAdapterViewOnItemClickListener.h
index 69bc87ba..cd931f37 100644
--- a/framework/ui/platforms/android/include/bdn/android/JNativeAdapterViewOnItemClickListener.h
+++ b/framework/ui/platforms/android/include/bdn/android/JNativeAdapterViewOnItemClickListener.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/java/JObject.h>
 #include <bdn/android/JTextView.h>
+#include <bdn/java/JObject.h>
 
 namespace bdn
 {
diff --git a/framework/ui/platforms/android/include/bdn/android/JNativeEditTextTextWatcher.h b/framework/ui/platforms/android/include/bdn/android/JNativeEditTextTextWatcher.h
index c41bfd75..4d4abba9 100644
--- a/framework/ui/platforms/android/include/bdn/android/JNativeEditTextTextWatcher.h
+++ b/framework/ui/platforms/android/include/bdn/android/JNativeEditTextTextWatcher.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <bdn/java/JObject.h>
 #include <bdn/android/JTextView.h>
 #include <bdn/android/JTextWatcher.h>
+#include <bdn/java/JObject.h>
 
 namespace bdn
 {
diff --git a/framework/ui/platforms/android/include/bdn/android/JNativeListAdapter.h b/framework/ui/platforms/android/include/bdn/android/JNativeListAdapter.h
index 3d97d84f..aab746b7 100644
--- a/framework/ui/platforms/android/include/bdn/android/JNativeListAdapter.h
+++ b/framework/ui/platforms/android/include/bdn/android/JNativeListAdapter.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <bdn/java/JObject.h>
-#include <bdn/android/JView.h>
 #include <bdn/android/JBaseAdapter.h>
+#include <bdn/android/JView.h>
+#include <bdn/java/JObject.h>
 
 namespace bdn
 {
diff --git a/framework/ui/platforms/android/include/bdn/android/JNativeRootView.h b/framework/ui/platforms/android/include/bdn/android/JNativeRootView.h
index 671bccc3..0e498f53 100644
--- a/framework/ui/platforms/android/include/bdn/android/JNativeRootView.h
+++ b/framework/ui/platforms/android/include/bdn/android/JNativeRootView.h
@@ -16,8 +16,8 @@ namespace bdn
             using JBaseNativeViewGroup<kNativeRootViewClassName>::JBaseNativeViewGroup;
 
           public:
-            Method<void(JCharSequence)> setTitle{this, "setTitle"};
-            Method<void(bool)> enableBackButton{this, "enableBackButton"};
+            java::Method<void(java::JCharSequence)> setTitle{this, "setTitle"};
+            java::Method<void(bool)> enableBackButton{this, "enableBackButton"};
         };
     }
 }
diff --git a/framework/ui/platforms/android/include/bdn/android/JNativeScrollView.h b/framework/ui/platforms/android/include/bdn/android/JNativeScrollView.h
index e4b4a6c7..3561a5c4 100644
--- a/framework/ui/platforms/android/include/bdn/android/JNativeScrollView.h
+++ b/framework/ui/platforms/android/include/bdn/android/JNativeScrollView.h
@@ -8,10 +8,10 @@ namespace bdn
     {
         constexpr const char kNativeScrollViewClassName[] = "io/boden/android/NativeScrollView";
 
-        class JNativeScrollView : public JTObject<kNativeScrollViewClassName, JContext>
+        class JNativeScrollView : public java::JTObject<kNativeScrollViewClassName, JContext>
         {
           public:
-            using JTObject<kNativeScrollViewClassName, JContext>::JTObject;
+            using java::JTObject<kNativeScrollViewClassName, JContext>::JTObject;
 
             /** Returns the outermost view object that wraps the whole scroll
              * view.
@@ -20,31 +20,31 @@ namespace bdn
              * getContentParent() to get the view that acts as the parent for
              * the content view.
              * */
-            Method<JView()> getWrapperView{this, "getWrapperView"};
+            java::Method<JView()> getWrapperView{this, "getWrapperView"};
 
             /** Returns the view group that is the parent of the scroll view's
              * content view. This NativeViewGroup acts as the glue between our
              * layout system and the scroll view's internal workings from
              * android.*/
-            Method<JNativeViewGroup()> getContentParent{this, "getContentParent"};
+            java::Method<JNativeViewGroup()> getContentParent{this, "getContentParent"};
 
             /** Scrolls to the specified scroll position (without animation)*/
-            Method<void(int, int)> scrollTo{this, "scrollTo"};
+            java::Method<void(int, int)> scrollTo{this, "scrollTo"};
 
             /** Scrolls to the specified scroll position with a smooth
              * animation*/
-            Method<void(int, int)> smoothScrollTo{this, "smoothScrollTo"};
+            java::Method<void(int, int)> smoothScrollTo{this, "smoothScrollTo"};
 
             /** Returns the X coordinate of the scroll position.*/
-            Method<int()> getScrollX{this, "getScrollX"};
+            java::Method<int()> getScrollX{this, "getScrollX"};
             /** Returns the Y coordinate of the scroll position.*/
-            Method<int()> getScrollY{this, "getScrollY"};
+            java::Method<int()> getScrollY{this, "getScrollY"};
 
             /** Returns the width of the scroll view.*/
-            Method<int()> getWidth{this, "getWidth"};
+            java::Method<int()> getWidth{this, "getWidth"};
 
             /** Returns the height of the scroll view.*/
-            Method<int()> getHeight{this, "getHeight"};
+            java::Method<int()> getHeight{this, "getHeight"};
         };
     }
 }
diff --git a/framework/ui/platforms/android/include/bdn/android/JNativeTextViewOnEditorActionListener.h b/framework/ui/platforms/android/include/bdn/android/JNativeTextViewOnEditorActionListener.h
index dc810539..fc94fedf 100644
--- a/framework/ui/platforms/android/include/bdn/android/JNativeTextViewOnEditorActionListener.h
+++ b/framework/ui/platforms/android/include/bdn/android/JNativeTextViewOnEditorActionListener.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/java/JObject.h>
 #include <bdn/android/JTextView.h>
+#include <bdn/java/JObject.h>
 
 namespace bdn
 {
diff --git a/framework/ui/platforms/android/include/bdn/android/JNativeViewCoreClickListener.h b/framework/ui/platforms/android/include/bdn/android/JNativeViewCoreClickListener.h
index ec284e9f..4caaba1a 100644
--- a/framework/ui/platforms/android/include/bdn/android/JNativeViewCoreClickListener.h
+++ b/framework/ui/platforms/android/include/bdn/android/JNativeViewCoreClickListener.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/java/JObject.h>
 #include <bdn/android/JView.h>
+#include <bdn/java/JObject.h>
 
 namespace bdn
 {
diff --git a/framework/ui/platforms/android/include/bdn/android/JNativeViewGroup.h b/framework/ui/platforms/android/include/bdn/android/JNativeViewGroup.h
index e7dfe6e9..66896f35 100644
--- a/framework/ui/platforms/android/include/bdn/android/JNativeViewGroup.h
+++ b/framework/ui/platforms/android/include/bdn/android/JNativeViewGroup.h
@@ -15,8 +15,8 @@ namespace bdn
             using JBaseViewGroup<javaClassName, ConstructorArguments...>::JBaseViewGroup;
 
           public:
-            Method<void(int, int)> setSize{this, "setSize"};
-            Method<void(JView, int, int, int, int)> setChildBounds{this, "setChildBounds"};
+            java::Method<void(int, int)> setSize{this, "setSize"};
+            java::Method<void(JView, int, int, int, int)> setChildBounds{this, "setChildBounds"};
         };
 
         using JNativeViewGroup = JBaseNativeViewGroup<>;
diff --git a/framework/ui/platforms/android/include/bdn/android/JNestedScrollView.h b/framework/ui/platforms/android/include/bdn/android/JNestedScrollView.h
index 3ae93e5e..5b2b0a56 100644
--- a/framework/ui/platforms/android/include/bdn/android/JNestedScrollView.h
+++ b/framework/ui/platforms/android/include/bdn/android/JNestedScrollView.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/android/JViewGroup.h>
 #include <bdn/android/JContext.h>
+#include <bdn/android/JViewGroup.h>
 #include <bdn/java/JString.h>
 
 namespace bdn
diff --git a/framework/ui/platforms/android/include/bdn/android/JScrollView.h b/framework/ui/platforms/android/include/bdn/android/JScrollView.h
index 7e9ce80b..b38d9a19 100644
--- a/framework/ui/platforms/android/include/bdn/android/JScrollView.h
+++ b/framework/ui/platforms/android/include/bdn/android/JScrollView.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/android/JFrameLayout.h>
 #include <bdn/android/JContext.h>
+#include <bdn/android/JFrameLayout.h>
 #include <bdn/java/JString.h>
 
 namespace bdn
diff --git a/framework/ui/platforms/android/include/bdn/android/JSwitch.h b/framework/ui/platforms/android/include/bdn/android/JSwitch.h
index b5334198..7ebd329c 100644
--- a/framework/ui/platforms/android/include/bdn/android/JSwitch.h
+++ b/framework/ui/platforms/android/include/bdn/android/JSwitch.h
@@ -15,7 +15,7 @@ namespace bdn
             using JBaseCompoundButton<kSwitchClassName>::JBaseCompoundButton;
 
           public:
-            Method<void(bool)> setChecked{this, "setChecked"};
+            java::Method<void(bool)> setChecked{this, "setChecked"};
         };
     }
 }
diff --git a/framework/ui/platforms/android/include/bdn/android/JTextView.h b/framework/ui/platforms/android/include/bdn/android/JTextView.h
index eabc7220..3b53cb01 100644
--- a/framework/ui/platforms/android/include/bdn/android/JTextView.h
+++ b/framework/ui/platforms/android/include/bdn/android/JTextView.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <bdn/android/JView.h>
 #include <bdn/android/JContext.h>
 #include <bdn/android/JTextPaint.h>
 #include <bdn/android/JTextWatcher.h>
+#include <bdn/android/JView.h>
 #include <bdn/java/JString.h>
 
 namespace bdn
@@ -45,30 +45,30 @@ namespace bdn
           public:
             using JBaseView<javaClassName, ConstructorArguments...>::JBaseView;
 
-            Method<JTextPaint()> getPaint{this, "getPaint"};
+            java::Method<JTextPaint()> getPaint{this, "getPaint"};
 
-            Method<void(JCharSequence)> setText{this, "setText"};
-            Method<JCharSequence()> getText{this, "getText"};
+            java::Method<void(java::JCharSequence)> setText{this, "setText"};
+            java::Method<java::JCharSequence()> getText{this, "getText"};
 
-            Method<void(bool)> setSingleLine{this, "setSingleLine"};
+            java::Method<void(bool)> setSingleLine{this, "setSingleLine"};
 
-            Method<void(int)> setBreakStrategy{this, "setBreakStrategy"};
+            java::Method<void(int)> setBreakStrategy{this, "setBreakStrategy"};
 
-            Method<void(bool)> setHorizontallyScrolling{this, "setHorizontallyScrolling"};
+            java::Method<void(bool)> setHorizontallyScrolling{this, "setHorizontallyScrolling"};
 
-            Method<void(int)> setMaxLines{this, "setMaxLines"};
+            java::Method<void(int)> setMaxLines{this, "setMaxLines"};
 
-            Method<void(int)> setWidth{this, "setWidth"};
-            Method<void(int)> setMaxWidth{this, "setMaxWidth"};
-            Method<void(int)> setMaxHeight{this, "setMaxHeight"};
+            java::Method<void(int)> setWidth{this, "setWidth"};
+            java::Method<void(int)> setMaxWidth{this, "setMaxWidth"};
+            java::Method<void(int)> setMaxHeight{this, "setMaxHeight"};
 
-            Method<float()> getTextSize{this, "getTextSize"};
-            Method<void(int)> setTextAppearance{this, "setTextAppearance"};
+            java::Method<float()> getTextSize{this, "getTextSize"};
+            java::Method<void(int)> setTextAppearance{this, "setTextAppearance"};
 
-            Method<void(JTextWatcher)> addTextChangedListener{this, "addTextChangedListener"};
-            Method<void(JTextWatcher)> removeTextChangedListener{this, "removeTextChangedListener"};
+            java::Method<void(JTextWatcher)> addTextChangedListener{this, "addTextChangedListener"};
+            java::Method<void(JTextWatcher)> removeTextChangedListener{this, "removeTextChangedListener"};
 
-            Method<void(OnEditorActionListener)> setOnEditorActionListener{this, "setOnEditorActionListener"};
+            java::Method<void(OnEditorActionListener)> setOnEditorActionListener{this, "setOnEditorActionListener"};
         };
 
         using JTextView = JBaseTextView<>;
diff --git a/framework/ui/platforms/android/include/bdn/android/JTextWatcher.h b/framework/ui/platforms/android/include/bdn/android/JTextWatcher.h
index 65298699..d521307a 100644
--- a/framework/ui/platforms/android/include/bdn/android/JTextWatcher.h
+++ b/framework/ui/platforms/android/include/bdn/android/JTextWatcher.h
@@ -12,7 +12,7 @@ namespace bdn
         class JBaseTextWatcher : public java::JTObject<javaClassName, ConstructorArguments...>
         {
           public:
-            using JTObject<javaClassName, ConstructorArguments...>::JTObject;
+            using java::JTObject<javaClassName, ConstructorArguments...>::JTObject;
         };
 
         using JTextWatcher = JBaseTextWatcher<>;
diff --git a/framework/ui/platforms/android/include/bdn/android/JView.h b/framework/ui/platforms/android/include/bdn/android/JView.h
index eb14b677..691396d8 100644
--- a/framework/ui/platforms/android/include/bdn/android/JView.h
+++ b/framework/ui/platforms/android/include/bdn/android/JView.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <bdn/java/JObject.h>
 #include <bdn/android/JContext.h>
 #include <bdn/android/JIBinder.h>
 #include <bdn/android/JViewParent.h>
+#include <bdn/java/JObject.h>
 
 #include <bdn/android/JViewGroup__JLayoutParams.h>
 
@@ -11,14 +11,12 @@ namespace bdn
 {
     namespace android
     {
-        using namespace java;
-
         constexpr const char kOnClickListenerClassName[] = "android/view/View$OnClickListener";
         template <const char *javaClassName = kOnClickListenerClassName, class... ConstructorArguments>
-        class OnClickListenerBase : public JTObject<javaClassName, ConstructorArguments...>
+        class OnClickListenerBase : public java::JTObject<javaClassName, ConstructorArguments...>
         {
           public:
-            using JTObject<javaClassName, ConstructorArguments...>::JTObject;
+            using java::JTObject<javaClassName, ConstructorArguments...>::JTObject;
 
             template <class Other> OnClickListenerBase(Other &other) : OnClickListenerBase(other.getRef_()) {}
         };
@@ -26,18 +24,18 @@ namespace bdn
         using OnClickListener = OnClickListenerBase<>;
 
         constexpr const char kOnScrollChangeListenerClassName[] = "android/view/View$OnScrollChangeListener";
-        using OnScrollChangeListener = JTObject<kOnScrollChangeListenerClassName>;
+        using OnScrollChangeListener = java::JTObject<kOnScrollChangeListenerClassName>;
 
         constexpr const char kOnLayoutChangeListenerClassName[] = "android/view/View$OnLayoutChangeListener";
-        using OnLayoutChangeListener = JTObject<kOnLayoutChangeListenerClassName>;
+        using OnLayoutChangeListener = java::JTObject<kOnLayoutChangeListenerClassName>;
 
         constexpr const char kViewClassName[] = "android/view/View";
 
         template <const char *javaClassName = kViewClassName, class... ConstructorArguments>
-        class JBaseView : public JTObject<javaClassName, JContext, ConstructorArguments...>
+        class JBaseView : public java::JTObject<javaClassName, JContext, ConstructorArguments...>
         {
           public:
-            using JTObject<javaClassName, JContext, ConstructorArguments...>::JTObject;
+            using java::JTObject<javaClassName, JContext, ConstructorArguments...>::JTObject;
 
           public:
             enum Visibility
@@ -90,51 +88,51 @@ namespace bdn
             };
 
           public:
-            Method<void(int)> setSystemUiVisibility{this, "setSystemUiVisibility"};
-            Method<int()> getSystemUiVisibility{this, "getSystemUiVisibility"};
+            java::Method<void(int)> setSystemUiVisibility{this, "setSystemUiVisibility"};
+            java::Method<int()> getSystemUiVisibility{this, "getSystemUiVisibility"};
 
-            Method<void(int)> setVisibility{this, "setVisibility"};
-            Method<int()> getVisibility{this, "getVisibility"};
+            java::Method<void(int)> setVisibility{this, "setVisibility"};
+            java::Method<int()> getVisibility{this, "getVisibility"};
 
-            Method<int()> getLeft{this, "getLeft"};
-            Method<int()> getTop{this, "getTop"};
-            Method<int()> getWidth{this, "getWidth"};
-            Method<int()> getHeight{this, "getHeight"};
+            java::Method<int()> getLeft{this, "getLeft"};
+            java::Method<int()> getTop{this, "getTop"};
+            java::Method<int()> getWidth{this, "getWidth"};
+            java::Method<int()> getHeight{this, "getHeight"};
 
-            Method<void(int, int, int, int)> setPadding{this, "setPadding"};
+            java::Method<void(int, int, int, int)> setPadding{this, "setPadding"};
 
-            Method<int()> getPaddingLeft{this, "getPaddingLeft"};
-            Method<int()> getPaddingTop{this, "getPaddingTop"};
-            Method<int()> getPaddingRight{this, "getPaddingRight"};
-            Method<int()> getPaddingBottom{this, "getPaddingBottom"};
+            java::Method<int()> getPaddingLeft{this, "getPaddingLeft"};
+            java::Method<int()> getPaddingTop{this, "getPaddingTop"};
+            java::Method<int()> getPaddingRight{this, "getPaddingRight"};
+            java::Method<int()> getPaddingBottom{this, "getPaddingBottom"};
 
-            Method<JViewParent()> getParent{this, "getParent"};
-            Method<JContext()> getContext{this, "getContext"};
+            java::Method<JViewParent()> getParent{this, "getParent"};
+            java::Method<JContext()> getContext{this, "getContext"};
 
-            Method<void(JObject)> setTag{this, "setTag"};
-            Method<JObject()> getTag{this, "getTag"};
+            java::Method<void(java::JObject)> setTag{this, "setTag"};
+            java::Method<java::JObject()> getTag{this, "getTag"};
 
-            Method<void(int, int)> measure{this, "measure"};
+            java::Method<void(int, int)> measure{this, "measure"};
 
-            Method<int()> getMeasuredWidth{this, "getMeasuredWidth"};
-            Method<int()> getMeasuredHeight{this, "getMeasuredHeight"};
+            java::Method<int()> getMeasuredWidth{this, "getMeasuredWidth"};
+            java::Method<int()> getMeasuredHeight{this, "getMeasuredHeight"};
 
-            Method<void()> requestLayout{this, "requestLayout"};
-            Method<void()> invalidate{this, "invalidate"};
+            java::Method<void()> requestLayout{this, "requestLayout"};
+            java::Method<void()> invalidate{this, "invalidate"};
 
-            Method<int()> getSuggestedMinimumWidth{this, "getSuggestedMinimumWidth"};
-            Method<int()> getSuggestedMinimumHeight{this, "getSuggestedMinimumHeight"};
+            java::Method<int()> getSuggestedMinimumWidth{this, "getSuggestedMinimumWidth"};
+            java::Method<int()> getSuggestedMinimumHeight{this, "getSuggestedMinimumHeight"};
 
-            Method<int()> getScrollX{this, "getScrollX"};
-            Method<int()> getScrollY{this, "getScrollY"};
+            java::Method<int()> getScrollX{this, "getScrollX"};
+            java::Method<int()> getScrollY{this, "getScrollY"};
 
-            Method<void(OnClickListener)> setOnClickListener{this, "setOnClickListener"};
-            Method<void(OnScrollChangeListener)> setOnScrollChangeListener{this, "setOnScrollChangeListener"};
-            Method<void(OnLayoutChangeListener)> addOnLayoutChangeListener{this, "addOnLayoutChangeListener"};
+            java::Method<void(OnClickListener)> setOnClickListener{this, "setOnClickListener"};
+            java::Method<void(OnScrollChangeListener)> setOnScrollChangeListener{this, "setOnScrollChangeListener"};
+            java::Method<void(OnLayoutChangeListener)> addOnLayoutChangeListener{this, "addOnLayoutChangeListener"};
 
-            Method<void(JViewGroup__JLayoutParams)> setLayoutParams{this, "setLayoutParams"};
+            java::Method<void(JViewGroup__JLayoutParams)> setLayoutParams{this, "setLayoutParams"};
 
-            Method<JIBinder()> getWindowToken{this, "getWindowToken"};
+            java::Method<JIBinder()> getWindowToken{this, "getWindowToken"};
         };
 
         using JView = JBaseView<>;
diff --git a/framework/ui/platforms/android/include/bdn/android/JViewGroup.h b/framework/ui/platforms/android/include/bdn/android/JViewGroup.h
index a116a47f..4d3b6ccb 100644
--- a/framework/ui/platforms/android/include/bdn/android/JViewGroup.h
+++ b/framework/ui/platforms/android/include/bdn/android/JViewGroup.h
@@ -17,12 +17,12 @@ namespace bdn
           public:
             using JBaseView<javaClassName, ConstructorArguments...>::JBaseView;
 
-            Method<void(JView)> addView{this, "addView"};
-            Method<void(JView)> removeView{this, "removeView"};
-            Method<void()> removeAllViews{this, "removeAllViews"};
+            java::Method<void(JView)> addView{this, "addView"};
+            java::Method<void(JView)> removeView{this, "removeView"};
+            java::Method<void()> removeAllViews{this, "removeAllViews"};
 
-            Method<int()> getChildCount{this, "getChildCount"};
-            Method<JView(int)> getChildAt{this, "getChildAt"};
+            java::Method<int()> getChildCount{this, "getChildCount"};
+            java::Method<JView(int)> getChildAt{this, "getChildAt"};
 
           public:
             using JLayoutParams = JViewGroup__JLayoutParams;
diff --git a/framework/ui/platforms/android/include/bdn/android/JWindow.h b/framework/ui/platforms/android/include/bdn/android/JWindow.h
index 9239d123..a2f87b39 100644
--- a/framework/ui/platforms/android/include/bdn/android/JWindow.h
+++ b/framework/ui/platforms/android/include/bdn/android/JWindow.h
@@ -8,7 +8,7 @@ namespace bdn
     {
         constexpr const char kWindowClassName[] = "android/view/Window";
 
-        class JWindow : public JTObject<kWindowClassName>
+        class JWindow : public java::JTObject<kWindowClassName>
         {
           public:
             using JTObject<kWindowClassName>::JTObject;
diff --git a/framework/ui/platforms/android/include/bdn/android/ListViewCore.h b/framework/ui/platforms/android/include/bdn/android/ListViewCore.h
index 9ca3c97e..f9ed305e 100644
--- a/framework/ui/platforms/android/include/bdn/android/ListViewCore.h
+++ b/framework/ui/platforms/android/include/bdn/android/ListViewCore.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <bdn/android/ViewCore.h>
-#include <bdn/android/JListView.h>
 #include <bdn/ListView.h>
 #include <bdn/ListViewCore.h>
+#include <bdn/android/JListView.h>
+#include <bdn/android/ViewCore.h>
 
 #include <bdn/android/JNativeListAdapter.h>
 
diff --git a/framework/ui/platforms/android/include/bdn/android/ScrollViewCore.h b/framework/ui/platforms/android/include/bdn/android/ScrollViewCore.h
index 941a4d9d..93551496 100644
--- a/framework/ui/platforms/android/include/bdn/android/ScrollViewCore.h
+++ b/framework/ui/platforms/android/include/bdn/android/ScrollViewCore.h
@@ -1,14 +1,13 @@
 #pragma once
 
-#include <bdn/ScrollView.h>
 #include <bdn/IScrollViewCore.h>
+#include <bdn/ScrollView.h>
 #include <bdn/ScrollViewLayoutHelper.h>
-#include <bdn/java/NativeWeakPointer.h>
-#include <bdn/android/ViewCore.h>
-#include <bdn/android/JNativeScrollView.h>
 #include <bdn/android/IParentViewCore.h>
-#include <bdn/android/JViewGroup.h>
 #include <bdn/android/JNativeScrollView.h>
+#include <bdn/android/JViewGroup.h>
+#include <bdn/android/ViewCore.h>
+#include <bdn/java/NativeWeakPointer.h>
 
 namespace bdn
 {
diff --git a/framework/ui/platforms/android/include/bdn/android/SwitchCore.h b/framework/ui/platforms/android/include/bdn/android/SwitchCore.h
index efdbb291..98a5a579 100644
--- a/framework/ui/platforms/android/include/bdn/android/SwitchCore.h
+++ b/framework/ui/platforms/android/include/bdn/android/SwitchCore.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <bdn/android/ViewCore.h>
-#include <bdn/android/JSwitch.h>
-#include <bdn/SwitchCore.h>
 #include <bdn/Switch.h>
+#include <bdn/SwitchCore.h>
 #include <bdn/android/JNativeViewCoreClickListener.h>
+#include <bdn/android/JSwitch.h>
+#include <bdn/android/ViewCore.h>
 
 namespace bdn
 {
diff --git a/framework/ui/platforms/android/include/bdn/android/TextFieldCore.h b/framework/ui/platforms/android/include/bdn/android/TextFieldCore.h
index cc496b47..e7ad8dec 100644
--- a/framework/ui/platforms/android/include/bdn/android/TextFieldCore.h
+++ b/framework/ui/platforms/android/include/bdn/android/TextFieldCore.h
@@ -1,14 +1,14 @@
 #pragma once
 
 #include <bdn/android/JEditText.h>
-#include <bdn/android/JKeyEvent.h>
 #include <bdn/android/JInputMethodManager.h>
+#include <bdn/android/JKeyEvent.h>
 #include <bdn/android/JNativeEditTextTextWatcher.h>
 #include <bdn/android/JNativeTextViewOnEditorActionListener.h>
 
-#include <bdn/android/ViewCore.h>
 #include <bdn/ITextFieldCore.h>
 #include <bdn/TextField.h>
+#include <bdn/android/ViewCore.h>
 #include <bdn/debug.h>
 
 namespace bdn
diff --git a/framework/ui/platforms/android/include/bdn/android/TextViewCore.h b/framework/ui/platforms/android/include/bdn/android/TextViewCore.h
index 2108079a..8e36f714 100644
--- a/framework/ui/platforms/android/include/bdn/android/TextViewCore.h
+++ b/framework/ui/platforms/android/include/bdn/android/TextViewCore.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <bdn/android/ViewCore.h>
-#include <bdn/android/JTextView.h>
-#include <bdn/android/JRStyle.h>
 #include <bdn/ITextViewCore.h>
 #include <bdn/TextView.h>
+#include <bdn/android/JRStyle.h>
+#include <bdn/android/JTextView.h>
+#include <bdn/android/ViewCore.h>
 
 namespace bdn
 {
diff --git a/framework/ui/platforms/android/include/bdn/android/UIProvider.h b/framework/ui/platforms/android/include/bdn/android/UIProvider.h
index 64f8f2a8..db3a1367 100644
--- a/framework/ui/platforms/android/include/bdn/android/UIProvider.h
+++ b/framework/ui/platforms/android/include/bdn/android/UIProvider.h
@@ -9,11 +9,11 @@ namespace bdn
     }
 }
 
-#include <bdn/UIProvider.h>
 #include <bdn/LayoutCoordinator.h>
+#include <bdn/UIProvider.h>
 
-#include <bdn/android/ViewCore.h>
 #include <bdn/android/JTextView.h>
+#include <bdn/android/ViewCore.h>
 
 #include <cmath>
 
diff --git a/framework/ui/platforms/android/include/bdn/android/ViewCore.h b/framework/ui/platforms/android/include/bdn/android/ViewCore.h
index 45a26eba..a77337cb 100644
--- a/framework/ui/platforms/android/include/bdn/android/ViewCore.h
+++ b/framework/ui/platforms/android/include/bdn/android/ViewCore.h
@@ -9,16 +9,16 @@ namespace bdn
     }
 }
 
-#include <bdn/IViewCore.h>
 #include <bdn/Dip.h>
+#include <bdn/IViewCore.h>
 #include <bdn/LayoutCoordinator.h>
 
 #include <bdn/java/NativeWeakPointer.h>
 
-#include <bdn/android/JView.h>
+#include <bdn/android/IParentViewCore.h>
 #include <bdn/android/JNativeViewGroup.h>
+#include <bdn/android/JView.h>
 #include <bdn/android/UIProvider.h>
-#include <bdn/android/IParentViewCore.h>
 
 #include <bdn/log.h>
 
diff --git a/framework/ui/platforms/android/include/bdn/android/WindowCore.h b/framework/ui/platforms/android/include/bdn/android/WindowCore.h
index ecfd8ffc..f3ad05f4 100644
--- a/framework/ui/platforms/android/include/bdn/android/WindowCore.h
+++ b/framework/ui/platforms/android/include/bdn/android/WindowCore.h
@@ -5,15 +5,15 @@
 
 #include <bdn/windowCoreUtil.h>
 
-#include <bdn/java/WeakReference.h>
-#include <bdn/android/ViewCore.h>
-#include <bdn/android/JNativeRootView.h>
-#include <bdn/android/JConfiguration.h>
 #include <bdn/android/IParentViewCore.h>
 #include <bdn/android/JActivity.h>
+#include <bdn/android/JConfiguration.h>
+#include <bdn/android/JNativeRootView.h>
+#include <bdn/android/ViewCore.h>
+#include <bdn/java/WeakReference.h>
 
-#include <bdn/log.h>
 #include "JWindow.h"
+#include <bdn/log.h>
 
 namespace bdn
 {
@@ -61,15 +61,15 @@ namespace bdn
 
             void center() override;
 
-            static void _rootViewCreated(const bdn::java::Reference &javaRef);
+            static void _rootViewCreated(const java::Reference &javaRef);
 
-            static void _rootViewDisposed(const bdn::java::Reference &javaRef);
+            static void _rootViewDisposed(const java::Reference &javaRef);
 
-            static void _rootViewSizeChanged(const bdn::java::Reference &javaRef, int width, int height);
+            static void _rootViewSizeChanged(const java::Reference &javaRef, int width, int height);
 
-            static void _rootViewConfigurationChanged(const bdn::java::Reference &javaRef, JConfiguration config);
+            static void _rootViewConfigurationChanged(const java::Reference &javaRef, JConfiguration config);
 
-            static bool _handleBackPressed(const bdn::java::Reference &javaRef);
+            static bool _handleBackPressed(const java::Reference &javaRef);
 
             double getUIScaleFactor() const override { return ViewCore::getUIScaleFactor(); }
 
@@ -107,7 +107,7 @@ namespace bdn
              *  */
             virtual void rootViewConfigurationChanged(JConfiguration config);
 
-            virtual void attachedToNewRootView(const bdn::java::Reference &javaRef);
+            virtual void attachedToNewRootView(const java::Reference &javaRef);
 
             virtual bool handleBackPressed();
 
@@ -116,7 +116,7 @@ namespace bdn
 
             void updateUIScaleFactor(JConfiguration config);
 
-            static void getWindowCoreListFromRootView(const bdn::java::Reference &javaRootViewRef,
+            static void getWindowCoreListFromRootView(const java::Reference &javaRootViewRef,
                                                       std::list<std::shared_ptr<WindowCore>> &windowCoreList);
 
             /** Returns an accessible reference to the window's root view.
@@ -129,9 +129,9 @@ namespace bdn
             class RootViewRegistry : public Base
             {
               public:
-                void add(const bdn::java::WeakReference &javaRef) { _rootViewList.push_back(javaRef); }
+                void add(const java::WeakReference &javaRef) { _rootViewList.push_back(javaRef); }
 
-                void remove(const bdn::java::Reference &javaRef)
+                void remove(const java::Reference &javaRef)
                 {
                     auto it = std::find(_rootViewList.begin(), _rootViewList.end(), javaRef);
                     if (it != _rootViewList.end())
@@ -149,12 +149,12 @@ namespace bdn
                  *  Returns a null reference if not valid root view is found.
                  *
                  * */
-                bdn::java::Reference getNewestValidRootView()
+                java::Reference getNewestValidRootView()
                 {
                     // So we can simply return the first root view from the
                     // list.
                     while (!_rootViewList.empty()) {
-                        bdn::java::Reference javaRef = _rootViewList.back().toStrong();
+                        java::Reference javaRef = _rootViewList.back().toStrong();
 
                         if (!javaRef.isNull())
                             return javaRef;
@@ -164,11 +164,11 @@ namespace bdn
                         _rootViewList.pop_back();
                     }
 
-                    return bdn::java::Reference();
+                    return java::Reference();
                 }
 
               private:
-                std::list<bdn::java::WeakReference> _rootViewList;
+                std::list<java::WeakReference> _rootViewList;
             };
 
           public:
@@ -182,7 +182,7 @@ namespace bdn
 
           private:
             mutable std::recursive_mutex _rootViewMutex;
-            bdn::java::WeakReference _weakRootViewRef;
+            java::WeakReference _weakRootViewRef;
 
             Rect _currentBounds;
 
diff --git a/framework/ui/platforms/android/src/AppRunner.cpp b/framework/ui/platforms/android/src/AppRunner.cpp
index b6e11a02..41bd3c2d 100644
--- a/framework/ui/platforms/android/src/AppRunner.cpp
+++ b/framework/ui/platforms/android/src/AppRunner.cpp
@@ -1,6 +1,6 @@
 #include <bdn/android/AppRunner.h>
-#include <bdn/android/JNativeRootView.h>
 #include <bdn/android/JIntent.h>
+#include <bdn/android/JNativeRootView.h>
 #include <bdn/android/JUri.h>
 #include <bdn/android/WindowCore.h>
 
diff --git a/framework/ui/platforms/android/src/JNativeAdapterViewOnItemClickListener.cpp b/framework/ui/platforms/android/src/JNativeAdapterViewOnItemClickListener.cpp
index 4aab254b..bf8017c6 100644
--- a/framework/ui/platforms/android/src/JNativeAdapterViewOnItemClickListener.cpp
+++ b/framework/ui/platforms/android/src/JNativeAdapterViewOnItemClickListener.cpp
@@ -1,10 +1,10 @@
 #include <bdn/android/JNativeAdapterViewOnItemClickListener.h>
 
-#include <bdn/java/Env.h>
 #include <bdn/entry.h>
+#include <bdn/java/Env.h>
 
-#include <bdn/android/ViewCore.h>
 #include <bdn/ListView.h>
+#include <bdn/android/ViewCore.h>
 
 extern "C" JNIEXPORT void JNICALL Java_io_boden_android_NativeAdapterViewOnItemClickListener_nativeOnItemClick(
     JNIEnv *env, jobject rawSelf, jobject rawAdapterView, jobject rawView, int position, long id)
diff --git a/framework/ui/platforms/android/src/JNativeEditTextTextWatcher.cpp b/framework/ui/platforms/android/src/JNativeEditTextTextWatcher.cpp
index 692db788..013b4ccf 100644
--- a/framework/ui/platforms/android/src/JNativeEditTextTextWatcher.cpp
+++ b/framework/ui/platforms/android/src/JNativeEditTextTextWatcher.cpp
@@ -1,8 +1,8 @@
 
 #include <bdn/android/JNativeEditTextTextWatcher.h>
 
-#include <bdn/java/Env.h>
 #include <bdn/entry.h>
+#include <bdn/java/Env.h>
 
 #include <bdn/android/TextFieldCore.h>
 
diff --git a/framework/ui/platforms/android/src/JNativeListAdapter.cpp b/framework/ui/platforms/android/src/JNativeListAdapter.cpp
index 76de8358..d334263c 100644
--- a/framework/ui/platforms/android/src/JNativeListAdapter.cpp
+++ b/framework/ui/platforms/android/src/JNativeListAdapter.cpp
@@ -2,8 +2,8 @@
 #include <bdn/android/JNativeListAdapter.h>
 #include <bdn/android/ListViewCore.h>
 
-#include <bdn/java/Env.h>
 #include <bdn/entry.h>
+#include <bdn/java/Env.h>
 
 extern "C" JNIEXPORT jint JNICALL Java_io_boden_android_NativeListAdapter_nativeGetCount(JNIEnv *env, jobject rawSelf,
                                                                                          jobject rawView)
diff --git a/framework/ui/platforms/android/src/JNativeRootView.cpp b/framework/ui/platforms/android/src/JNativeRootView.cpp
index bae9b734..e5b5853a 100644
--- a/framework/ui/platforms/android/src/JNativeRootView.cpp
+++ b/framework/ui/platforms/android/src/JNativeRootView.cpp
@@ -1,11 +1,11 @@
 
 #include <bdn/android/JNativeRootView.h>
 
-#include <bdn/java/Env.h>
 #include <bdn/entry.h>
+#include <bdn/java/Env.h>
 
-#include <bdn/android/WindowCore.h>
 #include <bdn/android/JContext.h>
+#include <bdn/android/WindowCore.h>
 
 extern "C" JNIEXPORT void JNICALL Java_io_boden_android_NativeRootView_created(JNIEnv *env, jobject rawSelf)
 {
diff --git a/framework/ui/platforms/android/src/JNativeScrollView.cpp b/framework/ui/platforms/android/src/JNativeScrollView.cpp
index 5a391c50..77527150 100644
--- a/framework/ui/platforms/android/src/JNativeScrollView.cpp
+++ b/framework/ui/platforms/android/src/JNativeScrollView.cpp
@@ -1,11 +1,11 @@
 
 #include <bdn/android/JNativeScrollView.h>
 
-#include <bdn/java/Env.h>
 #include <bdn/entry.h>
+#include <bdn/java/Env.h>
 
-#include <bdn/android/ViewCore.h>
 #include <bdn/android/ScrollViewCore.h>
+#include <bdn/android/ViewCore.h>
 
 extern "C" JNIEXPORT void JNICALL Java_io_boden_android_NativeScrollView_scrollChange(JNIEnv *env, jobject rawCls,
                                                                                       jobject rawWraperView,
diff --git a/framework/ui/platforms/android/src/JNativeTextViewOnEditorActionListener.cpp b/framework/ui/platforms/android/src/JNativeTextViewOnEditorActionListener.cpp
index df5d4741..e35ed1c9 100644
--- a/framework/ui/platforms/android/src/JNativeTextViewOnEditorActionListener.cpp
+++ b/framework/ui/platforms/android/src/JNativeTextViewOnEditorActionListener.cpp
@@ -1,9 +1,9 @@
 
-#include <bdn/android/JNativeTextViewOnEditorActionListener.h>
 #include <bdn/android/JKeyEvent.h>
+#include <bdn/android/JNativeTextViewOnEditorActionListener.h>
 
-#include <bdn/java/Env.h>
 #include <bdn/entry.h>
+#include <bdn/java/Env.h>
 
 #include <bdn/android/TextFieldCore.h>
 
diff --git a/framework/ui/platforms/android/src/JNativeViewCoreClickListener.cpp b/framework/ui/platforms/android/src/JNativeViewCoreClickListener.cpp
index a1f848ee..fdbe1546 100644
--- a/framework/ui/platforms/android/src/JNativeViewCoreClickListener.cpp
+++ b/framework/ui/platforms/android/src/JNativeViewCoreClickListener.cpp
@@ -1,8 +1,8 @@
 
 #include <bdn/android/JNativeViewCoreClickListener.h>
 
-#include <bdn/java/Env.h>
 #include <bdn/entry.h>
+#include <bdn/java/Env.h>
 
 #include <bdn/android/ViewCore.h>
 
diff --git a/framework/ui/platforms/android/src/ListViewCore.cpp b/framework/ui/platforms/android/src/ListViewCore.cpp
index 9387c6fe..33b56c39 100644
--- a/framework/ui/platforms/android/src/ListViewCore.cpp
+++ b/framework/ui/platforms/android/src/ListViewCore.cpp
@@ -1,6 +1,6 @@
-#include <bdn/android/ListViewCore.h>
-#include <bdn/android/JNativeListAdapter.h>
 #include <bdn/android/JNativeAdapterViewOnItemClickListener.h>
+#include <bdn/android/JNativeListAdapter.h>
+#include <bdn/android/ListViewCore.h>
 
 namespace bdn
 {
diff --git a/framework/ui/platforms/android/src/StackCore.cpp b/framework/ui/platforms/android/src/StackCore.cpp
index be2956a2..3f0ade73 100644
--- a/framework/ui/platforms/android/src/StackCore.cpp
+++ b/framework/ui/platforms/android/src/StackCore.cpp
@@ -1,6 +1,6 @@
-#include <bdn/android/StackCore.h>
-#include <bdn/android/JNativeViewGroup.h>
 #include <bdn/Stack.h>
+#include <bdn/android/JNativeViewGroup.h>
+#include <bdn/android/StackCore.h>
 
 namespace bdn
 {
diff --git a/framework/ui/platforms/android/src/UIProvider.cpp b/framework/ui/platforms/android/src/UIProvider.cpp
index 74d0f535..1b1d5d64 100644
--- a/framework/ui/platforms/android/src/UIProvider.cpp
+++ b/framework/ui/platforms/android/src/UIProvider.cpp
@@ -1,16 +1,16 @@
 
 #include <bdn/android/UIProvider.h>
 
-#include <bdn/android/ContainerViewCore.h>
 #include <bdn/android/ButtonCore.h>
-#include <bdn/android/SwitchCore.h>
 #include <bdn/android/CheckboxCore.h>
-#include <bdn/android/TextViewCore.h>
-#include <bdn/android/TextFieldCore.h>
-#include <bdn/android/WindowCore.h>
+#include <bdn/android/ContainerViewCore.h>
 #include <bdn/android/ListViewCore.h>
 #include <bdn/android/ScrollViewCore.h>
 #include <bdn/android/StackCore.h>
+#include <bdn/android/SwitchCore.h>
+#include <bdn/android/TextFieldCore.h>
+#include <bdn/android/TextViewCore.h>
+#include <bdn/android/WindowCore.h>
 
 #include <bdn/ViewCoreTypeNotSupportedError.h>
 
diff --git a/framework/ui/platforms/android/src/WindowCore.cpp b/framework/ui/platforms/android/src/WindowCore.cpp
index ea1661d2..9c169dd3 100644
--- a/framework/ui/platforms/android/src/WindowCore.cpp
+++ b/framework/ui/platforms/android/src/WindowCore.cpp
@@ -1,6 +1,6 @@
 
-#include <bdn/android/WindowCore.h>
 #include "../include/bdn/android/JNativeRootView.h"
+#include <bdn/android/WindowCore.h>
 
 namespace bdn
 {
@@ -161,14 +161,14 @@ namespace bdn
             // we cannot change our position. So, do nothing.
         }
 
-        void WindowCore::_rootViewCreated(const Reference &javaRef)
+        void WindowCore::_rootViewCreated(const java::Reference &javaRef)
         {
             // we store only a weak referene in the registry. We do not want
             // to keep the java-side root view object alive.
             getRootViewRegistryForCurrentThread().add(bdn::java::WeakReference(javaRef));
         }
 
-        void WindowCore::_rootViewDisposed(const Reference &javaRef)
+        void WindowCore::_rootViewDisposed(const java::Reference &javaRef)
         {
             // this may be called by the garbage collector, so it might be
             // in an arbitrary thread. That means that the root view
@@ -186,7 +186,7 @@ namespace bdn
                 windowCore->rootViewDisposed();
         }
 
-        void WindowCore::_rootViewSizeChanged(const Reference &javaRef, int width, int height)
+        void WindowCore::_rootViewSizeChanged(const java::Reference &javaRef, int width, int height)
         {
             std::list<std::shared_ptr<WindowCore>> windowCoreList;
 
@@ -196,7 +196,7 @@ namespace bdn
                 windowCore->rootViewSizeChanged(width, height);
         }
 
-        void WindowCore::_rootViewConfigurationChanged(const Reference &javaRef, JConfiguration config)
+        void WindowCore::_rootViewConfigurationChanged(const java::Reference &javaRef, JConfiguration config)
         {
             std::list<std::shared_ptr<WindowCore>> windowCoreList;
 
@@ -206,9 +206,8 @@ namespace bdn
                 windowCore->rootViewConfigurationChanged(config);
         }
 
-        bool WindowCore::_handleBackPressed(const Reference &javaRef)
+        bool WindowCore::_handleBackPressed(const java::Reference &javaRef)
         {
-
             std::list<std::shared_ptr<WindowCore>> windowCoreList;
 
             getWindowCoreListFromRootView(javaRef, windowCoreList);
@@ -280,7 +279,7 @@ namespace bdn
 
         void WindowCore::rootViewConfigurationChanged(JConfiguration config) { updateUIScaleFactor(config); }
 
-        void WindowCore::attachedToNewRootView(const Reference &javaRef)
+        void WindowCore::attachedToNewRootView(const java::Reference &javaRef)
         {
             // set the window's bounds to fill the root view completely.
             JNativeRootView rootView(javaRef);
@@ -332,7 +331,7 @@ namespace bdn
             setUIScaleFactor(scaleFactor);
         }
 
-        void WindowCore::getWindowCoreListFromRootView(const Reference &javaRootViewRef,
+        void WindowCore::getWindowCoreListFromRootView(const java::Reference &javaRootViewRef,
                                                        std::list<std::shared_ptr<WindowCore>> &windowCoreList)
         {
             JNativeRootView rootView(javaRootViewRef);
@@ -350,9 +349,9 @@ namespace bdn
             }
         }
 
-        Reference WindowCore::tryGetAccessibleRootViewRef() const
+        java::Reference WindowCore::tryGetAccessibleRootViewRef() const
         {
-            bdn::java::Reference accessibleRef;
+            java::Reference accessibleRef;
 
             {
                 std::unique_lock lock(_rootViewMutex);
diff --git a/framework/ui/platforms/ios/include/bdn/ios/ButtonCore.hh b/framework/ui/platforms/ios/include/bdn/ios/ButtonCore.hh
index 4f275d30..5bfc2c0c 100644
--- a/framework/ui/platforms/ios/include/bdn/ios/ButtonCore.hh
+++ b/framework/ui/platforms/ios/include/bdn/ios/ButtonCore.hh
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <bdn/IButtonCore.h>
-#include <bdn/ClickEvent.h>
 #include <bdn/Button.h>
+#include <bdn/ClickEvent.h>
+#include <bdn/IButtonCore.h>
 
 #import <bdn/ios/ViewCore.hh>
 
diff --git a/framework/ui/platforms/ios/include/bdn/ios/CheckboxCore.hh b/framework/ui/platforms/ios/include/bdn/ios/CheckboxCore.hh
index b30a2a4e..3b277aa0 100644
--- a/framework/ui/platforms/ios/include/bdn/ios/CheckboxCore.hh
+++ b/framework/ui/platforms/ios/include/bdn/ios/CheckboxCore.hh
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <bdn/CheckboxCore.h>
 #include <bdn/Checkbox.h>
+#include <bdn/CheckboxCore.h>
 #include <bdn/ClickEvent.h>
 
-#import <bdn/ios/ViewCore.hh>
 #import <bdn/ios/IosCheckbox.hh>
+#import <bdn/ios/ViewCore.hh>
 
 @interface BdnIosCheckboxComposite : UIControl
 
diff --git a/framework/ui/platforms/ios/include/bdn/ios/ListViewCore.hh b/framework/ui/platforms/ios/include/bdn/ios/ListViewCore.hh
index 58c277c4..3340a9ad 100644
--- a/framework/ui/platforms/ios/include/bdn/ios/ListViewCore.hh
+++ b/framework/ui/platforms/ios/include/bdn/ios/ListViewCore.hh
@@ -1,8 +1,8 @@
 #pragma once
 
-#import <bdn/ios/ViewCore.hh>
-#include <bdn/ListViewCore.h>
 #include <bdn/ListView.h>
+#include <bdn/ListViewCore.h>
+#import <bdn/ios/ViewCore.hh>
 
 @class ListViewDelegateIOS;
 
diff --git a/framework/ui/platforms/ios/include/bdn/ios/ScrollViewCore.hh b/framework/ui/platforms/ios/include/bdn/ios/ScrollViewCore.hh
index c1827bf4..a998505d 100644
--- a/framework/ui/platforms/ios/include/bdn/ios/ScrollViewCore.hh
+++ b/framework/ui/platforms/ios/include/bdn/ios/ScrollViewCore.hh
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/ScrollView.h>
 #include <bdn/IScrollViewCore.h>
+#include <bdn/ScrollView.h>
 
 #include <bdn/ScrollViewLayoutHelper.h>
 
diff --git a/framework/ui/platforms/ios/include/bdn/ios/StackCore.hh b/framework/ui/platforms/ios/include/bdn/ios/StackCore.hh
index 412811cb..fad8bf7e 100644
--- a/framework/ui/platforms/ios/include/bdn/ios/StackCore.hh
+++ b/framework/ui/platforms/ios/include/bdn/ios/StackCore.hh
@@ -1,8 +1,8 @@
 #pragma once
 
-#import <bdn/ios/ViewCore.hh>
-#include <bdn/StackCore.h>
 #include <bdn/Stack.h>
+#include <bdn/StackCore.h>
+#import <bdn/ios/ViewCore.hh>
 
 namespace bdn
 {
diff --git a/framework/ui/platforms/ios/include/bdn/ios/SwitchCore.hh b/framework/ui/platforms/ios/include/bdn/ios/SwitchCore.hh
index eb1f292d..8a50baf8 100644
--- a/framework/ui/platforms/ios/include/bdn/ios/SwitchCore.hh
+++ b/framework/ui/platforms/ios/include/bdn/ios/SwitchCore.hh
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <bdn/SwitchCore.h>
 #include <bdn/ClickEvent.h>
 #include <bdn/Switch.h>
+#include <bdn/SwitchCore.h>
 
 #import <bdn/ios/ViewCore.hh>
 
diff --git a/framework/ui/platforms/ios/include/bdn/ios/TextViewCore.hh b/framework/ui/platforms/ios/include/bdn/ios/TextViewCore.hh
index 6d14d790..b71a4fce 100644
--- a/framework/ui/platforms/ios/include/bdn/ios/TextViewCore.hh
+++ b/framework/ui/platforms/ios/include/bdn/ios/TextViewCore.hh
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/ITextViewCore.h>
 #include <bdn/ClickEvent.h>
+#include <bdn/ITextViewCore.h>
 #include <bdn/TextView.h>
 
 #import <bdn/ios/ViewCore.hh>
diff --git a/framework/ui/platforms/ios/include/bdn/ios/UIProvider.hh b/framework/ui/platforms/ios/include/bdn/ios/UIProvider.hh
index db33bfc8..5d14d3cf 100644
--- a/framework/ui/platforms/ios/include/bdn/ios/UIProvider.hh
+++ b/framework/ui/platforms/ios/include/bdn/ios/UIProvider.hh
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/UIProvider.h>
 #include <bdn/LayoutCoordinator.h>
+#include <bdn/UIProvider.h>
 
 namespace bdn
 {
diff --git a/framework/ui/platforms/ios/include/bdn/ios/ViewCore.hh b/framework/ui/platforms/ios/include/bdn/ios/ViewCore.hh
index b69b87f6..c24172b3 100644
--- a/framework/ui/platforms/ios/include/bdn/ios/ViewCore.hh
+++ b/framework/ui/platforms/ios/include/bdn/ios/ViewCore.hh
@@ -3,8 +3,8 @@
 #import <UIKit/UIKit.h>
 
 #include <bdn/IViewCore.h>
-#include <bdn/View.h>
 #include <bdn/LayoutCoordinator.h>
+#include <bdn/View.h>
 
 #import <bdn/ios/UIProvider.hh>
 #import <bdn/ios/util.hh>
diff --git a/framework/ui/platforms/ios/include/bdn/ios/WindowCore.hh b/framework/ui/platforms/ios/include/bdn/ios/WindowCore.hh
index f35160d8..6f94d9aa 100644
--- a/framework/ui/platforms/ios/include/bdn/ios/WindowCore.hh
+++ b/framework/ui/platforms/ios/include/bdn/ios/WindowCore.hh
@@ -3,13 +3,13 @@
 #import <UIKit/UIKit.h>
 
 #include <bdn/IWindowCore.h>
-#include <bdn/Window.h>
 #include <bdn/NotImplementedError.h>
+#include <bdn/Window.h>
 
 #include <bdn/windowCoreUtil.h>
 
-#import <bdn/ios/util.hh>
 #import <bdn/ios/ViewCore.hh>
+#import <bdn/ios/util.hh>
 
 namespace bdn
 {
diff --git a/framework/ui/platforms/ios/src/UIProvider.mm b/framework/ui/platforms/ios/src/UIProvider.mm
index 80df3983..0181a632 100644
--- a/framework/ui/platforms/ios/src/UIProvider.mm
+++ b/framework/ui/platforms/ios/src/UIProvider.mm
@@ -1,17 +1,17 @@
 
 
 #import <UIKit/UIKit.h>
-#import <bdn/ios/UIProvider.hh>
-#import <bdn/ios/WindowCore.hh>
-#import <bdn/ios/ContainerViewCore.hh>
 #import <bdn/ios/ButtonCore.hh>
 #import <bdn/ios/CheckboxCore.hh>
-#import <bdn/ios/SwitchCore.hh>
-#import <bdn/ios/TextViewCore.hh>
-#import <bdn/ios/TextFieldCore.hh>
-#import <bdn/ios/ScrollViewCore.hh>
+#import <bdn/ios/ContainerViewCore.hh>
 #import <bdn/ios/ListViewCore.hh>
+#import <bdn/ios/ScrollViewCore.hh>
 #import <bdn/ios/StackCore.hh>
+#import <bdn/ios/SwitchCore.hh>
+#import <bdn/ios/TextFieldCore.hh>
+#import <bdn/ios/TextViewCore.hh>
+#import <bdn/ios/UIProvider.hh>
+#import <bdn/ios/WindowCore.hh>
 
 #include <bdn/ViewCoreTypeNotSupportedError.h>
 
diff --git a/framework/ui/platforms/mac/include/bdn/mac/ButtonCore.hh b/framework/ui/platforms/mac/include/bdn/mac/ButtonCore.hh
index f316fcaf..959c872f 100644
--- a/framework/ui/platforms/mac/include/bdn/mac/ButtonCore.hh
+++ b/framework/ui/platforms/mac/include/bdn/mac/ButtonCore.hh
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/IButtonCore.h>
 #include <bdn/Button.h>
+#include <bdn/IButtonCore.h>
 
 #import <bdn/mac/ButtonCoreBase.hh>
 
diff --git a/framework/ui/platforms/mac/include/bdn/mac/CheckboxCore.hh b/framework/ui/platforms/mac/include/bdn/mac/CheckboxCore.hh
index e9645cd4..3fddb332 100644
--- a/framework/ui/platforms/mac/include/bdn/mac/CheckboxCore.hh
+++ b/framework/ui/platforms/mac/include/bdn/mac/CheckboxCore.hh
@@ -1,12 +1,12 @@
 #pragma once
 
+#include <bdn/Checkbox.h>
 #include <bdn/CheckboxCore.h>
 #include <bdn/SwitchCore.h>
-#include <bdn/Checkbox.h>
 
 #import <bdn/mac/ButtonCoreBase.hh>
-#import <bdn/mac/util.hh>
 #import <bdn/mac/ui_util.hh>
+#import <bdn/mac/util.hh>
 
 namespace bdn
 {
diff --git a/framework/ui/platforms/mac/include/bdn/mac/ChildViewCore.hh b/framework/ui/platforms/mac/include/bdn/mac/ChildViewCore.hh
index ea9ddad3..abff452a 100644
--- a/framework/ui/platforms/mac/include/bdn/mac/ChildViewCore.hh
+++ b/framework/ui/platforms/mac/include/bdn/mac/ChildViewCore.hh
@@ -2,8 +2,8 @@
 
 #include <Cocoa/Cocoa.h>
 #include <bdn/IViewCore.h>
-#include <bdn/mac/IParentViewCore.h>
 #include <bdn/ProgrammingError.h>
+#include <bdn/mac/IParentViewCore.h>
 
 #import <bdn/mac/UIProvider.hh>
 #import <bdn/mac/util.hh>
diff --git a/framework/ui/platforms/mac/include/bdn/mac/ListViewCore.hh b/framework/ui/platforms/mac/include/bdn/mac/ListViewCore.hh
index 3cd7b2b8..d7b45920 100644
--- a/framework/ui/platforms/mac/include/bdn/mac/ListViewCore.hh
+++ b/framework/ui/platforms/mac/include/bdn/mac/ListViewCore.hh
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <bdn/mac/ChildViewCore.hh>
-#include <bdn/ListViewCore.h>
 #include <bdn/ListView.h>
+#include <bdn/ListViewCore.h>
+#include <bdn/mac/ChildViewCore.hh>
 
 @class ListViewDelegateMac;
 
diff --git a/framework/ui/platforms/mac/include/bdn/mac/ScrollViewCore.hh b/framework/ui/platforms/mac/include/bdn/mac/ScrollViewCore.hh
index f2cdf0cf..b8f5feb4 100644
--- a/framework/ui/platforms/mac/include/bdn/mac/ScrollViewCore.hh
+++ b/framework/ui/platforms/mac/include/bdn/mac/ScrollViewCore.hh
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/ScrollView.h>
 #include <bdn/IScrollViewCore.h>
+#include <bdn/ScrollView.h>
 
 #include <bdn/ScrollViewLayoutHelper.h>
 
diff --git a/framework/ui/platforms/mac/include/bdn/mac/StackCore.hh b/framework/ui/platforms/mac/include/bdn/mac/StackCore.hh
index 2be1073d..132e1de2 100644
--- a/framework/ui/platforms/mac/include/bdn/mac/StackCore.hh
+++ b/framework/ui/platforms/mac/include/bdn/mac/StackCore.hh
@@ -2,8 +2,8 @@
 
 #import <bdn/mac/ChildViewCore.hh>
 
-#include <bdn/StackCore.h>
 #include <bdn/Stack.h>
+#include <bdn/StackCore.h>
 
 #include <deque>
 
diff --git a/framework/ui/platforms/mac/include/bdn/mac/SwitchCore.hh b/framework/ui/platforms/mac/include/bdn/mac/SwitchCore.hh
index 4e193ef9..aaff8c16 100644
--- a/framework/ui/platforms/mac/include/bdn/mac/SwitchCore.hh
+++ b/framework/ui/platforms/mac/include/bdn/mac/SwitchCore.hh
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <bdn/CheckboxCore.h>
-#include <bdn/SwitchCore.h>
 #include <bdn/Switch.h>
+#include <bdn/SwitchCore.h>
 
 #import <bdn/mac/ChildViewCore.hh>
 #import <bdn/mac/MacSwitch.hh>
diff --git a/framework/ui/platforms/mac/include/bdn/mac/TextFieldCore.hh b/framework/ui/platforms/mac/include/bdn/mac/TextFieldCore.hh
index 630dcc6f..4426951d 100644
--- a/framework/ui/platforms/mac/include/bdn/mac/TextFieldCore.hh
+++ b/framework/ui/platforms/mac/include/bdn/mac/TextFieldCore.hh
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/TextField.h>
 #include <bdn/ITextFieldCore.h>
+#include <bdn/TextField.h>
 #include <bdn/mac/ChildViewCore.hh>
 #include <bdn/mac/util.hh>
 
diff --git a/framework/ui/platforms/mac/include/bdn/mac/UIProvider.hh b/framework/ui/platforms/mac/include/bdn/mac/UIProvider.hh
index 3b9be94e..10d608d3 100644
--- a/framework/ui/platforms/mac/include/bdn/mac/UIProvider.hh
+++ b/framework/ui/platforms/mac/include/bdn/mac/UIProvider.hh
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <bdn/UIProvider.h>
 #include <bdn/LayoutCoordinator.h>
+#include <bdn/UIProvider.h>
 
 namespace bdn
 {
diff --git a/framework/ui/platforms/mac/include/bdn/mac/WindowCore.hh b/framework/ui/platforms/mac/include/bdn/mac/WindowCore.hh
index fdd14990..4fc91892 100644
--- a/framework/ui/platforms/mac/include/bdn/mac/WindowCore.hh
+++ b/framework/ui/platforms/mac/include/bdn/mac/WindowCore.hh
@@ -3,8 +3,8 @@
 #include <Cocoa/Cocoa.h>
 
 #include <bdn/IWindowCore.h>
-#include <bdn/Window.h>
 #include <bdn/NotImplementedError.h>
+#include <bdn/Window.h>
 #include <bdn/windowCoreUtil.h>
 
 #import <bdn/mac/UIProvider.hh>
diff --git a/framework/ui/platforms/mac/include/bdn/mac/ui_util.hh b/framework/ui/platforms/mac/include/bdn/mac/ui_util.hh
index 84417655..2ba4c7ed 100644
--- a/framework/ui/platforms/mac/include/bdn/mac/ui_util.hh
+++ b/framework/ui/platforms/mac/include/bdn/mac/ui_util.hh
@@ -1,8 +1,8 @@
 #pragma once
 
 #import <AppKit/AppKit.h>
-#import <bdn/foundationkit/stringUtil.hh>
 #include <Availability.h>
+#import <bdn/foundationkit/stringUtil.hh>
 
 namespace bdn
 {
diff --git a/framework/ui/platforms/mac/src/UIAppEntry.mm b/framework/ui/platforms/mac/src/UIAppEntry.mm
index 773db217..9bb272d9 100644
--- a/framework/ui/platforms/mac/src/UIAppEntry.mm
+++ b/framework/ui/platforms/mac/src/UIAppEntry.mm
@@ -1,8 +1,8 @@
 
 #include <bdn/mac/appEntry.h>
 
-#import <bdn/mac/UIAppRunner.hh>
 #include <bdn/entry.h>
+#import <bdn/mac/UIAppRunner.hh>
 
 namespace bdn
 {
diff --git a/framework/ui/platforms/mac/src/UIAppRunner.mm b/framework/ui/platforms/mac/src/UIAppRunner.mm
index 4206927c..ecc42833 100644
--- a/framework/ui/platforms/mac/src/UIAppRunner.mm
+++ b/framework/ui/platforms/mac/src/UIAppRunner.mm
@@ -5,8 +5,8 @@
 #import <bdn/foundationkit/MainDispatcher.hh>
 #import <bdn/foundationkit/objectUtil.hh>
 
-#include <bdn/entry.h>
 #include <bdn/ExceptionReference.h>
+#include <bdn/entry.h>
 
 #import <Cocoa/Cocoa.h>
 
diff --git a/framework/ui/platforms/mac/src/UIProvider.mm b/framework/ui/platforms/mac/src/UIProvider.mm
index 7bcc1b18..b43e3b50 100644
--- a/framework/ui/platforms/mac/src/UIProvider.mm
+++ b/framework/ui/platforms/mac/src/UIProvider.mm
@@ -6,19 +6,19 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include <bdn/ViewCoreTypeNotSupportedError.h>
 #include <bdn/AppRunnerBase.h>
+#include <bdn/ViewCoreTypeNotSupportedError.h>
 
-#import <bdn/mac/WindowCore.hh>
 #import <bdn/mac/ButtonCore.hh>
 #import <bdn/mac/CheckboxCore.hh>
-#import <bdn/mac/SwitchCore.hh>
-#import <bdn/mac/TextViewCore.hh>
 #import <bdn/mac/ContainerViewCore.hh>
-#import <bdn/mac/ScrollViewCore.hh>
 #import <bdn/mac/ListViewCore.hh>
-#import <bdn/mac/TextFieldCore.hh>
+#import <bdn/mac/ScrollViewCore.hh>
 #import <bdn/mac/StackCore.hh>
+#import <bdn/mac/SwitchCore.hh>
+#import <bdn/mac/TextFieldCore.hh>
+#import <bdn/mac/TextViewCore.hh>
+#import <bdn/mac/WindowCore.hh>
 
 namespace bdn
 {
diff --git a/framework/ui/src/ScrollView.cpp b/framework/ui/src/ScrollView.cpp
index 110c70f3..e8fd8cd8 100644
--- a/framework/ui/src/ScrollView.cpp
+++ b/framework/ui/src/ScrollView.cpp
@@ -1,9 +1,9 @@
 
 #include <bdn/ScrollView.h>
 
-#include <bdn/LayoutCoordinator.h>
-#include <bdn/IScrollViewCore.h>
 #include <bdn/AppRunnerBase.h>
+#include <bdn/IScrollViewCore.h>
+#include <bdn/LayoutCoordinator.h>
 
 namespace bdn
 {
diff --git a/framework/ui/src/View.cpp b/framework/ui/src/View.cpp
index 891424f1..18381673 100644
--- a/framework/ui/src/View.cpp
+++ b/framework/ui/src/View.cpp
@@ -2,8 +2,8 @@
 #include <bdn/View.h>
 
 #include <bdn/LayoutCoordinator.h>
-#include <bdn/debug.h>
 #include <bdn/ProgrammingError.h>
+#include <bdn/debug.h>
 
 namespace bdn
 {
diff --git a/framework/ui/src/Window.cpp b/framework/ui/src/Window.cpp
index cdbdf9ef..dc8de342 100644
--- a/framework/ui/src/Window.cpp
+++ b/framework/ui/src/Window.cpp
@@ -2,8 +2,8 @@
 #include <bdn/Window.h>
 
 #include <bdn/LayoutCoordinator.h>
-#include <bdn/debug.h>
 #include <bdn/UIAppControllerBase.h>
+#include <bdn/debug.h>
 
 namespace bdn
 {
diff --git a/tests/testboden/src/TestMockViewCoreMixin.h b/tests/testboden/src/TestMockViewCoreMixin.h
index 3969e918..1b662d05 100644
--- a/tests/testboden/src/TestMockViewCoreMixin.h
+++ b/tests/testboden/src/TestMockViewCoreMixin.h
@@ -2,8 +2,8 @@
 #define BDN_TEST_TestMockViewCoreMixin_H_
 
 #include <bdn/View.h>
-#include <bdn/test/MockViewCore.h>
 #include <bdn/test/MockUIProvider.h>
+#include <bdn/test/MockViewCore.h>
 
 namespace bdn
 {
diff --git a/tests/testboden/src/TestTextField.cpp b/tests/testboden/src/TestTextField.cpp
index 5d71f399..0bc93a27 100644
--- a/tests/testboden/src/TestTextField.cpp
+++ b/tests/testboden/src/TestTextField.cpp
@@ -2,8 +2,8 @@
 #include <bdn/test.h>
 
 #include <bdn/TextField.h>
-#include <bdn/test/testView.h>
 #include <bdn/test/MockTextFieldCore.h>
+#include <bdn/test/testView.h>
 
 using namespace bdn;
 
diff --git a/tests/testboden/src/main.cpp b/tests/testboden/src/main.cpp
index 5f1fe198..82df616b 100644
--- a/tests/testboden/src/main.cpp
+++ b/tests/testboden/src/main.cpp
@@ -1,5 +1,5 @@
 
-#include <bdn/appInit.h>
 #include <bdn/TestAppController.h>
+#include <bdn/appInit.h>
 
 BDN_TEST_APP_INIT();
diff --git a/tests/testboden/src/testButton.cpp b/tests/testboden/src/testButton.cpp
index 03806abd..5da5c53c 100644
--- a/tests/testboden/src/testButton.cpp
+++ b/tests/testboden/src/testButton.cpp
@@ -2,8 +2,8 @@
 #include <bdn/test.h>
 
 #include <bdn/Button.h>
-#include <bdn/test/testView.h>
 #include <bdn/test/MockButtonCore.h>
+#include <bdn/test/testView.h>
 
 using namespace bdn;
 
diff --git a/tests/testboden/src/testButtonCore_mock.cpp b/tests/testboden/src/testButtonCore_mock.cpp
index 0bee78f8..699f785e 100644
--- a/tests/testboden/src/testButtonCore_mock.cpp
+++ b/tests/testboden/src/testButtonCore_mock.cpp
@@ -1,11 +1,11 @@
 
 #include <bdn/test.h>
 
+#include "TestMockViewCoreMixin.h"
 #include <bdn/Button.h>
 #include <bdn/Window.h>
-#include <bdn/test/TestButtonCore.h>
 #include <bdn/test/MockButtonCore.h>
-#include "TestMockViewCoreMixin.h"
+#include <bdn/test/TestButtonCore.h>
 
 using namespace bdn;
 
diff --git a/tests/testboden/src/testCheckbox.cpp b/tests/testboden/src/testCheckbox.cpp
index fb953a6b..44a3f3f5 100644
--- a/tests/testboden/src/testCheckbox.cpp
+++ b/tests/testboden/src/testCheckbox.cpp
@@ -2,8 +2,8 @@
 #include <bdn/test.h>
 
 #include <bdn/Checkbox.h>
-#include <bdn/test/testView.h>
 #include <bdn/test/MockCheckboxCore.h>
+#include <bdn/test/testView.h>
 
 using namespace bdn;
 
diff --git a/tests/testboden/src/testColumnView.cpp b/tests/testboden/src/testColumnView.cpp
index e63c996e..353e3c57 100644
--- a/tests/testboden/src/testColumnView.cpp
+++ b/tests/testboden/src/testColumnView.cpp
@@ -1,11 +1,11 @@
 
 #include <bdn/test.h>
 
-#include <bdn/ColumnView.h>
 #include <bdn/Button.h>
-#include <bdn/test/testView.h>
-#include <bdn/test/MockViewCore.h>
+#include <bdn/ColumnView.h>
 #include <bdn/test/MockContainerViewCore.h>
+#include <bdn/test/MockViewCore.h>
+#include <bdn/test/testView.h>
 
 using namespace bdn;
 
diff --git a/tests/testboden/src/testConfig.cpp b/tests/testboden/src/testConfig.cpp
index 5a3442a3..da59cbda 100644
--- a/tests/testboden/src/testConfig.cpp
+++ b/tests/testboden/src/testConfig.cpp
@@ -1,7 +1,7 @@
 
 
-#include <bdn/test.h>
 #include <bdn/config.h>
+#include <bdn/test.h>
 
 namespace bdn
 {
diff --git a/tests/testboden/src/testContainerView.cpp b/tests/testboden/src/testContainerView.cpp
index 48572e9b..1e9aff0d 100644
--- a/tests/testboden/src/testContainerView.cpp
+++ b/tests/testboden/src/testContainerView.cpp
@@ -1,11 +1,11 @@
 
 #include <bdn/test.h>
 
-#include <bdn/ContainerView.h>
 #include <bdn/Button.h>
-#include <bdn/test/testView.h>
-#include <bdn/test/MockViewCore.h>
+#include <bdn/ContainerView.h>
 #include <bdn/test/MockContainerViewCore.h>
+#include <bdn/test/MockViewCore.h>
+#include <bdn/test/testView.h>
 
 using namespace bdn;
 
diff --git a/tests/testboden/src/testContainerViewCore_mock.cpp b/tests/testboden/src/testContainerViewCore_mock.cpp
index 977cdf30..7dfebdfa 100644
--- a/tests/testboden/src/testContainerViewCore_mock.cpp
+++ b/tests/testboden/src/testContainerViewCore_mock.cpp
@@ -3,8 +3,8 @@
 
 #include <bdn/test/TestContainerViewCore.h>
 
-#include <bdn/test/MockUIProvider.h>
 #include "TestMockViewCoreMixin.h"
+#include <bdn/test/MockUIProvider.h>
 
 using namespace bdn;
 
diff --git a/tests/testboden/src/testDip.cpp b/tests/testboden/src/testDip.cpp
index d5f6d8db..44f431f5 100644
--- a/tests/testboden/src/testDip.cpp
+++ b/tests/testboden/src/testDip.cpp
@@ -1,6 +1,6 @@
 
-#include <bdn/test.h>
 #include <bdn/config.h>
+#include <bdn/test.h>
 
 #include <bdn/Dip.h>
 
diff --git a/tests/testboden/src/testErrno.cpp b/tests/testboden/src/testErrno.cpp
index 3c40a45f..92cffe5d 100644
--- a/tests/testboden/src/testErrno.cpp
+++ b/tests/testboden/src/testErrno.cpp
@@ -1,9 +1,9 @@
 
 #include <bdn/test.h>
 
-#include <bdn/errno.h>
 #include <bdn/ErrorInfo.h>
 #include <bdn/config.h>
+#include <bdn/errno.h>
 
 #include <system_error>
 
diff --git a/tests/testboden/src/testFloatArithmetic.cpp b/tests/testboden/src/testFloatArithmetic.cpp
index 0d1a5471..1cf8f63f 100644
--- a/tests/testboden/src/testFloatArithmetic.cpp
+++ b/tests/testboden/src/testFloatArithmetic.cpp
@@ -1,6 +1,6 @@
 
-#include <bdn/test.h>
 #include <bdn/config.h>
+#include <bdn/test.h>
 
 using namespace bdn;
 
diff --git a/tests/testboden/src/testLayoutCoordinator.cpp b/tests/testboden/src/testLayoutCoordinator.cpp
index 0392bfc5..8a678235 100644
--- a/tests/testboden/src/testLayoutCoordinator.cpp
+++ b/tests/testboden/src/testLayoutCoordinator.cpp
@@ -1,8 +1,8 @@
 
 #include <bdn/test.h>
 
-#include <bdn/LayoutCoordinator.h>
 #include <bdn/Button.h>
+#include <bdn/LayoutCoordinator.h>
 
 #include <bdn/test/MockUIProvider.h>
 #include <bdn/test/MockViewCore.h>
diff --git a/tests/testboden/src/testRowView.cpp b/tests/testboden/src/testRowView.cpp
index df3ed360..1b3ba390 100644
--- a/tests/testboden/src/testRowView.cpp
+++ b/tests/testboden/src/testRowView.cpp
@@ -1,11 +1,11 @@
 
 #include <bdn/test.h>
 
-#include <bdn/RowView.h>
 #include <bdn/Button.h>
-#include <bdn/test/testView.h>
-#include <bdn/test/MockViewCore.h>
+#include <bdn/RowView.h>
 #include <bdn/test/MockContainerViewCore.h>
+#include <bdn/test/MockViewCore.h>
+#include <bdn/test/testView.h>
 
 using namespace bdn;
 
diff --git a/tests/testboden/src/testScrollView.cpp b/tests/testboden/src/testScrollView.cpp
index 1df078a0..ed2ab4d7 100644
--- a/tests/testboden/src/testScrollView.cpp
+++ b/tests/testboden/src/testScrollView.cpp
@@ -2,9 +2,9 @@
 #include <bdn/ScrollView.h>
 
 #include <bdn/test.h>
-#include <bdn/test/testView.h>
-#include <bdn/test/MockScrollViewCore.h>
 #include <bdn/test/MockButtonCore.h>
+#include <bdn/test/MockScrollViewCore.h>
+#include <bdn/test/testView.h>
 
 #include <bdn/Button.h>
 
diff --git a/tests/testboden/src/testScrollViewCore_mock.cpp b/tests/testboden/src/testScrollViewCore_mock.cpp
index b8c05bbe..80f20530 100644
--- a/tests/testboden/src/testScrollViewCore_mock.cpp
+++ b/tests/testboden/src/testScrollViewCore_mock.cpp
@@ -1,11 +1,11 @@
 
 #include <bdn/test.h>
 
-#include <bdn/Window.h>
+#include "TestMockViewCoreMixin.h"
 #include <bdn/Dip.h>
-#include <bdn/test/TestScrollViewCore.h>
+#include <bdn/Window.h>
 #include <bdn/test/MockScrollViewCore.h>
-#include "TestMockViewCoreMixin.h"
+#include <bdn/test/TestScrollViewCore.h>
 
 using namespace bdn;
 
diff --git a/tests/testboden/src/testScrollViewLayoutHelper.cpp b/tests/testboden/src/testScrollViewLayoutHelper.cpp
index 5afcf772..5dcb09e2 100644
--- a/tests/testboden/src/testScrollViewLayoutHelper.cpp
+++ b/tests/testboden/src/testScrollViewLayoutHelper.cpp
@@ -1,9 +1,9 @@
 
 #include <bdn/test.h>
 
-#include <bdn/ScrollViewLayoutHelper.h>
-#include <bdn/ScrollView.h>
 #include <bdn/Dip.h>
+#include <bdn/ScrollView.h>
+#include <bdn/ScrollViewLayoutHelper.h>
 
 #include <bdn/test/MockUIProvider.h>
 #include <bdn/test/ScrollViewLayoutTesterBase.h>
diff --git a/tests/testboden/src/testSignal.cpp b/tests/testboden/src/testSignal.cpp
index 334f34d0..d9f34017 100644
--- a/tests/testboden/src/testSignal.cpp
+++ b/tests/testboden/src/testSignal.cpp
@@ -2,12 +2,12 @@
 
 #include <bdn/Signal.h>
 
-#include <bdn/test.h>
 #include <bdn/StopWatch.h>
 #include <bdn/config.h>
+#include <bdn/test.h>
 
-#include <thread>
 #include <future>
+#include <thread>
 
 using namespace bdn;
 using namespace std::chrono_literals;
diff --git a/tests/testboden/src/testSwitch.cpp b/tests/testboden/src/testSwitch.cpp
index 2aa631c9..6ba0578b 100644
--- a/tests/testboden/src/testSwitch.cpp
+++ b/tests/testboden/src/testSwitch.cpp
@@ -2,8 +2,8 @@
 #include <bdn/test.h>
 
 #include <bdn/Switch.h>
-#include <bdn/test/testView.h>
 #include <bdn/test/MockSwitchCore.h>
+#include <bdn/test/testView.h>
 
 using namespace bdn;
 
diff --git a/tests/testboden/src/testTestFramework.cpp b/tests/testboden/src/testTestFramework.cpp
index c61cac83..6ff60005 100644
--- a/tests/testboden/src/testTestFramework.cpp
+++ b/tests/testboden/src/testTestFramework.cpp
@@ -1,13 +1,13 @@
 
 #include <bdn/test.h>
 
-#include <bdn/mainThread.h>
 #include <bdn/InvalidArgumentError.h>
 #include <bdn/config.h>
+#include <bdn/mainThread.h>
 
-#include <thread>
 #include <chrono>
 #include <future>
+#include <thread>
 
 using namespace std::chrono_literals;
 using namespace bdn;
diff --git a/tests/testboden/src/testTextView.cpp b/tests/testboden/src/testTextView.cpp
index ea4e5372..08538aa0 100644
--- a/tests/testboden/src/testTextView.cpp
+++ b/tests/testboden/src/testTextView.cpp
@@ -2,8 +2,8 @@
 #include <bdn/test.h>
 
 #include <bdn/TextView.h>
-#include <bdn/test/testView.h>
 #include <bdn/test/MockTextViewCore.h>
+#include <bdn/test/testView.h>
 
 using namespace bdn;
 
diff --git a/tests/testboden/src/testTextViewCore_mock.cpp b/tests/testboden/src/testTextViewCore_mock.cpp
index 1fde3670..a0174b1c 100644
--- a/tests/testboden/src/testTextViewCore_mock.cpp
+++ b/tests/testboden/src/testTextViewCore_mock.cpp
@@ -1,11 +1,11 @@
 
 #include <bdn/test.h>
 
+#include "TestMockViewCoreMixin.h"
 #include <bdn/Button.h>
 #include <bdn/Window.h>
-#include <bdn/test/TestTextViewCore.h>
 #include <bdn/test/MockTextViewCore.h>
-#include "TestMockViewCoreMixin.h"
+#include <bdn/test/TestTextViewCore.h>
 
 using namespace bdn;
 
diff --git a/tests/testboden/src/testThreadSafeNotifier.cpp b/tests/testboden/src/testThreadSafeNotifier.cpp
index 4a916e55..6268bdaf 100644
--- a/tests/testboden/src/testThreadSafeNotifier.cpp
+++ b/tests/testboden/src/testThreadSafeNotifier.cpp
@@ -1,8 +1,8 @@
 
 #include <bdn/test.h>
 
-#include <bdn/ThreadSafeNotifier.h>
 #include <bdn/DanglingFunctionError.h>
+#include <bdn/ThreadSafeNotifier.h>
 
 using namespace bdn;
 
diff --git a/tests/testboden/src/testWindow.cpp b/tests/testboden/src/testWindow.cpp
index 2a7dcffa..dd143cbc 100644
--- a/tests/testboden/src/testWindow.cpp
+++ b/tests/testboden/src/testWindow.cpp
@@ -2,9 +2,9 @@
 #include <bdn/Window.h>
 
 #include <bdn/test.h>
-#include <bdn/test/testView.h>
 #include <bdn/test/MockButtonCore.h>
 #include <bdn/test/MockWindowCore.h>
+#include <bdn/test/testView.h>
 
 #include <bdn/Button.h>
 
diff --git a/tests/testboden/src/testWindowCore_mock.cpp b/tests/testboden/src/testWindowCore_mock.cpp
index b57cb846..f3552467 100644
--- a/tests/testboden/src/testWindowCore_mock.cpp
+++ b/tests/testboden/src/testWindowCore_mock.cpp
@@ -1,11 +1,11 @@
 
 #include <bdn/test.h>
 
+#include "TestMockViewCoreMixin.h"
 #include <bdn/Window.h>
-#include <bdn/test/TestWindowCore.h>
 #include <bdn/test/MockUIProvider.h>
 #include <bdn/test/MockWindowCore.h>
-#include "TestMockViewCoreMixin.h"
+#include <bdn/test/TestWindowCore.h>
 
 using namespace bdn;
 
diff --git a/tests/testboden/src/win32/testHresultError.cpp b/tests/testboden/src/win32/testHresultError.cpp
index d364b9ec..fd8fef91 100644
--- a/tests/testboden/src/win32/testHresultError.cpp
+++ b/tests/testboden/src/win32/testHresultError.cpp
@@ -1,8 +1,8 @@
 #include <bdn/init.h>
 #include <bdn/test.h>
 
-#include <bdn/win32/hresultError.h>
 #include <bdn/ErrorInfo.h>
+#include <bdn/win32/hresultError.h>
 
 #include <system_error>
 
diff --git a/tests/testboden/src/win32/testWin32Error.cpp b/tests/testboden/src/win32/testWin32Error.cpp
index d94b1f61..0291b0a8 100644
--- a/tests/testboden/src/win32/testWin32Error.cpp
+++ b/tests/testboden/src/win32/testWin32Error.cpp
@@ -1,8 +1,8 @@
 #include <bdn/init.h>
 #include <bdn/test.h>
 
-#include <bdn/win32/win32Error.h>
 #include <bdn/ErrorInfo.h>
+#include <bdn/win32/win32Error.h>
 
 #include <system_error>
 
diff --git a/tests/testboden/src/winuwp/testPlatformError.cpp b/tests/testboden/src/winuwp/testPlatformError.cpp
index bf2ecb43..c84107d6 100644
--- a/tests/testboden/src/winuwp/testPlatformError.cpp
+++ b/tests/testboden/src/winuwp/testPlatformError.cpp
@@ -1,8 +1,8 @@
 #include <bdn/init.h>
 #include <bdn/test.h>
 
-#include <bdn/winuwp/platformError.h>
 #include <bdn/win32/hresultError.h>
+#include <bdn/winuwp/platformError.h>
 
 using namespace bdn;
 using namespace bdn::winuwp;
diff --git a/tests/testboden_common/src/testGenericDispatcher.cpp b/tests/testboden_common/src/testGenericDispatcher.cpp
index bb05d077..9424f711 100644
--- a/tests/testboden_common/src/testGenericDispatcher.cpp
+++ b/tests/testboden_common/src/testGenericDispatcher.cpp
@@ -1,11 +1,11 @@
 
-#include <bdn/test.h>
-#include <bdn/test/testDispatcher.h>
 #include <bdn/GenericDispatcher.h>
 #include <bdn/config.h>
+#include <bdn/test.h>
+#include <bdn/test/testDispatcher.h>
 
-#include <thread>
 #include <iostream>
+#include <thread>
 
 using namespace bdn;
 
diff --git a/tests/testboden_common/src/testMainDispatcher.cpp b/tests/testboden_common/src/testMainDispatcher.cpp
index 5e47e27f..9dad6cba 100644
--- a/tests/testboden_common/src/testMainDispatcher.cpp
+++ b/tests/testboden_common/src/testMainDispatcher.cpp
@@ -1,9 +1,9 @@
 
 #include <bdn/test.h>
 
-#include <bdn/test/testDispatcher.h>
 #include <bdn/AppRunnerBase.h>
 #include <bdn/config.h>
+#include <bdn/test/testDispatcher.h>
 
 using namespace bdn;
 
diff --git a/tests/testbodentiming/src/main.cpp b/tests/testbodentiming/src/main.cpp
index 5f1fe198..82df616b 100644
--- a/tests/testbodentiming/src/main.cpp
+++ b/tests/testbodentiming/src/main.cpp
@@ -1,5 +1,5 @@
 
-#include <bdn/appInit.h>
 #include <bdn/TestAppController.h>
+#include <bdn/appInit.h>
 
 BDN_TEST_APP_INIT();
diff --git a/tests/testbodentiming/src/testCallFromMainThread.cpp b/tests/testbodentiming/src/testCallFromMainThread.cpp
index dbf827a5..8fbc94a0 100644
--- a/tests/testbodentiming/src/testCallFromMainThread.cpp
+++ b/tests/testbodentiming/src/testCallFromMainThread.cpp
@@ -1,13 +1,13 @@
 
-#include <bdn/test.h>
 #include <bdn/config.h>
 #include <bdn/mainThread.h>
+#include <bdn/test.h>
 
-#include <bdn/StopWatch.h>
 #include <bdn/InvalidArgumentError.h>
+#include <bdn/StopWatch.h>
 
-#include <thread>
 #include <chrono>
+#include <thread>
 
 using namespace bdn;
 using namespace std::chrono_literals;
diff --git a/tests/testbodentiming/src/testStopWatch.cpp b/tests/testbodentiming/src/testStopWatch.cpp
index 18ab6c69..a851068e 100644
--- a/tests/testbodentiming/src/testStopWatch.cpp
+++ b/tests/testbodentiming/src/testStopWatch.cpp
@@ -3,8 +3,8 @@
 
 #include <bdn/StopWatch.h>
 
-#include <thread>
 #include <chrono>
+#include <thread>
 
 using namespace bdn;
 using namespace std::chrono_literals;
diff --git a/tests/testbodentiming/src/testTestFramework_Timing.cpp b/tests/testbodentiming/src/testTestFramework_Timing.cpp
index cbe2dc79..634cc56b 100644
--- a/tests/testbodentiming/src/testTestFramework_Timing.cpp
+++ b/tests/testbodentiming/src/testTestFramework_Timing.cpp
@@ -1,9 +1,9 @@
 
-#include <bdn/test.h>
 #include <bdn/config.h>
+#include <bdn/test.h>
 
-#include <bdn/mainThread.h>
 #include <bdn/StopWatch.h>
+#include <bdn/mainThread.h>
 
 #include <chrono>
 
diff --git a/tests/testbodenui/src/android/TestAndroidViewCoreMixin.h b/tests/testbodenui/src/android/TestAndroidViewCoreMixin.h
index 6b9727a0..d5e7d2fd 100644
--- a/tests/testbodenui/src/android/TestAndroidViewCoreMixin.h
+++ b/tests/testbodenui/src/android/TestAndroidViewCoreMixin.h
@@ -2,8 +2,8 @@
 #define BDN_TEST_TestAndroidViewCore_H_
 
 #include <bdn/View.h>
-#include <bdn/android/ViewCore.h>
 #include <bdn/android/UIProvider.h>
+#include <bdn/android/ViewCore.h>
 
 namespace bdn
 {
diff --git a/tests/testbodenui/src/android/testButtonCore_android.cpp b/tests/testbodenui/src/android/testButtonCore_android.cpp
index 7bbd8927..2dcf4c05 100644
--- a/tests/testbodenui/src/android/testButtonCore_android.cpp
+++ b/tests/testbodenui/src/android/testButtonCore_android.cpp
@@ -1,11 +1,11 @@
 
 #include <bdn/test.h>
 
+#include "TestAndroidViewCoreMixin.h"
 #include <bdn/Button.h>
 #include <bdn/Window.h>
-#include <bdn/test/TestButtonCore.h>
 #include <bdn/android/JButton.h>
-#include "TestAndroidViewCoreMixin.h"
+#include <bdn/test/TestButtonCore.h>
 
 using namespace bdn;
 
diff --git a/tests/testbodenui/src/android/testCheckboxCore_android.cpp b/tests/testbodenui/src/android/testCheckboxCore_android.cpp
index 6adda3d4..1f9c990e 100644
--- a/tests/testbodenui/src/android/testCheckboxCore_android.cpp
+++ b/tests/testbodenui/src/android/testCheckboxCore_android.cpp
@@ -1,12 +1,12 @@
 
 #include <bdn/test.h>
 
+#include "TestAndroidViewCoreMixin.h"
 #include <bdn/Checkbox.h>
 #include <bdn/Window.h>
-#include <bdn/test/TestCheckboxCore.h>
 #include <bdn/android/CheckboxCore.h>
 #include <bdn/android/JCheckBox.h>
-#include "TestAndroidViewCoreMixin.h"
+#include <bdn/test/TestCheckboxCore.h>
 
 using namespace bdn;
 
diff --git a/tests/testbodenui/src/android/testContainerViewCore_android.cpp b/tests/testbodenui/src/android/testContainerViewCore_android.cpp
index 1dac7d67..64550690 100644
--- a/tests/testbodenui/src/android/testContainerViewCore_android.cpp
+++ b/tests/testbodenui/src/android/testContainerViewCore_android.cpp
@@ -3,8 +3,8 @@
 
 #include <bdn/test/TestContainerViewCore.h>
 
-#include <bdn/android/UIProvider.h>
 #include "TestAndroidViewCoreMixin.h"
+#include <bdn/android/UIProvider.h>
 
 using namespace bdn;
 
diff --git a/tests/testbodenui/src/android/testScrollViewCore_android.cpp b/tests/testbodenui/src/android/testScrollViewCore_android.cpp
index a299b6df..a991b320 100644
--- a/tests/testbodenui/src/android/testScrollViewCore_android.cpp
+++ b/tests/testbodenui/src/android/testScrollViewCore_android.cpp
@@ -1,12 +1,12 @@
 
 #include <bdn/test.h>
 
+#include "TestAndroidViewCoreMixin.h"
 #include <bdn/Window.h>
-#include <bdn/test/TestScrollViewCore.h>
-#include <bdn/android/UIProvider.h>
-#include <bdn/android/JScrollView.h>
 #include <bdn/android/JHorizontalScrollView.h>
-#include "TestAndroidViewCoreMixin.h"
+#include <bdn/android/JScrollView.h>
+#include <bdn/android/UIProvider.h>
+#include <bdn/test/TestScrollViewCore.h>
 
 using namespace bdn;
 
diff --git a/tests/testbodenui/src/android/testSwitchCore_android.cpp b/tests/testbodenui/src/android/testSwitchCore_android.cpp
index 1efb14be..444f0990 100644
--- a/tests/testbodenui/src/android/testSwitchCore_android.cpp
+++ b/tests/testbodenui/src/android/testSwitchCore_android.cpp
@@ -1,11 +1,11 @@
 
 #include <bdn/test.h>
 
+#include "TestAndroidViewCoreMixin.h"
 #include <bdn/Switch.h>
 #include <bdn/Window.h>
-#include <bdn/test/TestSwitchCore.h>
 #include <bdn/android/JSwitch.h>
-#include "TestAndroidViewCoreMixin.h"
+#include <bdn/test/TestSwitchCore.h>
 
 using namespace bdn;
 
diff --git a/tests/testbodenui/src/android/testTextViewCore_android.cpp b/tests/testbodenui/src/android/testTextViewCore_android.cpp
index d3ee6d49..1645de0d 100644
--- a/tests/testbodenui/src/android/testTextViewCore_android.cpp
+++ b/tests/testbodenui/src/android/testTextViewCore_android.cpp
@@ -1,10 +1,10 @@
 
 #include <bdn/test.h>
 
+#include "TestAndroidViewCoreMixin.h"
 #include <bdn/Button.h>
 #include <bdn/Window.h>
 #include <bdn/test/TestTextViewCore.h>
-#include "TestAndroidViewCoreMixin.h"
 
 using namespace bdn;
 
diff --git a/tests/testbodenui/src/android/testWindowCore_android.cpp b/tests/testbodenui/src/android/testWindowCore_android.cpp
index 7eafbd03..6aa00104 100644
--- a/tests/testbodenui/src/android/testWindowCore_android.cpp
+++ b/tests/testbodenui/src/android/testWindowCore_android.cpp
@@ -1,11 +1,11 @@
 
 #include <bdn/test.h>
 
+#include "TestAndroidViewCoreMixin.h"
 #include <bdn/Window.h>
-#include <bdn/test/TestWindowCore.h>
 #include <bdn/android/UIProvider.h>
 #include <bdn/android/WindowCore.h>
-#include "TestAndroidViewCoreMixin.h"
+#include <bdn/test/TestWindowCore.h>
 
 using namespace bdn;
 
diff --git a/tests/testbodenui/src/ios/TestIosViewCoreMixin.hh b/tests/testbodenui/src/ios/TestIosViewCoreMixin.hh
index 3f7912ec..3bc8369d 100644
--- a/tests/testbodenui/src/ios/TestIosViewCoreMixin.hh
+++ b/tests/testbodenui/src/ios/TestIosViewCoreMixin.hh
@@ -2,8 +2,8 @@
 #define BDN_TEST_TestIosViewCore_H_
 
 #include <bdn/View.h>
-#import <bdn/ios/ViewCore.hh>
 #import <bdn/ios/UIProvider.hh>
+#import <bdn/ios/ViewCore.hh>
 #import <bdn/ios/util.hh>
 
 namespace bdn
diff --git a/tests/testbodenui/src/ios/testCheckboxCore_ios.mm b/tests/testbodenui/src/ios/testCheckboxCore_ios.mm
index 91a7c4d2..276409d4 100644
--- a/tests/testbodenui/src/ios/testCheckboxCore_ios.mm
+++ b/tests/testbodenui/src/ios/testCheckboxCore_ios.mm
@@ -3,8 +3,8 @@
 
 #include <bdn/Checkbox.h>
 #include <bdn/Window.h>
-#include <bdn/test/TestCheckboxCore.h>
 #include <bdn/ios/CheckboxCore.hh>
+#include <bdn/test/TestCheckboxCore.h>
 
 #import "TestIosViewCoreMixin.hh"
 
diff --git a/tests/testbodenui/src/ios/testContainerViewCore_ios.mm b/tests/testbodenui/src/ios/testContainerViewCore_ios.mm
index f1a8467b..aae60b01 100644
--- a/tests/testbodenui/src/ios/testContainerViewCore_ios.mm
+++ b/tests/testbodenui/src/ios/testContainerViewCore_ios.mm
@@ -3,8 +3,8 @@
 
 #include <bdn/test/TestContainerViewCore.h>
 
-#import <bdn/ios/UIProvider.hh>
 #import "TestIosViewCoreMixin.hh"
+#import <bdn/ios/UIProvider.hh>
 
 using namespace bdn;
 
diff --git a/tests/testbodenui/src/ios/testScrollViewCore_ios.mm b/tests/testbodenui/src/ios/testScrollViewCore_ios.mm
index 810f7c1f..5de45895 100644
--- a/tests/testbodenui/src/ios/testScrollViewCore_ios.mm
+++ b/tests/testbodenui/src/ios/testScrollViewCore_ios.mm
@@ -1,10 +1,10 @@
 
 #include <bdn/test.h>
 
-#include <bdn/Window.h>
+#import "TestIosViewCoreMixin.hh"
 #include <bdn/Dip.h>
+#include <bdn/Window.h>
 #include <bdn/test/TestScrollViewCore.h>
-#import "TestIosViewCoreMixin.hh"
 
 #import <bdn/ios/util.hh>
 
diff --git a/tests/testbodenui/src/ios/testSwitchCore_ios.mm b/tests/testbodenui/src/ios/testSwitchCore_ios.mm
index f72e6e36..5b14d9e0 100644
--- a/tests/testbodenui/src/ios/testSwitchCore_ios.mm
+++ b/tests/testbodenui/src/ios/testSwitchCore_ios.mm
@@ -3,8 +3,8 @@
 
 #include <bdn/Switch.h>
 #include <bdn/Window.h>
-#include <bdn/test/TestSwitchCore.h>
 #include <bdn/ios/SwitchCore.hh>
+#include <bdn/test/TestSwitchCore.h>
 
 #import "TestIosViewCoreMixin.hh"
 
diff --git a/tests/testbodenui/src/ios/testTextViewCore_ios.mm b/tests/testbodenui/src/ios/testTextViewCore_ios.mm
index fa5a48e2..0608e71e 100644
--- a/tests/testbodenui/src/ios/testTextViewCore_ios.mm
+++ b/tests/testbodenui/src/ios/testTextViewCore_ios.mm
@@ -1,10 +1,10 @@
 
 #include <bdn/test.h>
 
+#import "TestIosViewCoreMixin.hh"
 #include <bdn/Button.h>
 #include <bdn/Window.h>
 #include <bdn/test/TestTextViewCore.h>
-#import "TestIosViewCoreMixin.hh"
 
 using namespace bdn;
 
diff --git a/tests/testbodenui/src/ios/testWindowCore_ios.mm b/tests/testbodenui/src/ios/testWindowCore_ios.mm
index c4827889..121a184c 100644
--- a/tests/testbodenui/src/ios/testWindowCore_ios.mm
+++ b/tests/testbodenui/src/ios/testWindowCore_ios.mm
@@ -2,10 +2,10 @@
 #include <bdn/test.h>
 
 #include <bdn/Window.h>
-#include <bdn/test/TestWindowCore.h>
 #import <bdn/ios/UIProvider.hh>
-#import <bdn/ios/WindowCore.hh>
 #import <bdn/ios/ViewCore.hh>
+#import <bdn/ios/WindowCore.hh>
+#include <bdn/test/TestWindowCore.h>
 
 #import "TestIosViewCoreMixin.hh"
 
diff --git a/tests/testbodenui/src/mac/TestMacChildViewCoreMixin.hh b/tests/testbodenui/src/mac/TestMacChildViewCoreMixin.hh
index 9679242b..02a26e5d 100644
--- a/tests/testbodenui/src/mac/TestMacChildViewCoreMixin.hh
+++ b/tests/testbodenui/src/mac/TestMacChildViewCoreMixin.hh
@@ -3,8 +3,8 @@
 
 #include <bdn/View.h>
 #import <bdn/mac/ChildViewCore.hh>
-#import <bdn/mac/WindowCore.hh>
 #import <bdn/mac/UIProvider.hh>
+#import <bdn/mac/WindowCore.hh>
 #import <bdn/mac/util.hh>
 
 namespace bdn
diff --git a/tests/testbodenui/src/mac/testCheckboxCore_mac.mm b/tests/testbodenui/src/mac/testCheckboxCore_mac.mm
index a052695b..46c7a81b 100644
--- a/tests/testbodenui/src/mac/testCheckboxCore_mac.mm
+++ b/tests/testbodenui/src/mac/testCheckboxCore_mac.mm
@@ -1,12 +1,12 @@
 
 #include <bdn/test.h>
 
-#include <bdn/Window.h>
 #include <bdn/Checkbox.h>
-#include <bdn/test/TestCheckboxCore.h>
+#include <bdn/Window.h>
 #include <bdn/mac/CheckboxCore.hh>
-#include <bdn/mac/util.hh>
 #include <bdn/mac/ui_util.hh>
+#include <bdn/mac/util.hh>
+#include <bdn/test/TestCheckboxCore.h>
 
 #import "TestMacChildViewCoreMixin.hh"
 
diff --git a/tests/testbodenui/src/mac/testContainerViewCore_mac.mm b/tests/testbodenui/src/mac/testContainerViewCore_mac.mm
index 7150709c..ad2f5ec9 100644
--- a/tests/testbodenui/src/mac/testContainerViewCore_mac.mm
+++ b/tests/testbodenui/src/mac/testContainerViewCore_mac.mm
@@ -3,8 +3,8 @@
 
 #include <bdn/test/TestContainerViewCore.h>
 
-#import <bdn/mac/UIProvider.hh>
 #import "TestMacChildViewCoreMixin.hh"
+#import <bdn/mac/UIProvider.hh>
 
 using namespace bdn;
 
diff --git a/tests/testbodenui/src/mac/testScrollViewCore_mac.mm b/tests/testbodenui/src/mac/testScrollViewCore_mac.mm
index a5a03cd9..48947cb6 100644
--- a/tests/testbodenui/src/mac/testScrollViewCore_mac.mm
+++ b/tests/testbodenui/src/mac/testScrollViewCore_mac.mm
@@ -1,10 +1,10 @@
 
 #include <bdn/test.h>
 
-#include <bdn/Window.h>
+#import "TestMacChildViewCoreMixin.hh"
 #include <bdn/Dip.h>
+#include <bdn/Window.h>
 #include <bdn/test/TestScrollViewCore.h>
-#import "TestMacChildViewCoreMixin.hh"
 
 #import <bdn/mac/util.hh>
 
diff --git a/tests/testbodenui/src/mac/testTextViewCore_mac.mm b/tests/testbodenui/src/mac/testTextViewCore_mac.mm
index 0cc81144..100cbffd 100644
--- a/tests/testbodenui/src/mac/testTextViewCore_mac.mm
+++ b/tests/testbodenui/src/mac/testTextViewCore_mac.mm
@@ -1,10 +1,10 @@
 
 #include <bdn/test.h>
 
+#import "TestMacChildViewCoreMixin.hh"
 #include <bdn/Button.h>
 #include <bdn/Window.h>
 #include <bdn/test/TestTextViewCore.h>
-#import "TestMacChildViewCoreMixin.hh"
 
 using namespace bdn;
 
diff --git a/tests/testbodenui/src/mac/testWindowCore_mac.mm b/tests/testbodenui/src/mac/testWindowCore_mac.mm
index 07a8e9cb..d572cdb3 100644
--- a/tests/testbodenui/src/mac/testWindowCore_mac.mm
+++ b/tests/testbodenui/src/mac/testWindowCore_mac.mm
@@ -2,10 +2,10 @@
 #include <bdn/test.h>
 
 #include <bdn/Window.h>
-#include <bdn/test/TestWindowCore.h>
+#import <bdn/mac/ChildViewCore.hh>
 #import <bdn/mac/UIProvider.hh>
 #import <bdn/mac/WindowCore.hh>
-#import <bdn/mac/ChildViewCore.hh>
+#include <bdn/test/TestWindowCore.h>
 
 using namespace bdn;
 
diff --git a/tests/testbodenui/src/main.cpp b/tests/testbodenui/src/main.cpp
index b22ffac9..d07b7a6d 100644
--- a/tests/testbodenui/src/main.cpp
+++ b/tests/testbodenui/src/main.cpp
@@ -1,5 +1,5 @@
 
-#include <bdn/appInit.h>
 #include <bdn/TestAppController.h>
+#include <bdn/appInit.h>
 
 BDN_TEST_APP_INIT()