Cleaning up header files: Include what we use.

.travis.yml

@@ -36,7 +36,7 @@ matrix:
             - libsfml-dev
     - os: linux
       compiler: gcc
-      env: DISABLE_RTTI_AND_EXCEPTIONS="ON"
+      env: DISABLE_RTTI_AND_EXCEPTIONS="ON" NO_THIRDPARTY_CONTAINERS="ON"
       addons:
         apt:
           packages:
@@ -70,7 +70,7 @@ matrix:
 install:
   - cd "$TRAVIS_BUILD_DIR"
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cmake -DNO_THIRDPARTY_CONTAINERS=ON -G Xcode .; fi
-  - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then cmake -DBUILD_LUA_BINDINGS=ON -DBUILD_SAMPLES=ON  -DDISABLE_RTTI_AND_EXCEPTIONS=${DISABLE_RTTI_AND_EXCEPTIONS:-OFF} -DNO_FONT_INTERFACE_DEFAULT=${NO_FONT_INTERFACE_DEFAULT:-OFF} -G Ninja .; fi
+  - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then cmake -DBUILD_LUA_BINDINGS=ON -DBUILD_SAMPLES=ON -DDISABLE_RTTI_AND_EXCEPTIONS=${DISABLE_RTTI_AND_EXCEPTIONS:-OFF} -DNO_THIRDPARTY_CONTAINERS=${NO_THIRDPARTY_CONTAINERS:-OFF} -DNO_FONT_INTERFACE_DEFAULT=${NO_FONT_INTERFACE_DEFAULT:-OFF} -G Ninja .; fi
 
 before_script:
   - if [[ "$VALGRIND_SAMPLES" == "1" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=:99.0; fi

CMake/FileList.cmake

@@ -251,7 +251,6 @@ set(Core_SRC_FILES
     ${PROJECT_SOURCE_DIR}/Source/Core/ObserverPtr.cpp
     ${PROJECT_SOURCE_DIR}/Source/Core/Plugin.cpp
     ${PROJECT_SOURCE_DIR}/Source/Core/PluginRegistry.cpp
-    ${PROJECT_SOURCE_DIR}/Source/Core/precompiled.cpp
     ${PROJECT_SOURCE_DIR}/Source/Core/Profiling.cpp
     ${PROJECT_SOURCE_DIR}/Source/Core/PropertiesIteratorView.cpp
     ${PROJECT_SOURCE_DIR}/Source/Core/Property.cpp

Include/RmlUi/Controls.h

@@ -31,4 +31,19 @@
 
 #include "Controls/Controls.h"
 
+#include "Controls/DataFormatter.h"
+#include "Controls/ElementDataGrid.h"
+#include "Controls/ElementDataGridCell.h"
+#include "Controls/ElementDataGridExpandButton.h"
+#include "Controls/ElementDataGridRow.h"
+#include "Controls/ElementForm.h"
+#include "Controls/ElementFormControl.h"
+#include "Controls/ElementFormControlDataSelect.h"
+#include "Controls/ElementFormControlInput.h"
+#include "Controls/ElementFormControlSelect.h"
+#include "Controls/ElementFormControlTextArea.h"
+#include "Controls/ElementProgressBar.h"
+#include "Controls/ElementTabSet.h"
+#include "Controls/SelectOption.h"
+
 #endif

Include/RmlUi/Controls/Controls.h

@@ -29,20 +29,7 @@
 #ifndef RMLUICONTROLSCONTROLS_H
 #define RMLUICONTROLSCONTROLS_H
 
-#include "DataFormatter.h"
-#include "ElementDataGrid.h"
-#include "ElementDataGridCell.h"
-#include "ElementDataGridExpandButton.h"
-#include "ElementDataGridRow.h"
-#include "ElementForm.h"
-#include "ElementFormControl.h"
-#include "ElementFormControlDataSelect.h"
-#include "ElementFormControlInput.h"
-#include "ElementFormControlSelect.h"
-#include "ElementFormControlTextArea.h"
-#include "ElementProgressBar.h"
-#include "ElementTabSet.h"
-#include "SelectOption.h"
+#include "Header.h"
 
 namespace Rml {
 namespace Controls {

Include/RmlUi/Controls/DataSource.h

@@ -102,7 +102,7 @@ class RMLUICONTROLS_API DataSource
 	private:
 		Core::String name;
 
-		typedef std::list< DataSourceListener* > ListenerList;
+		using ListenerList = std::list< DataSourceListener* >;
 		ListenerList listeners;
 };
 

Include/RmlUi/Controls/Header.h

@@ -31,11 +31,6 @@
 
 #include "../Core/Platform.h"
 
-#ifdef STATIC_LIB
-	#define RMLUI_STATIC_LIB
-	#pragma message("DEPRECATED: STATIC_LIB macro has been deprecated in favor of RMLUI_STATIC_LIB and support will be removed in a future release")
-#endif
-
 #if !defined RMLUI_STATIC_LIB
 	#ifdef RMLUI_PLATFORM_WIN32
 		#ifdef RmlControls_EXPORTS

Include/RmlUi/Controls/Lua/Header.h

@@ -35,11 +35,6 @@
 #undef RMLUILUA_API
 #endif
 
-#ifdef STATIC_LIB
-	#define RMLUI_STATIC_LIB
-	#pragma message("DEPRECATED: STATIC_LIB macro has been deprecated in favor of RMLUI_STATIC_LIB and support will be removed in a future release")
-#endif
-
 #if !defined RMLUI_STATIC_LIB
 	#ifdef RMLUI_PLATFORM_WIN32
 		#if defined RmlCoreLua_EXPORTS 

Include/RmlUi/Core.h

@@ -31,4 +31,54 @@
 
 #include "Core/Core.h"
 
+#include "Core/Types.h"
+#include "Core/Math.h"
+#include "Core/Header.h"
+#include "Core/Animation.h"
+#include "Core/Box.h"
+#include "Core/ComputedValues.h"
+#include "Core/Context.h"
+#include "Core/ContextInstancer.h"
+#include "Core/Decorator.h"
+#include "Core/DecoratorInstancer.h"
+#include "Core/Element.h"
+#include "Core/ElementDocument.h"
+#include "Core/ElementInstancer.h"
+#include "Core/ElementScroll.h"
+#include "Core/ElementText.h"
+#include "Core/ElementUtilities.h"
+#include "Core/Event.h"
+#include "Core/EventInstancer.h"
+#include "Core/EventListener.h"
+#include "Core/EventListenerInstancer.h"
+#include "Core/Factory.h"
+#include "Core/FileInterface.h"
+#include "Core/FontEffect.h"
+#include "Core/FontGlyph.h"
+#include "Core/FontEngineInterface.h"
+#include "Core/Geometry.h"
+#include "Core/GeometryUtilities.h"
+#include "Core/ID.h"
+#include "Core/Input.h"
+#include "Core/Log.h"
+#include "Core/Plugin.h"
+#include "Core/PropertiesIteratorView.h"
+#include "Core/Property.h"
+#include "Core/PropertyDefinition.h"
+#include "Core/PropertyDictionary.h"
+#include "Core/PropertyIdSet.h"
+#include "Core/PropertyParser.h"
+#include "Core/PropertySpecification.h"
+#include "Core/RenderInterface.h"
+#include "Core/Spritesheet.h"
+#include "Core/StringUtilities.h"
+#include "Core/StyleSheet.h"
+#include "Core/StyleSheetSpecification.h"
+#include "Core/SystemInterface.h"
+#include "Core/Texture.h"
+#include "Core/Tween.h"
+#include "Core/Vertex.h"
+#include "Core/XMLNodeHandler.h"
+#include "Core/XMLParser.h"
+
 #endif

Include/RmlUi/Core/Animation.h

@@ -25,14 +25,12 @@
  *
  */
 
-
-
 #ifndef RMLUICOREANIMATION_H
 #define RMLUICOREANIMATION_H
 
-
 #include "Types.h"
 #include "Tween.h"
+#include "ID.h"
 
 namespace Rml {
 namespace Core {
@@ -50,7 +48,7 @@ struct Animation {
 
 /* Data parsed from the 'transition' property. */
 struct Transition {
-	PropertyId id;
+	PropertyId id = PropertyId::Invalid;
 	Tween tween;
 	float duration = 0.0f;
 	float delay = 0.0f;

Include/RmlUi/Core/BaseXMLParser.h

@@ -37,7 +37,6 @@ namespace Rml {
 namespace Core {
 
 class Stream;
-using XMLAttributes = Dictionary;
 
 /**
 	@author Peter Curry

Include/RmlUi/Core/Core.h

@@ -29,60 +29,22 @@
 #ifndef RMLUICORECORE_H
 #define RMLUICORECORE_H
 
-#include "Types.h"
-#include "Math.h"
 #include "Header.h"
-#include "Animation.h"
-#include "Box.h"
-#include "ComputedValues.h"
-#include "Context.h"
-#include "ContextInstancer.h"
-#include "Decorator.h"
-#include "DecoratorInstancer.h"
-#include "Element.h"
-#include "ElementDocument.h"
-#include "ElementInstancer.h"
-#include "ElementScroll.h"
-#include "ElementText.h"
-#include "ElementUtilities.h"
+#include "Types.h"
 #include "Event.h"
-#include "EventInstancer.h"
-#include "EventListener.h"
-#include "EventListenerInstancer.h"
-#include "Factory.h"
-#include "FileInterface.h"
-#include "FontEffect.h"
-#include "FontGlyph.h"
-#include "FontEngineInterface.h"
-#include "Geometry.h"
-#include "GeometryUtilities.h"
-#include "ID.h"
-#include "Input.h"
-#include "Log.h"
-#include "Plugin.h"
-#include "PropertiesIteratorView.h"
-#include "Property.h"
-#include "PropertyDefinition.h"
-#include "PropertyDictionary.h"
-#include "PropertyIdSet.h"
-#include "PropertyParser.h"
-#include "PropertySpecification.h"
-#include "RenderInterface.h"
-#include "Spritesheet.h"
-#include "StringUtilities.h"
-#include "StyleSheet.h"
-#include "StyleSheetSpecification.h"
-#include "SystemInterface.h"
-#include "Texture.h"
-#include "Tween.h"
-#include "Vertex.h"
-#include "XMLNodeHandler.h"
-#include "XMLParser.h"
+#include "ComputedValues.h"
 
 namespace Rml {
 namespace Core {
 
 class Plugin;
+class Context;
+class FileInterface;
+class FontEngineInterface;
+class RenderInterface;
+class SystemInterface;
+enum class DefaultActionPhase;
+
 
 /**
 	RmlUi library core API.

Include/RmlUi/Core/ElementInstancer.h

@@ -39,7 +39,6 @@ namespace Rml {
 namespace Core {
 
 class Element;
-using XMLAttributes = Dictionary;
 
 /**
 	An element instancer provides a method for allocating

Include/RmlUi/Core/Lua/Header.h

@@ -35,11 +35,6 @@
 #undef RMLUILUA_API
 #endif
 
-#ifdef STATIC_LIB
-	#define RMLUI_STATIC_LIB
-	#pragma message("DEPRECATED: STATIC_LIB macro has been deprecated in favor of RMLUI_STATIC_LIB and support will be removed in a future release")
-#endif
-
 #if !defined RMLUI_STATIC_LIB
 	#ifdef RMLUI_PLATFORM_WIN32
 		#if defined RmlCoreLua_EXPORTS 

Include/RmlUi/Core/Types.h

@@ -165,6 +165,7 @@ using PropertyMap = UnorderedMap< PropertyId, Property >;
 
 using Dictionary = SmallUnorderedMap< String, Variant >;
 using ElementAttributes = Dictionary;
+using XMLAttributes = Dictionary;
 
 using AnimationList = std::vector<Animation>;
 using DecoratorList = std::vector<SharedPtr<const Decorator>>;

Include/RmlUi/Core/XMLNodeHandler.h

@@ -38,7 +38,6 @@ namespace Core {
 
 class Element;
 class XMLParser;
-using XMLAttributes = Dictionary;
 
 /**
 	A handler gets ElementStart, ElementEnd and ElementData called by the XMLParser.

Include/RmlUi/Debugger/Debugger.h

@@ -29,7 +29,6 @@
 #ifndef RMLUIDEBUGGERDEBUGGER_H
 #define RMLUIDEBUGGERDEBUGGER_H
 
-#include "../Core/Types.h"
 #include "Header.h"
 
 namespace Rml {

Include/RmlUi/Debugger/Header.h

@@ -31,11 +31,6 @@
 
 #include "../Core/Platform.h"
 
-#ifdef STATIC_LIB
-	#define RMLUI_STATIC_LIB
-	#pragma message("DEPRECATED: STATIC_LIB macro has been deprecated in favor of RMLUI_STATIC_LIB and support will be removed in a future release")
-#endif
-
 #if !defined RMLUI_STATIC_LIB
 	#ifdef RMLUI_PLATFORM_WIN32
 		#ifdef RmlDebugger_EXPORTS

Samples/shell/src/ShellRenderInterfaceOpenGL.cpp

@@ -28,7 +28,8 @@
 
 #include <ShellRenderInterfaceExtensions.h>
 #include <ShellRenderInterfaceOpenGL.h>
-#include <RmlUi/Core.h>
+#include <RmlUi/Core/Core.h>
+#include <RmlUi/Core/FileInterface.h>
 #include <type_traits>
 #include <string.h>
 

Samples/shell/src/macosx/ShellRenderInterfaceExtensionsOpenGL_MacOSX.cpp

@@ -30,8 +30,8 @@
 #include <ShellRenderInterfaceOpenGL.h>
 #include <Carbon/Carbon.h>
 #include <RmlUi/Core/Context.h>
-#include <RmlUi/Core.h>
 #include <RmlUi/Core/Platform.h>
+#include <RmlUi/Core/Types.h>
 
 void ShellRenderInterfaceOpenGL::SetContext(void *context)
 {

Samples/shell/src/win32/ShellRenderInterfaceExtensionsOpenGL_Win32.cpp

@@ -29,8 +29,10 @@
 #include <ShellRenderInterfaceExtensions.h>
 #include <ShellRenderInterfaceOpenGL.h>
 #include <win32/IncludeWindows.h>
-#include <RmlUi/Core.h>
+#include <RmlUi/Core/Context.h>
 #include <RmlUi/Core/Platform.h>
+#include <RmlUi/Core/Profiling.h>
+#include <RmlUi/Core/Types.h>
 #include <Shell.h>
 #include <string.h>
 

Samples/shell/src/x11/ShellRenderInterfaceExtensionsOpenGL_X11.cpp

@@ -30,8 +30,9 @@
 #include <ShellRenderInterfaceOpenGL.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/xf86vmode.h>
-#include <RmlUi/Core.h>
+#include <RmlUi/Core/Context.h>
 #include <RmlUi/Core/Platform.h>
+#include <RmlUi/Core/Types.h>
 #include "../../include/Shell.h"
 
 void ShellRenderInterfaceOpenGL::SetContext(void *context)
@@ -117,7 +118,6 @@ void ShellRenderInterfaceOpenGL::PrepareRenderBuffer()
 
 void ShellRenderInterfaceOpenGL::PresentRenderBuffer()
 {
-
 	// Flips the OpenGL buffers.
 	glXSwapBuffers(this->nwData.display, this->nwData.window);
 }

Source/Controls/Controls.cpp

@@ -33,11 +33,23 @@
 #include "../../Include/RmlUi/Core/XMLParser.h"
 #include "../../Include/RmlUi/Core/Plugin.h"
 #include "../../Include/RmlUi/Core/Core.h"
+#include "../../Include/RmlUi/Core/Types.h"
 #include "ElementTextSelection.h"
 #include "XMLNodeHandlerDataGrid.h"
 #include "XMLNodeHandlerTabSet.h"
 #include "XMLNodeHandlerTextArea.h"
+#include "../../Include/RmlUi/Controls/ElementForm.h"
 #include "../../Include/RmlUi/Controls/ElementFormControlInput.h"
+#include "../../Include/RmlUi/Controls/ElementFormControlDataSelect.h"
+#include "../../Include/RmlUi/Controls/ElementFormControlSelect.h"
+#include "../../Include/RmlUi/Controls/ElementFormControlSelect.h"
+#include "../../Include/RmlUi/Controls/ElementFormControlTextArea.h"
+#include "../../Include/RmlUi/Controls/ElementTabSet.h"
+#include "../../Include/RmlUi/Controls/ElementProgressBar.h"
+#include "../../Include/RmlUi/Controls/ElementDataGrid.h"
+#include "../../Include/RmlUi/Controls/ElementDataGridExpandButton.h"
+#include "../../Include/RmlUi/Controls/ElementDataGridCell.h"
+#include "../../Include/RmlUi/Controls/ElementDataGridRow.h"
 
 namespace Rml {
 namespace Controls {
@@ -100,14 +112,14 @@ static bool initialised = false;
 class ControlsPlugin : public Rml::Core::Plugin
 {
 public:
-	void OnShutdown()
+	void OnShutdown() override
 	{
 		element_instancers.reset();
 		initialised = false;
 		delete this;
 	}
 
-	int GetEventClasses()
+	int GetEventClasses() override
 	{
 		return Rml::Core::Plugin::EVT_BASIC;
 	}

Source/Controls/DataQuery.cpp

@@ -113,7 +113,7 @@ void DataQuery::ExecuteQuery(DataSource* _data_source, const Rml::Core::String&
 		// Now sort the rows, based on the ordering requirements.
 		Rml::Core::StringList order_parameters;
 		Rml::Core::StringUtilities::ExpandString(order_parameters, order);
-		sort(rows.begin(), rows.end(), DataQuerySort(order_parameters));
+		std::sort(rows.begin(), rows.end(), DataQuerySort(order_parameters));
 	}
 }
 

Source/Controls/ElementDataGridRow.cpp

@@ -27,11 +27,12 @@
  */
 
 #include "../../Include/RmlUi/Controls/ElementDataGridRow.h"
-#include "../../Include/RmlUi/Core.h"
 #include "../../Include/RmlUi/Controls/DataSource.h"
 #include "../../Include/RmlUi/Controls/DataFormatter.h"
 #include "../../Include/RmlUi/Controls/ElementDataGrid.h"
 #include "../../Include/RmlUi/Controls/ElementDataGridCell.h"
+#include "../../Include/RmlUi/Core/Factory.h"
+#include "../../Include/RmlUi/Core/Types.h"
 #include "../Core/Clock.h"
 
 namespace Rml {

Source/Controls/ElementProgressBar.cpp

@@ -35,6 +35,7 @@
 #include "../../Include/RmlUi/Core/StyleSheet.h"
 #include "../../Include/RmlUi/Core/ElementUtilities.h"
 #include "../../Include/RmlUi/Core/URL.h"
+#include <algorithm>
 
 namespace Rml {
 namespace Controls {

Source/Controls/WidgetSlider.cpp

@@ -27,8 +27,10 @@
  */
 
 #include "WidgetSlider.h"
-#include "../../Include/RmlUi/Core.h"
 #include "../../Include/RmlUi/Controls/ElementFormControl.h"
+#include "../../Include/RmlUi/Core/ElementUtilities.h"
+#include "../../Include/RmlUi/Core/Factory.h"
+#include "../../Include/RmlUi/Core/Input.h"
 #include "../Core/Clock.h"
 
 namespace Rml {

Source/Controls/WidgetTextInput.cpp

@@ -28,8 +28,14 @@
 
 #include "WidgetTextInput.h"
 #include "ElementTextSelection.h"
-#include "../../Include/RmlUi/Core.h"
 #include "../../Include/RmlUi/Controls/ElementFormControl.h"
+#include "../../Include/RmlUi/Core/Core.h"
+#include "../../Include/RmlUi/Core/ElementScroll.h"
+#include "../../Include/RmlUi/Core/ElementText.h"
+#include "../../Include/RmlUi/Core/ElementUtilities.h"
+#include "../../Include/RmlUi/Core/GeometryUtilities.h"
+#include "../../Include/RmlUi/Core/Input.h"
+#include "../../Include/RmlUi/Core/Factory.h"
 #include "../../Include/RmlUi/Core/SystemInterface.h"
 #include "../../Include/RmlUi/Core/StringUtilities.h"
 #include "../Core/Clock.h"

Source/Controls/XMLNodeHandlerTextArea.cpp

@@ -27,8 +27,11 @@
  */
 
 #include "XMLNodeHandlerTextArea.h"
-#include "../../Include/RmlUi/Core.h"
 #include "../../Include/RmlUi/Controls/ElementFormControlTextArea.h"
+#include "../../Include/RmlUi/Core/Core.h"
+#include "../../Include/RmlUi/Core/Factory.h"
+#include "../../Include/RmlUi/Core/SystemInterface.h"
+#include "../../Include/RmlUi/Core/XMLParser.h"
 
 namespace Rml {
 namespace Controls {

Source/Controls/precompiled.h

@@ -29,6 +29,6 @@
 #ifndef RMLUICONTROLSPRECOMPILED_H
 #define RMLUICONTROLSPRECOMPILED_H
 
-#include "../../Include/RmlUi/Controls/Controls.h"
+#include "../../Include/RmlUi/Controls.h"
 
 #endif

Source/Core/Core.cpp

@@ -26,7 +26,17 @@
  *
  */
 
-#include "../../Include/RmlUi/Core.h"
+#include "../../Include/RmlUi/Core/Core.h"
+#include "../../Include/RmlUi/Core/Context.h"
+#include "../../Include/RmlUi/Core/Factory.h"
+#include "../../Include/RmlUi/Core/FileInterface.h"
+#include "../../Include/RmlUi/Core/FontEngineInterface.h"
+#include "../../Include/RmlUi/Core/Plugin.h"
+#include "../../Include/RmlUi/Core/RenderInterface.h"
+#include "../../Include/RmlUi/Core/SystemInterface.h"
+#include "../../Include/RmlUi/Core/StyleSheetSpecification.h"
+#include "../../Include/RmlUi/Core/Types.h"
+
 #include "EventSpecification.h"
 #include "FileInterfaceDefault.h"
 #include "PluginRegistry.h"

Source/Core/Decorator.cpp

@@ -29,6 +29,8 @@
 #include "../../Include/RmlUi/Core/Decorator.h"
 #include "TextureDatabase.h"
 #include "../../Include/RmlUi/Core/PropertyDefinition.h"
+#include "../../Include/RmlUi/Core/Texture.h"
+#include <algorithm>
 
 namespace Rml {
 namespace Core {

Source/Core/DecoratorTiled.cpp

@@ -26,9 +26,11 @@
  *
  */
 
-
 #include "DecoratorTiled.h"
-#include "../../Include/RmlUi/Core.h"
+#include "../../Include/RmlUi/Core/Element.h"
+#include "../../Include/RmlUi/Core/Math.h"
+#include "../../Include/RmlUi/Core/GeometryUtilities.h"
+#include <algorithm>
 
 namespace Rml {
 namespace Core {

Source/Core/DocumentHeader.cpp

@@ -28,7 +28,9 @@
 
 #include "DocumentHeader.h"
 #include "XMLParseTools.h"
-#include "../../Include/RmlUi/Core.h"
+#include "../../Include/RmlUi/Core/Core.h"
+#include "../../Include/RmlUi/Core/SystemInterface.h"
+#include "../../Include/RmlUi/Core/StringUtilities.h"
 
 namespace Rml {
 namespace Core {

Source/Core/Element.cpp

@@ -28,8 +28,19 @@
 
   
 #include "../../Include/RmlUi/Core/Element.h"
+#include "../../Include/RmlUi/Core/Context.h"
+#include "../../Include/RmlUi/Core/Core.h"
+#include "../../Include/RmlUi/Core/ElementDocument.h"
+#include "../../Include/RmlUi/Core/ElementInstancer.h"
+#include "../../Include/RmlUi/Core/ElementScroll.h"
+#include "../../Include/RmlUi/Core/ElementUtilities.h"
+#include "../../Include/RmlUi/Core/Factory.h"
 #include "../../Include/RmlUi/Core/Dictionary.h"
+#include "../../Include/RmlUi/Core/Profiling.h"
 #include "../../Include/RmlUi/Core/PropertyIdSet.h"
+#include "../../Include/RmlUi/Core/PropertiesIteratorView.h"
+#include "../../Include/RmlUi/Core/PropertyDefinition.h"
+#include "../../Include/RmlUi/Core/StyleSheetSpecification.h"
 #include "../../Include/RmlUi/Core/TransformPrimitive.h"
 #include "../../Include/RmlUi/Core/TransformState.h"
 #include "Clock.h"
@@ -49,7 +60,7 @@
 #include "StyleSheetParser.h"
 #include "StringCache.h"
 #include "XMLParseTools.h"
-#include "../../Include/RmlUi/Core/Core.h"
+#include <algorithm>
 
 namespace Rml {
 namespace Core {

Source/Core/ElementDocument.cpp

@@ -27,8 +27,12 @@
  */
 
 #include "../../Include/RmlUi/Core/ElementDocument.h"
+#include "../../Include/RmlUi/Core/Context.h"
+#include "../../Include/RmlUi/Core/ElementText.h"
+#include "../../Include/RmlUi/Core/Factory.h"
+#include "../../Include/RmlUi/Core/Profiling.h"
 #include "../../Include/RmlUi/Core/StreamMemory.h"
-#include "../../Include/RmlUi/Core.h"
+#include "../../Include/RmlUi/Core/StyleSheet.h"
 #include "DocumentHeader.h"
 #include "ElementStyle.h"
 #include "EventDispatcher.h"

Source/Core/ElementStyle.cpp

@@ -30,12 +30,14 @@
 #include "../../Include/RmlUi/Core/Core.h"
 #include "../../Include/RmlUi/Core/ElementDocument.h"
 #include "../../Include/RmlUi/Core/ElementUtilities.h"
+#include "../../Include/RmlUi/Core/FontEngineInterface.h"
 #include "../../Include/RmlUi/Core/Log.h"
 #include "../../Include/RmlUi/Core/Math.h"
 #include "../../Include/RmlUi/Core/Property.h"
 #include "../../Include/RmlUi/Core/PropertyDefinition.h"
 #include "../../Include/RmlUi/Core/PropertyDictionary.h"
 #include "../../Include/RmlUi/Core/PropertyIdSet.h"
+#include "../../Include/RmlUi/Core/Profiling.h"
 #include "../../Include/RmlUi/Core/StyleSheet.h"
 #include "../../Include/RmlUi/Core/StyleSheetSpecification.h"
 #include "../../Include/RmlUi/Core/TransformPrimitive.h"
@@ -45,6 +47,7 @@
 #include "ElementDefinition.h"
 #include "ComputeProperty.h"
 #include "PropertiesIterator.h"
+#include <algorithm>
 
 
 namespace Rml {

Source/Core/ElementTextDefault.cpp

@@ -29,11 +29,15 @@
 #include "ElementTextDefault.h"
 #include "ElementDefinition.h"
 #include "ElementStyle.h"
+#include "../../Include/RmlUi/Core/Core.h"
+#include "../../Include/RmlUi/Core/Context.h"
 #include "../../Include/RmlUi/Core/ElementDocument.h"
 #include "../../Include/RmlUi/Core/ElementUtilities.h"
 #include "../../Include/RmlUi/Core/Event.h"
+#include "../../Include/RmlUi/Core/FontEngineInterface.h"
+#include "../../Include/RmlUi/Core/GeometryUtilities.h"
 #include "../../Include/RmlUi/Core/Property.h"
-#include "../../Include/RmlUi/Core/Core.h"
+#include "../../Include/RmlUi/Core/Profiling.h"
 
 namespace Rml {
 namespace Core {

Source/Core/ElementUtilities.cpp

@@ -26,9 +26,15 @@
  *
  */
 
-#include "../../Include/RmlUi/Core.h"
-#include "../../Include/RmlUi/Core/TransformState.h"
 #include "../../Include/RmlUi/Core/ElementUtilities.h"
+#include "../../Include/RmlUi/Core/TransformState.h"
+#include "../../Include/RmlUi/Core/Element.h"
+#include "../../Include/RmlUi/Core/ElementScroll.h"
+#include "../../Include/RmlUi/Core/Context.h"
+#include "../../Include/RmlUi/Core/FontEngineInterface.h"
+#include "../../Include/RmlUi/Core/RenderInterface.h"
+#include "../../Include/RmlUi/Core/Core.h"
+#include "../../Include/RmlUi/Core/Factory.h"
 #include <queue>
 #include <limits>
 #include "LayoutEngine.h"

Source/Core/EventDispatcher.cpp

@@ -32,6 +32,7 @@
 #include "../../Include/RmlUi/Core/EventListener.h"
 #include "../../Include/RmlUi/Core/Factory.h"
 #include "EventSpecification.h"
+#include <algorithm>
 #include <limits.h>
 
 namespace Rml {

Source/Core/Factory.cpp

@@ -26,8 +26,10 @@
  *
  */
 
-#include "../../Include/RmlUi/Core.h"
+#include "../../Include/RmlUi/Core/Factory.h"
 #include "../../Include/RmlUi/Core/StreamMemory.h"
+#include "../../Include/RmlUi/Core.h"
+
 #include "ContextInstancerDefault.h"
 #include "DecoratorTiledBoxInstancer.h"
 #include "DecoratorTiledHorizontalInstancer.h"

Source/Core/FontEngineDefault/FontFaceHandleDefault.cpp

@@ -32,6 +32,7 @@
 #include "FontProvider.h"
 #include "FontFaceLayer.h"
 #include "FreeTypeInterface.h"
+#include <algorithm>
 
 namespace Rml {
 namespace Core {

Source/Core/FontEngineDefault/FontProvider.cpp

@@ -30,10 +30,10 @@
 #include "FontFace.h"
 #include "FontFamily.h"
 #include "FreeTypeInterface.h"
+#include "../../../Include/RmlUi/Core/Core.h"
 #include "../../../Include/RmlUi/Core/FileInterface.h"
 #include "../../../Include/RmlUi/Core/Log.h"
 #include "../../../Include/RmlUi/Core/StringUtilities.h"
-#include "../../../Include/RmlUi/Core/Core.h"
 
 namespace Rml {
 namespace Core {

Source/Core/Geometry.cpp

@@ -27,7 +27,11 @@
  */
 
 #include "../../Include/RmlUi/Core/Geometry.h"
-#include "../../Include/RmlUi/Core.h"
+#include "../../Include/RmlUi/Core/Context.h"
+#include "../../Include/RmlUi/Core/Core.h"
+#include "../../Include/RmlUi/Core/Element.h"
+#include "../../Include/RmlUi/Core/Profiling.h"
+#include "../../Include/RmlUi/Core/RenderInterface.h"
 
 namespace Rml {
 namespace Core {

Source/Core/GeometryUtilities.cpp

@@ -27,9 +27,10 @@
  */
 
 #include "../../Include/RmlUi/Core/GeometryUtilities.h"
+#include "../../Include/RmlUi/Core/Core.h"
+#include "../../Include/RmlUi/Core/FontEngineInterface.h"
 #include "../../Include/RmlUi/Core/Geometry.h"
 #include "../../Include/RmlUi/Core/Types.h"
-#include "../../Include/RmlUi/Core/Core.h"
 
 namespace Rml {
 namespace Core {

Source/Core/LayoutInlineBox.cpp

@@ -29,10 +29,11 @@
 #include "LayoutInlineBox.h"
 #include "LayoutBlockBox.h"
 #include "LayoutEngine.h"
+#include "../../Include/RmlUi/Core/Core.h"
 #include "../../Include/RmlUi/Core/ElementText.h"
 #include "../../Include/RmlUi/Core/ElementUtilities.h"
+#include "../../Include/RmlUi/Core/FontEngineInterface.h"
 #include "../../Include/RmlUi/Core/Property.h"
-#include "../../Include/RmlUi/Core/Core.h"
 
 namespace Rml {
 namespace Core {

Source/Core/LayoutInlineBoxText.cpp

@@ -29,11 +29,13 @@
 #include "LayoutInlineBoxText.h"
 #include "LayoutEngine.h"
 #include "LayoutLineBox.h"
+#include "../../Include/RmlUi/Core/Core.h"
 #include "../../Include/RmlUi/Core/ElementText.h"
 #include "../../Include/RmlUi/Core/ElementUtilities.h"
+#include "../../Include/RmlUi/Core/FontEngineInterface.h"
 #include "../../Include/RmlUi/Core/Log.h"
 #include "../../Include/RmlUi/Core/Property.h"
-#include "../../Include/RmlUi/Core/Core.h"
+#include "../../Include/RmlUi/Core/Profiling.h"
 
 namespace Rml {
 namespace Core {

Source/Core/Log.cpp

@@ -27,7 +27,10 @@
  */
 
 #include "../../Include/RmlUi/Core/Log.h"
-#include "../../Include/RmlUi/Core.h"
+#include "../../Include/RmlUi/Core/Core.h"
+#include "../../Include/RmlUi/Core/StringUtilities.h"
+#include "../../Include/RmlUi/Core/SystemInterface.h"
+
 #include <stdarg.h>
 #ifdef RMLUI_PLATFORM_WIN32
 #include <windows.h>

Source/Core/Lua/precompiled.h

@@ -29,7 +29,7 @@
 #ifndef RMLUICORELUAPRECOMPILED_H
 #define RMLUICORELUAPRECOMPILED_H
 
-#include <RmlUi/Core/Core.h>
+#include <RmlUi/Core.h>
 #include <RmlUi/Core/Debug.h>
 #include <RmlUi/Controls/Controls.h>
 #include <RmlUi/Core/Lua/LuaType.h>

Source/Core/StreamFile.cpp

@@ -27,8 +27,9 @@
  */
 
 #include "StreamFile.h"
+#include "../../Include/RmlUi/Core/Core.h"
 #include "../../Include/RmlUi/Core/FileInterface.h"
-#include "../../Include/RmlUi/Core.h"
+#include "../../Include/RmlUi/Core/StringUtilities.h"
 
 namespace Rml {
 namespace Core {

Source/Core/StyleSheet.cpp

@@ -41,6 +41,7 @@
 #include "../../Include/RmlUi/Core/PropertyDefinition.h"
 #include "../../Include/RmlUi/Core/StyleSheetSpecification.h"
 #include "../../Include/RmlUi/Core/FontEffectInstancer.h"
+#include <algorithm>
 
 namespace Rml {
 namespace Core {

Source/Core/StyleSheetNode.cpp

@@ -31,6 +31,7 @@
 #include "../../Include/RmlUi/Core/Profiling.h"
 #include "StyleSheetFactory.h"
 #include "StyleSheetNodeSelector.h"
+#include <algorithm>
 
 namespace Rml {
 namespace Core {

Source/Core/TextureDatabase.cpp

@@ -28,7 +28,9 @@
 
 #include "TextureDatabase.h"
 #include "TextureResource.h"
-#include "../../Include/RmlUi/Core.h"
+#include "../../Include/RmlUi/Core/Core.h"
+#include "../../Include/RmlUi/Core/StringUtilities.h"
+#include "../../Include/RmlUi/Core/SystemInterface.h"
 
 namespace Rml {
 namespace Core {

Source/Core/TextureLayoutTexture.cpp

@@ -27,7 +27,6 @@
  */
 
 #include "TextureLayoutTexture.h"
-#include "../../Include/RmlUi/Core/Core.h"
 #include "TextureDatabase.h"
 #include "TextureLayout.h"
 

Source/Core/XMLNodeHandlerBody.cpp

@@ -28,7 +28,9 @@
 
 #include "XMLNodeHandlerBody.h"
 #include "XMLParseTools.h"
-#include "../../Include/RmlUi/Core.h"
+#include "../../Include/RmlUi/Core/XMLParser.h"
+#include "../../Include/RmlUi/Core/ElementDocument.h"
+#include "../../Include/RmlUi/Core/Factory.h"
 
 namespace Rml {
 namespace Core {

Source/Core/XMLNodeHandlerHead.cpp

@@ -29,13 +29,13 @@
 #include "XMLNodeHandlerHead.h"
 #include "DocumentHeader.h"
 #include "TemplateCache.h"
+#include "../../../Include/RmlUi/Core/Core.h"
 #include "../../Include/RmlUi/Core/Element.h"
 #include "../../Include/RmlUi/Core/ElementDocument.h"
 #include "../../Include/RmlUi/Core/StringUtilities.h"
 #include "../../Include/RmlUi/Core/SystemInterface.h"
 #include "../../Include/RmlUi/Core/XMLParser.h"
 #include "../../Include/RmlUi/Core/URL.h"
-#include "../../Include/RmlUi/Core/Core.h"
 
 namespace Rml {
 namespace Core {

Source/Core/XMLNodeHandlerTemplate.cpp

@@ -30,7 +30,9 @@
 #include "Template.h"
 #include "TemplateCache.h"
 #include "XMLParseTools.h"
-#include "../../Include/RmlUi/Core.h"
+#include "../../Include/RmlUi/Core/Dictionary.h"
+#include "../../Include/RmlUi/Core/Factory.h"
+#include "../../Include/RmlUi/Core/XMLParser.h"
 
 namespace Rml {
 namespace Core {

Source/Core/precompiled.cpp

@@ -1,29 +0,0 @@
-/*
- * This source file is part of RmlUi, the HTML/CSS Interface Middleware
- *
- * For the latest information, see http://github.com/mikke89/RmlUi
- *
- * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
- * Copyright (c) 2019 The RmlUi Team, and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- */
-
-

Source/Core/precompiled.h

@@ -29,7 +29,7 @@
 #ifndef RMLUICOREPRECOMPILED_H
 #define RMLUICOREPRECOMPILED_H
 
-#include "../../Include/RmlUi/Core/Core.h"
+#include "../../Include/RmlUi/Core.h"
 #include "StringCache.h"
 
 #endif

Source/Debugger/Debugger.cpp

@@ -27,7 +27,7 @@
  */
 
 #include "../../Include/RmlUi/Debugger/Debugger.h"
-#include "../../Include/RmlUi/Core.h"
+#include "../../Include/RmlUi/Core/Core.h"
 #include "Plugin.h"
 
 namespace Rml {

Source/Debugger/ElementInfo.cpp

@@ -27,15 +27,18 @@
  */
 
 #include "ElementInfo.h"
-#include "../../Include/RmlUi/Core.h"
+#include "../../Include/RmlUi/Core/Core.h"
+#include "../../Include/RmlUi/Core/ElementUtilities.h"
+#include "../../Include/RmlUi/Core/Factory.h"
 #include "../../Include/RmlUi/Core/Property.h"
 #include "../../Include/RmlUi/Core/PropertiesIteratorView.h"
-#include "../../Include/RmlUi/Core/Factory.h"
 #include "../../Include/RmlUi/Core/StyleSheet.h"
 #include "../../Include/RmlUi/Core/StyleSheetSpecification.h"
+#include "../../Include/RmlUi/Core/SystemInterface.h"
 #include "Geometry.h"
 #include "CommonSource.h"
 #include "InfoSource.h"
+#include <algorithm>
 
 namespace Rml {
 namespace Debugger {

Source/Debugger/ElementLog.cpp

@@ -27,10 +27,11 @@
  */
 
 #include "ElementLog.h"
-#include "../../Include/RmlUi/Core.h"
 #include "CommonSource.h"
 #include "BeaconSource.h"
 #include "LogSource.h"
+#include "../../Include/RmlUi/Core/Context.h"
+#include "../../Include/RmlUi/Core/Factory.h"
 #include <limits.h>
 
 namespace Rml {

Source/Debugger/Geometry.cpp

@@ -27,7 +27,9 @@
  */
 
 #include "Geometry.h"
-#include "../../Include/RmlUi/Core.h"
+#include "../../Include/RmlUi/Core/Context.h"
+#include "../../Include/RmlUi/Core/GeometryUtilities.h"
+#include "../../Include/RmlUi/Core/RenderInterface.h"
 
 namespace Rml {
 namespace Debugger {

Source/Debugger/Plugin.cpp

@@ -27,8 +27,12 @@
  */
 
 #include "Plugin.h"
+#include "../../Include/RmlUi/Core/Context.h"
+#include "../../Include/RmlUi/Core/Core.h"
+#include "../../Include/RmlUi/Core/ElementInstancer.h"
+#include "../../Include/RmlUi/Core/ElementUtilities.h"
+#include "../../Include/RmlUi/Core/Factory.h"
 #include "../../Include/RmlUi/Core/Types.h"
-#include "../../Include/RmlUi/Core.h"
 #include "ElementContextHook.h"
 #include "ElementInfo.h"
 #include "ElementLog.h"

Source/Debugger/SystemInterface.cpp

@@ -27,7 +27,6 @@
  */
 
 #include "SystemInterface.h"
-#include "../../Include/RmlUi/Core.h"
 #include "ElementLog.h"
 
 namespace Rml {