Move most of gui/auxiliary to gui/core to reflect its true nature

projectfiles/CodeBlocks/wesnoth.cbp

@@ -450,16 +450,16 @@
 		<Unit filename="../../src/gettext.hpp" />
 		<Unit filename="../../src/gettext_boost.cpp" />
 		<Unit filename="../../src/global.hpp" />
-		<Unit filename="../../src/gui/auxiliary/canvas.cpp" />
-		<Unit filename="../../src/gui/auxiliary/canvas.hpp" />
-		<Unit filename="../../src/gui/auxiliary/event/dispatcher.cpp" />
-		<Unit filename="../../src/gui/auxiliary/event/dispatcher.hpp" />
-		<Unit filename="../../src/gui/auxiliary/event/dispatcher_private.hpp" />
-		<Unit filename="../../src/gui/auxiliary/event/distributor.cpp" />
-		<Unit filename="../../src/gui/auxiliary/event/distributor.hpp" />
-		<Unit filename="../../src/gui/auxiliary/event/handler.cpp" />
-		<Unit filename="../../src/gui/auxiliary/event/handler.hpp" />
-		<Unit filename="../../src/gui/auxiliary/event/message.hpp" />
+		<Unit filename="../../src/gui/core/canvas.cpp" />
+		<Unit filename="../../src/gui/core/canvas.hpp" />
+		<Unit filename="../../src/gui/core/event/dispatcher.cpp" />
+		<Unit filename="../../src/gui/core/event/dispatcher.hpp" />
+		<Unit filename="../../src/gui/core/event/dispatcher_private.hpp" />
+		<Unit filename="../../src/gui/core/event/distributor.cpp" />
+		<Unit filename="../../src/gui/core/event/distributor.hpp" />
+		<Unit filename="../../src/gui/core/event/handler.cpp" />
+		<Unit filename="../../src/gui/core/event/handler.hpp" />
+		<Unit filename="../../src/gui/core/event/message.hpp" />
 		<Unit filename="../../src/gui/auxiliary/filter.hpp" />
 		<Unit filename="../../src/gui/auxiliary/formula.hpp" />
 		<Unit filename="../../src/gui/auxiliary/iterator/exception.hpp" />
@@ -472,31 +472,31 @@
 		<Unit filename="../../src/gui/auxiliary/iterator/walker_grid.hpp" />
 		<Unit filename="../../src/gui/auxiliary/iterator/walker_widget.cpp" />
 		<Unit filename="../../src/gui/auxiliary/iterator/walker_widget.hpp" />
-		<Unit filename="../../src/gui/auxiliary/layout_exception.hpp" />
-		<Unit filename="../../src/gui/auxiliary/log.cpp" />
-		<Unit filename="../../src/gui/auxiliary/log.hpp" />
-		<Unit filename="../../src/gui/auxiliary/notifiee.hpp" />
-		<Unit filename="../../src/gui/auxiliary/notifier.hpp" />
+		<Unit filename="../../src/gui/core/layout_exception.hpp" />
+		<Unit filename="../../src/gui/core/log.cpp" />
+		<Unit filename="../../src/gui/core/log.hpp" />
+		<Unit filename="../../src/gui/core/notifiee.hpp" />
+		<Unit filename="../../src/gui/core/notifier.hpp" />
 		<Unit filename="../../src/gui/auxiliary/old_markup.cpp" />
 		<Unit filename="../../src/gui/auxiliary/old_markup.hpp" />
-		<Unit filename="../../src/gui/auxiliary/placer.cpp" />
-		<Unit filename="../../src/gui/auxiliary/placer.hpp" />
-		<Unit filename="../../src/gui/auxiliary/placer/horizontal_list.cpp" />
-		<Unit filename="../../src/gui/auxiliary/placer/horizontal_list.hpp" />
-		<Unit filename="../../src/gui/auxiliary/placer/vertical_list.cpp" />
-		<Unit filename="../../src/gui/auxiliary/placer/vertical_list.hpp" />
-		<Unit filename="../../src/gui/auxiliary/timer.cpp" />
-		<Unit filename="../../src/gui/auxiliary/timer.hpp" />
-		<Unit filename="../../src/gui/auxiliary/tips.cpp" />
-		<Unit filename="../../src/gui/auxiliary/tips.hpp" />
-		<Unit filename="../../src/gui/auxiliary/widget_definition.cpp" />
-		<Unit filename="../../src/gui/auxiliary/widget_definition.hpp" />
-		<Unit filename="../../src/gui/auxiliary/window_builder.cpp" />
-		<Unit filename="../../src/gui/auxiliary/window_builder.hpp" />
-		<Unit filename="../../src/gui/auxiliary/window_builder/helper.cpp" />
-		<Unit filename="../../src/gui/auxiliary/window_builder/helper.hpp" />
-		<Unit filename="../../src/gui/auxiliary/window_builder/instance.cpp" />
-		<Unit filename="../../src/gui/auxiliary/window_builder/instance.hpp" />
+		<Unit filename="../../src/gui/core/placer.cpp" />
+		<Unit filename="../../src/gui/core/placer.hpp" />
+		<Unit filename="../../src/gui/core/placer/horizontal_list.cpp" />
+		<Unit filename="../../src/gui/core/placer/horizontal_list.hpp" />
+		<Unit filename="../../src/gui/core/placer/vertical_list.cpp" />
+		<Unit filename="../../src/gui/core/placer/vertical_list.hpp" />
+		<Unit filename="../../src/gui/core/timer.cpp" />
+		<Unit filename="../../src/gui/core/timer.hpp" />
+		<Unit filename="../../src/gui/core/tips.cpp" />
+		<Unit filename="../../src/gui/core/tips.hpp" />
+		<Unit filename="../../src/gui/core/widget_definition.cpp" />
+		<Unit filename="../../src/gui/core/widget_definition.hpp" />
+		<Unit filename="../../src/gui/core/window_builder.cpp" />
+		<Unit filename="../../src/gui/core/window_builder.hpp" />
+		<Unit filename="../../src/gui/core/window_builder/helper.cpp" />
+		<Unit filename="../../src/gui/core/window_builder/helper.hpp" />
+		<Unit filename="../../src/gui/core/window_builder/instance.cpp" />
+		<Unit filename="../../src/gui/core/window_builder/instance.hpp" />
 		<Unit filename="../../src/gui/dialogs/addon/description.cpp" />
 		<Unit filename="../../src/gui/dialogs/addon/description.hpp" />
 		<Unit filename="../../src/gui/dialogs/addon/filter_options.cpp" />

projectfiles/VC9/wesnoth.vcproj

@@ -11148,7 +11148,7 @@
 				Name="Auxiliary"
 				>
 				<File
-					RelativePath="..\..\src\gui\auxiliary\canvas.cpp"
+					RelativePath="..\..\src\gui\core\canvas.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -11200,7 +11200,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\src\gui\auxiliary\canvas.hpp"
+					RelativePath="..\..\src\gui\core\canvas.hpp"
 					>
 				</File>
 				<File
@@ -11216,11 +11216,11 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\gui\auxiliary\layout_exception.hpp"
+					RelativePath="..\..\src\gui\core\layout_exception.hpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\gui\auxiliary\log.cpp"
+					RelativePath="..\..\src\gui\core\log.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -11272,7 +11272,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\src\gui\auxiliary\log.hpp"
+					RelativePath="..\..\src\gui\core\log.hpp"
 					>
 				</File>
 				<File
@@ -11284,7 +11284,7 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\gui\auxiliary\placer.cpp"
+					RelativePath="..\..\src\gui\core\placer.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -11336,7 +11336,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\src\gui\auxiliary\placer.hpp"
+					RelativePath="..\..\src\gui\core\placer.hpp"
 					>
 				</File>
 				<File
@@ -11348,7 +11348,7 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\gui\auxiliary\timer.cpp"
+					RelativePath="..\..\src\gui\core\timer.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -11400,15 +11400,15 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\src\gui\auxiliary\timer.hpp"
+					RelativePath="..\..\src\gui\core\timer.hpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\gui\auxiliary\tips.cpp"
+					RelativePath="..\..\src\gui\core\tips.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\gui\auxiliary\tips.hpp"
+					RelativePath="..\..\src\gui\core\tips.hpp"
 					>
 				</File>
 				<File
@@ -11424,7 +11424,7 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\gui\auxiliary\widget_definition.cpp"
+					RelativePath="..\..\src\gui\core\widget_definition.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -11476,11 +11476,11 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\src\gui\auxiliary\widget_definition.hpp"
+					RelativePath="..\..\src\gui\core\widget_definition.hpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\gui\auxiliary\window_builder.cpp"
+					RelativePath="..\..\src\gui\core\window_builder.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -11532,14 +11532,14 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\src\gui\auxiliary\window_builder.hpp"
+					RelativePath="..\..\src\gui\core\window_builder.hpp"
 					>
 				</File>
 				<Filter
 					Name="Window_Builder"
 					>
 					<File
-						RelativePath="..\..\src\gui\auxiliary\window_builder\helper.cpp"
+						RelativePath="..\..\src\gui\core\window_builder\helper.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Win32"
@@ -11591,11 +11591,11 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\src\gui\auxiliary\window_builder\helper.hpp"
+						RelativePath="..\..\src\gui\core\window_builder\helper.hpp"
 						>
 					</File>
 					<File
-						RelativePath="..\..\src\gui\auxiliary\window_builder\instance.cpp"
+						RelativePath="..\..\src\gui\core\window_builder\instance.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Win32"
@@ -11647,7 +11647,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\src\gui\auxiliary\window_builder\instance.hpp"
+						RelativePath="..\..\src\gui\core\window_builder\instance.hpp"
 						>
 					</File>
 				</Filter>
@@ -11655,7 +11655,7 @@
 					Name="Event"
 					>
 					<File
-						RelativePath="..\..\src\gui\auxiliary\event\dispatcher.cpp"
+						RelativePath="..\..\src\gui\core\event\dispatcher.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Win32"
@@ -11707,15 +11707,15 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\src\gui\auxiliary\event\dispatcher.hpp"
+						RelativePath="..\..\src\gui\core\event\dispatcher.hpp"
 						>
 					</File>
 					<File
-						RelativePath="..\..\src\gui\auxiliary\event\dispatcher_private.hpp"
+						RelativePath="..\..\src\gui\core\event\dispatcher_private.hpp"
 						>
 					</File>
 					<File
-						RelativePath="..\..\src\gui\auxiliary\event\distributor.cpp"
+						RelativePath="..\..\src\gui\core\event\distributor.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Win32"
@@ -11767,11 +11767,11 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\src\gui\auxiliary\event\distributor.hpp"
+						RelativePath="..\..\src\gui\core\event\distributor.hpp"
 						>
 					</File>
 					<File
-						RelativePath="..\..\src\gui\auxiliary\event\handler.cpp"
+						RelativePath="..\..\src\gui\core\event\handler.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Win32"
@@ -11823,11 +11823,11 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\src\gui\auxiliary\event\handler.hpp"
+						RelativePath="..\..\src\gui\core\event\handler.hpp"
 						>
 					</File>
 					<File
-						RelativePath="..\..\src\gui\auxiliary\event\message.hpp"
+						RelativePath="..\..\src\gui\core\event\message.hpp"
 						>
 					</File>
 				</Filter>
@@ -11995,7 +11995,7 @@
 					Name="Placer"
 					>
 					<File
-						RelativePath="..\..\src\gui\auxiliary\placer\horizontal_list.cpp"
+						RelativePath="..\..\src\gui\core\placer\horizontal_list.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Win32"
@@ -12047,11 +12047,11 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\src\gui\auxiliary\placer\horizontal_list.hpp"
+						RelativePath="..\..\src\gui\core\placer\horizontal_list.hpp"
 						>
 					</File>
 					<File
-						RelativePath="..\..\src\gui\auxiliary\placer\vertical_list.cpp"
+						RelativePath="..\..\src\gui\core\placer\vertical_list.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Win32"
@@ -12103,7 +12103,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\src\gui\auxiliary\placer\vertical_list.hpp"
+						RelativePath="..\..\src\gui\core\placer\vertical_list.hpp"
 						>
 					</File>
 				</Filter>

projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj

@@ -3348,6 +3348,35 @@
 			path = map;
 			sourceTree = "<group>";
 		};
+		91F16D511C9F6F220041C047 /* core */ = {
+			isa = PBXGroup;
+			children = (
+				B597EC510FC08E0100CE81F5 /* canvas.cpp */,
+				B597EC520FC08E0100CE81F5 /* canvas.hpp */,
+				B5B46932107118C400327599 /* event */,
+				B597EC540FC08E0100CE81F5 /* layout_exception.hpp */,
+				B597EC550FC08E0100CE81F5 /* log.cpp */,
+				B597EC560FC08E0100CE81F5 /* log.hpp */,
+				B52EE88F121358D700CFBDAB /* notifiee.hpp */,
+				B52EE890121358D700CFBDAB /* notifier.hpp */,
+				F4D5AFEF157120B30062EAFC /* placer */,
+				F4D5AFEA1571208B0062EAFC /* placer.cpp */,
+				F4D5AFEB1571208B0062EAFC /* placer.hpp */,
+				F4C5DD66158CFD5E0044F754 /* point.cpp */,
+				F4C5DD67158CFD5E0044F754 /* point.hpp */,
+				B5CF7BBA10D55F5A00A8BEB5 /* timer.cpp */,
+				B5CF7BBB10D55F5A00A8BEB5 /* timer.hpp */,
+				B504B94A1284C06B00261FE9 /* tips.cpp */,
+				B504B94B1284C06B00261FE9 /* tips.hpp */,
+				B5B4692E107118B200327599 /* widget_definition.cpp */,
+				B5B4692F107118B200327599 /* widget_definition.hpp */,
+				B54AC6EA0FEA9F7A006F6FBD /* window_builder */,
+				B597EC570FC08E0100CE81F5 /* window_builder.cpp */,
+				B597EC580FC08E0100CE81F5 /* window_builder.hpp */,
+			);
+			path = core;
+			sourceTree = "<group>";
+		};
 		B52EE8FD12135AC300CFBDAB /* whiteboard */ = {
 			isa = PBXGroup;
 			children = (
@@ -3775,32 +3804,12 @@
 		B597EC500FC08E0100CE81F5 /* auxiliary */ = {
 			isa = PBXGroup;
 			children = (
-				B597EC510FC08E0100CE81F5 /* canvas.cpp */,
-				B597EC520FC08E0100CE81F5 /* canvas.hpp */,
-				B5B46932107118C400327599 /* event */,
 				62579C6D1573E4E3003089D5 /* filter.hpp */,
 				91B621D41B76B51600B00E0F /* find_widget.hpp */,
 				B597EC530FC08E0100CE81F5 /* formula.hpp */,
 				49DA0D3113550EB2000AFEBD /* iterator */,
-				B597EC540FC08E0100CE81F5 /* layout_exception.hpp */,
-				B597EC550FC08E0100CE81F5 /* log.cpp */,
-				B597EC560FC08E0100CE81F5 /* log.hpp */,
-				B52EE88F121358D700CFBDAB /* notifiee.hpp */,
-				B52EE890121358D700CFBDAB /* notifier.hpp */,
 				B5CE470B12A0422800D665EE /* old_markup.cpp */,
 				B5CE470C12A0422800D665EE /* old_markup.hpp */,
-				F4D5AFEF157120B30062EAFC /* placer */,
-				F4D5AFEA1571208B0062EAFC /* placer.cpp */,
-				F4D5AFEB1571208B0062EAFC /* placer.hpp */,
-				B5CF7BBA10D55F5A00A8BEB5 /* timer.cpp */,
-				B5CF7BBB10D55F5A00A8BEB5 /* timer.hpp */,
-				B504B94A1284C06B00261FE9 /* tips.cpp */,
-				B504B94B1284C06B00261FE9 /* tips.hpp */,
-				B5B4692E107118B200327599 /* widget_definition.cpp */,
-				B5B4692F107118B200327599 /* widget_definition.hpp */,
-				B54AC6EA0FEA9F7A006F6FBD /* window_builder */,
-				B597EC570FC08E0100CE81F5 /* window_builder.cpp */,
-				B597EC580FC08E0100CE81F5 /* window_builder.hpp */,
 			);
 			path = auxiliary;
 			sourceTree = "<group>";
@@ -3873,8 +3882,8 @@
 			isa = PBXGroup;
 			children = (
 				B597EC500FC08E0100CE81F5 /* auxiliary */,
+				91F16D511C9F6F220041C047 /* core */,
 				B5A9BCA20ECA805A002BE442 /* dialogs */,
-				F4C5DD64158CFD5E0044F754 /* lib */,
 				B5A9BCCC0ECA805A002BE442 /* widgets */,
 			);
 			path = gui;
@@ -4207,23 +4216,6 @@
 			path = editor;
 			sourceTree = "<group>";
 		};
-		F4C5DD64158CFD5E0044F754 /* lib */ = {
-			isa = PBXGroup;
-			children = (
-				F4C5DD65158CFD5E0044F754 /* types */,
-			);
-			path = lib;
-			sourceTree = "<group>";
-		};
-		F4C5DD65158CFD5E0044F754 /* types */ = {
-			isa = PBXGroup;
-			children = (
-				F4C5DD66158CFD5E0044F754 /* point.cpp */,
-				F4C5DD67158CFD5E0044F754 /* point.hpp */,
-			);
-			path = types;
-			sourceTree = "<group>";
-		};
 		F4D5AFEF157120B30062EAFC /* placer */ = {
 			isa = PBXGroup;
 			children = (

src/CMakeLists.txt

@@ -194,9 +194,9 @@ if(MSVC)
 	SOURCE_GROUP("src editor map" REGULAR_EXPRESSION "editor/map/.*")
 	SOURCE_GROUP("src gui" REGULAR_EXPRESSION "gui/.*")
 	SOURCE_GROUP("src gui auxiliary" REGULAR_EXPRESSION "gui/auxiliary/.*")
-	SOURCE_GROUP("src gui auxiliary event" REGULAR_EXPRESSION "gui/auxiliary/event/.*")
-	SOURCE_GROUP("src gui auxiliary widget_definition" REGULAR_EXPRESSION "gui/auxiliary/widget_definition/.*")
-	SOURCE_GROUP("src gui auxiliary window_builder" REGULAR_EXPRESSION "gui/auxiliary/window_builder/.*")
+	SOURCE_GROUP("src gui auxiliary event" REGULAR_EXPRESSION "gui/core/event/.*")
+	SOURCE_GROUP("src gui auxiliary widget_definition" REGULAR_EXPRESSION "gui/core/widget_definition/.*")
+	SOURCE_GROUP("src gui auxiliary window_builder" REGULAR_EXPRESSION "gui/core/window_builder/.*")
 	SOURCE_GROUP("src gui dialogs" REGULAR_EXPRESSION "gui/dialogs/.*")
 	SOURCE_GROUP("src gui dialogs lobby" REGULAR_EXPRESSION "gui/dialogs/lobby/.*")
 	SOURCE_GROUP("src lua" REGULAR_EXPRESSION "lua/.*")
@@ -477,9 +477,9 @@ add_library(wesnoth-gui_types
 # converts the SDL events to internal events and allows other code to
 # connect to the events based on slots.
 set(wesnoth-gui_event_SRC
-	gui/auxiliary/event/dispatcher.cpp
-	gui/auxiliary/event/distributor.cpp
-	gui/auxiliary/event/handler.cpp
+	gui/core/event/dispatcher.cpp
+	gui/core/event/distributor.cpp
+	gui/core/event/handler.cpp
 )
 
 add_library(wesnoth-gui_event
@@ -511,9 +511,9 @@ add_library(wesnoth-gui_iterator
 # This library contains the basic placer for the gui library.
 # The placer is used is some widgets to determine how to place its content.
 set(wesnoth-gui_placer_SRC
-	gui/auxiliary/placer.cpp
-	gui/auxiliary/placer/horizontal_list.cpp
-	gui/auxiliary/placer/vertical_list.cpp
+	gui/core/placer.cpp
+	gui/core/placer/horizontal_list.cpp
+	gui/core/placer/vertical_list.cpp
 )
 
 add_library(wesnoth-gui_placer
@@ -527,7 +527,7 @@ add_library(wesnoth-gui_placer
 
 # This library contains the tooltip handling code.
 set(wesnoth-gui_tooltip_SRC
-	gui/auxiliary/tips.cpp
+	gui/core/tips.cpp
 	gui/dialogs/tip.cpp
 )
 
@@ -586,9 +586,9 @@ set(wesnoth-gui_widget_SRC
 	gui/widgets/viewport.cpp
 	gui/widgets/widget.cpp
 	gui/widgets/window.cpp
-	gui/auxiliary/window_builder.cpp
-	gui/auxiliary/window_builder/helper.cpp
-	gui/auxiliary/window_builder/instance.cpp
+	gui/core/window_builder.cpp
+	gui/core/window_builder/helper.cpp
+	gui/core/window_builder/instance.cpp
 )
 
 add_library(wesnoth-gui_widget
@@ -612,7 +612,7 @@ target_link_libraries(wesnoth-gui_widget
 # The widget definitions serialise the widget definition WML code into
 # its own structures. The definitions define the looks of the widgets.
 set(wesnoth-gui_widget_definition_SRC
-	gui/auxiliary/widget_definition.cpp
+	gui/core/widget_definition.cpp
 )
 
 add_library(wesnoth-gui_widget_definition
@@ -805,10 +805,10 @@ set(wesnoth-main_SRC
 	game_preferences.cpp
 	game_state.cpp
 	generic_event.cpp
-	gui/auxiliary/canvas.cpp
-	gui/auxiliary/log.cpp
+	gui/core/canvas.cpp
+	gui/core/log.cpp
 	gui/auxiliary/old_markup.cpp
-	gui/auxiliary/timer.cpp
+	gui/core/timer.cpp
 	gui/dialogs/addon/description.cpp
 	gui/dialogs/addon/filter_options.cpp
 	gui/dialogs/addon/uninstall_list.cpp

src/SConscript

@@ -330,24 +330,24 @@ wesnoth_sources = Split("""
     game_launcher.cpp
     game_preferences.cpp
     game_state.cpp
-    gui/auxiliary/canvas.cpp
-    gui/auxiliary/event/dispatcher.cpp
-    gui/auxiliary/event/distributor.cpp
-    gui/auxiliary/event/handler.cpp
+    gui/core/canvas.cpp
+    gui/core/event/dispatcher.cpp
+    gui/core/event/distributor.cpp
+    gui/core/event/handler.cpp
     gui/auxiliary/iterator/iterator.cpp
     gui/auxiliary/iterator/walker_grid.cpp
     gui/auxiliary/iterator/walker_widget.cpp
-    gui/auxiliary/log.cpp
-    gui/auxiliary/placer.cpp
-    gui/auxiliary/placer/horizontal_list.cpp
-    gui/auxiliary/placer/vertical_list.cpp
+    gui/core/log.cpp
+    gui/core/placer.cpp
+    gui/core/placer/horizontal_list.cpp
+    gui/core/placer/vertical_list.cpp
     gui/auxiliary/old_markup.cpp
-    gui/auxiliary/timer.cpp
-    gui/auxiliary/tips.cpp
-    gui/auxiliary/widget_definition.cpp
-    gui/auxiliary/window_builder.cpp
-    gui/auxiliary/window_builder/helper.cpp
-    gui/auxiliary/window_builder/instance.cpp
+    gui/core/timer.cpp
+    gui/core/tips.cpp
+    gui/core/widget_definition.cpp
+    gui/core/window_builder.cpp
+    gui/core/window_builder/helper.cpp
+    gui/core/window_builder/instance.cpp
     gui/dialogs/addon/description.cpp
     gui/dialogs/addon/filter_options.cpp
     gui/dialogs/addon/uninstall_list.cpp

src/game_initialization/mp_options.cpp

@@ -15,7 +15,7 @@
 #include "mp_options.hpp"
 #include "gettext.hpp"
 #include "gui/auxiliary/find_widget.hpp"
-#include "gui/auxiliary/window_builder.hpp"
+#include "gui/core/window_builder.hpp"
 #include "gui/dialogs/transient_message.hpp"
 #include "gui/widgets/button.hpp"
 #include "gui/widgets/slider.hpp"

src/gui/auxiliary/formula.hpp

@@ -18,7 +18,7 @@
 #include "formula/callable.hpp"
 #include "formula/function.hpp"
 #include "formula/formula.hpp"
-#include "gui/auxiliary/log.hpp"
+#include "gui/core/log.hpp"
 #include "gui/widgets/helper.hpp"
 #include "serialization/string_utils.hpp"
 #include "util.hpp"

src/gui/auxiliary/iterator/policy_order.hpp

@@ -17,7 +17,7 @@
 
 #include "gui/auxiliary/iterator/exception.hpp"
 #include "gui/auxiliary/iterator/policy_visit.hpp"
-#include "gui/auxiliary/log.hpp"
+#include "gui/core/log.hpp"
 #include "gui/widgets/widget.hpp"
 
 #include <iostream>

src/gui/core/canvas.cpp

@@ -19,14 +19,14 @@
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
-#include "gui/auxiliary/canvas.hpp"
+#include "gui/core/canvas.hpp"
 
 #include "config.hpp"
 #include "image.hpp"
 #include "formatter.hpp"
 #include "gettext.hpp"
 #include "gui/auxiliary/formula.hpp"
-#include "gui/auxiliary/log.hpp"
+#include "gui/core/log.hpp"
 #include "gui/widgets/helper.hpp"
 #include "sdl/rect.hpp"
 #include "text.hpp"

src/gui/core/event/dispatcher.cpp

@@ -14,9 +14,9 @@
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
-#include "gui/auxiliary/event/dispatcher_private.hpp"
+#include "gui/core/event/dispatcher_private.hpp"
 
-#include "gui/auxiliary/log.hpp"
+#include "gui/core/log.hpp"
 
 namespace gui2
 {

src/gui/core/event/dispatcher.hpp

@@ -15,7 +15,7 @@
 #ifndef GUI_WIDGETS_AUXILIARY_EVENT_DISPATCHER_HPP_INCLUDED
 #define GUI_WIDGETS_AUXILIARY_EVENT_DISPATCHER_HPP_INCLUDED
 
-#include "gui/auxiliary/event/handler.hpp"
+#include "gui/core/event/handler.hpp"
 #include "hotkey/hotkey_command.hpp"
 #include "sdl/compat.hpp"
 #include "serialization/unicode_types.hpp"

src/gui/core/event/dispatcher_private.hpp

@@ -15,7 +15,7 @@
 #ifndef GUI_WIDGETS_AUXILIARY_EVENT_DISPATCHER_PRIVATE_HPP_INCLUDED
 #define GUI_WIDGETS_AUXILIARY_EVENT_DISPATCHER_PRIVATE_HPP_INCLUDED
 
-#include "gui/auxiliary/event/dispatcher.hpp"
+#include "gui/core/event/dispatcher.hpp"
 
 #include "gui/widgets/widget.hpp"
 

src/gui/core/event/distributor.cpp

@@ -14,11 +14,11 @@
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
-#include "gui/auxiliary/event/distributor.hpp"
+#include "gui/core/event/distributor.hpp"
 
 #include "events.hpp"
-#include "gui/auxiliary/log.hpp"
-#include "gui/auxiliary/timer.hpp"
+#include "gui/core/log.hpp"
+#include "gui/core/timer.hpp"
 #include "gui/widgets/settings.hpp"
 #include "gui/widgets/widget.hpp"
 #include "gui/widgets/window.hpp"

src/gui/core/event/distributor.hpp

@@ -38,9 +38,9 @@
  * contains the handling of the keyboard as well.
  */
 
-#include "gui/auxiliary/event/dispatcher.hpp"
-#include "gui/auxiliary/event/handler.hpp"
-#include "gui/lib/types/point.hpp"
+#include "gui/core/event/dispatcher.hpp"
+#include "gui/core/event/handler.hpp"
+#include "gui/core/point.hpp"
 #include "serialization/unicode_types.hpp"
 #include "video.hpp"
 

src/gui/core/event/handler.cpp

@@ -14,11 +14,11 @@
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
-#include "gui/auxiliary/event/handler.hpp"
+#include "gui/core/event/handler.hpp"
 
-#include "gui/auxiliary/event/dispatcher.hpp"
-#include "gui/auxiliary/timer.hpp"
-#include "gui/auxiliary/log.hpp"
+#include "gui/core/event/dispatcher.hpp"
+#include "gui/core/timer.hpp"
+#include "gui/core/log.hpp"
 #include "gui/widgets/helper.hpp"
 #include "gui/widgets/widget.hpp"
 #include "gui/widgets/window.hpp"

src/gui/core/log.cpp

@@ -19,7 +19,7 @@
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
-#include "gui/auxiliary/log.hpp"
+#include "gui/core/log.hpp"
 
 namespace gui2
 {

src/gui/core/notifier.hpp

@@ -15,7 +15,7 @@
 #ifndef GUI_WIDGETS_AUXILIARY_NOTIFIER_HPP_INCLUDED
 #define GUI_WIDGETS_AUXILIARY_NOTIFIER_HPP_INCLUDED
 
-#include "gui/auxiliary/notifiee.hpp"
+#include "gui/core/notifiee.hpp"
 #include "utils/foreach.hpp"
 
 #include <cassert>

src/gui/core/placer.cpp

@@ -14,11 +14,11 @@
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
-#include "gui/auxiliary/placer.hpp"
+#include "gui/core/placer.hpp"
 
 #include "asserts.hpp"
-#include "gui/auxiliary/placer/horizontal_list.hpp"
-#include "gui/auxiliary/placer/vertical_list.hpp"
+#include "gui/core/placer/horizontal_list.hpp"
+#include "gui/core/placer/vertical_list.hpp"
 
 
 namespace gui2

src/gui/core/placer/horizontal_list.cpp

@@ -14,9 +14,9 @@
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
-#include "gui/auxiliary/placer/horizontal_list.hpp"
+#include "gui/core/placer/horizontal_list.hpp"
 
-#include "gui/lib/types/point.hpp"
+#include "gui/core/point.hpp"
 
 #include <cassert>
 #include <numeric>

src/gui/core/placer/horizontal_list.hpp

@@ -20,7 +20,7 @@
 #ifndef GUI_AUXILIARY_PLACER_HORIZONTAL_LIST_HPP_INCLUDED
 #define GUI_AUXILIARY_PLACER_HORIZONTAL_LIST_HPP_INCLUDED
 
-#include "gui/auxiliary/placer.hpp"
+#include "gui/core/placer.hpp"
 
 #include <vector>
 

src/gui/core/placer/vertical_list.cpp

@@ -14,9 +14,9 @@
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
-#include "gui/auxiliary/placer/vertical_list.hpp"
+#include "gui/core/placer/vertical_list.hpp"
 
-#include "gui/lib/types/point.hpp"
+#include "gui/core/point.hpp"
 
 #include <cassert>
 #include <numeric>

src/gui/core/placer/vertical_list.hpp

@@ -20,7 +20,7 @@
 #ifndef GUI_AUXILIARY_PLACER_VERTICAL_LIST_HPP_INCLUDED
 #define GUI_AUXILIARY_PLACER_VERTICAL_LIST_HPP_INCLUDED
 
-#include "gui/auxiliary/placer.hpp"
+#include "gui/core/placer.hpp"
 
 #include <vector>
 

src/gui/core/point.cpp

@@ -14,7 +14,7 @@
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
-#include "gui/lib/types/point.hpp"
+#include "gui/core/point.hpp"
 
 #include <iostream>
 

src/gui/core/timer.cpp

@@ -12,10 +12,10 @@
    See the COPYING file for more details.
 */
 
-#include "gui/auxiliary/timer.hpp"
+#include "gui/core/timer.hpp"
 
 #include "events.hpp"
-#include "gui/auxiliary/log.hpp"
+#include "gui/core/log.hpp"
 
 #include <boost/static_assert.hpp>
 

src/gui/core/tips.cpp

@@ -14,7 +14,7 @@
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
-#include "gui/auxiliary/tips.hpp"
+#include "gui/core/tips.hpp"
 
 #include "config.hpp"
 #include "game_preferences.hpp"

src/gui/core/widget_definition.cpp

@@ -14,10 +14,10 @@
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
-#include "gui/auxiliary/widget_definition.hpp"
+#include "gui/core/widget_definition.hpp"
 
 #include "gettext.hpp"
-#include "gui/auxiliary/log.hpp"
+#include "gui/core/log.hpp"
 #include "gui/widgets/helper.hpp"
 #include "wml_exception.hpp"
 

src/gui/core/widget_definition.hpp

@@ -17,7 +17,7 @@
 
 #include "config.hpp"
 #include "font_options.hpp"
-#include "gui/auxiliary/canvas.hpp"
+#include "gui/core/canvas.hpp"
 #include "utils/foreach.hpp"
 
 namespace gui2

src/gui/core/window_builder.cpp

@@ -14,13 +14,13 @@
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
-#include "gui/auxiliary/window_builder.hpp"
+#include "gui/core/window_builder.hpp"
 
 #include "asserts.hpp"
 #include "gettext.hpp"
-#include "gui/auxiliary/log.hpp"
-#include "gui/auxiliary/window_builder/helper.hpp"
-#include "gui/auxiliary/window_builder/instance.hpp"
+#include "gui/core/log.hpp"
+#include "gui/core/window_builder/helper.hpp"
+#include "gui/core/window_builder/instance.hpp"
 #include "gui/widgets/button.hpp"
 #include "gui/widgets/combobox.hpp"
 #include "gui/widgets/drawing.hpp"

src/gui/core/window_builder/helper.cpp

@@ -14,10 +14,10 @@
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
-#include "gui/auxiliary/window_builder/helper.hpp"
+#include "gui/core/window_builder/helper.hpp"
 
 #include "config.hpp"
-#include "gui/auxiliary/log.hpp"
+#include "gui/core/log.hpp"
 #include "gui/widgets/grid.hpp"
 #include "gui/widgets/window.hpp"
 #include "utils/foreach.hpp"

src/gui/core/window_builder/instance.cpp

@@ -14,7 +14,7 @@
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
-#include "gui/auxiliary/window_builder/instance.hpp"
+#include "gui/core/window_builder/instance.hpp"
 
 #include "gui/widgets/spacer.hpp"
 

src/gui/core/window_builder/instance.hpp

@@ -15,7 +15,7 @@
 #ifndef GUI_AUXILIARY_WINDOW_BUILDER_INSTANCE_HPP_INCLUDED
 #define GUI_AUXILIARY_WINDOW_BUILDER_INSTANCE_HPP_INCLUDED
 
-#include "gui/auxiliary/window_builder.hpp"
+#include "gui/core/window_builder.hpp"
 
 #include "config.hpp"
 

src/gui/dialogs/data_manage.cpp

@@ -20,7 +20,7 @@
 #include "game_config.hpp"
 #include "game_preferences.hpp"
 #include "gettext.hpp"
-#include "gui/auxiliary/log.hpp"
+#include "gui/core/log.hpp"
 #include "gui/dialogs/field.hpp"
 #include "gui/dialogs/game_delete.hpp"
 #include "gui/dialogs/helper.hpp"

src/gui/dialogs/debug_clock.hpp

@@ -17,7 +17,7 @@
 
 #include "gui/dialogs/popup.hpp"
 
-#include "gui/auxiliary/event/dispatcher.hpp"
+#include "gui/core/event/dispatcher.hpp"
 
 namespace gui2
 {

src/gui/dialogs/game_load.cpp

@@ -21,7 +21,7 @@
 #include "game_config.hpp"
 #include "game_preferences.hpp"
 #include "game_classification.hpp"
-#include "gui/auxiliary/log.hpp"
+#include "gui/core/log.hpp"
 #include "gui/dialogs/field.hpp"
 #include "gui/dialogs/game_delete.hpp"
 #include "gui/dialogs/helper.hpp"

src/gui/dialogs/lobby_main.cpp

@@ -19,8 +19,8 @@
 #include "gui/dialogs/field.hpp"
 #include "gui/dialogs/helper.hpp"
 
-#include "gui/auxiliary/log.hpp"
-#include "gui/auxiliary/timer.hpp"
+#include "gui/core/log.hpp"
+#include "gui/core/timer.hpp"
 #include "gui/widgets/button.hpp"
 #include "gui/widgets/image.hpp"
 #include "gui/widgets/label.hpp"

src/gui/dialogs/lua_interpreter.cpp

@@ -17,7 +17,7 @@
 #include "gui/dialogs/lua_interpreter.hpp"
 
 #include "gui/auxiliary/find_widget.hpp"
-#include "gui/auxiliary/window_builder.hpp"
+#include "gui/core/window_builder.hpp"
 #include "gui/dialogs/field.hpp"
 #include "gui/dialogs/helper.hpp"
 #include "gui/widgets/button.hpp"

src/gui/dialogs/select_orb_colors.cpp

@@ -15,9 +15,9 @@
 
 #include "select_orb_colors.hpp"
 
-#include "gui/auxiliary/event/dispatcher.hpp"
 #include "gui/auxiliary/find_widget.hpp"
 #include "gui/auxiliary/iterator/walker.hpp"
+#include "gui/core/event/dispatcher.hpp"
 #include "gui/widgets/button.hpp"
 #include "gui/widgets/grid.hpp"
 #include "gui/widgets/settings.hpp"

src/gui/dialogs/title_screen.cpp

@@ -21,8 +21,8 @@
 #include "gettext.hpp"
 #include "log.hpp"
 #include "gui/auxiliary/find_widget.hpp"
-#include "gui/auxiliary/timer.hpp"
-#include "gui/auxiliary/tips.hpp"
+#include "gui/core/timer.hpp"
+#include "gui/core/tips.hpp"
 #include "gui/dialogs/debug_clock.hpp"
 #include "gui/dialogs/game_version.hpp"
 #include "gui/dialogs/language_selection.hpp"

src/gui/dialogs/unit_create.cpp

@@ -17,7 +17,7 @@
 #include "gui/dialogs/unit_create.hpp"
 
 #include "gui/auxiliary/find_widget.hpp"
-#include "gui/auxiliary/log.hpp"
+#include "gui/core/log.hpp"
 #include "gui/dialogs/helper.hpp"
 #ifdef GUI2_EXPERIMENTAL_LISTBOX
 #include "gui/widgets/list.hpp"

src/gui/widgets/button.cpp

@@ -16,11 +16,11 @@
 
 #include "gui/widgets/button.hpp"
 
-#include "gui/auxiliary/log.hpp"
+#include "gui/core/log.hpp"
 
-#include "gui/auxiliary/widget_definition.hpp"
-#include "gui/auxiliary/window_builder.hpp"
-#include "gui/auxiliary/window_builder/helper.hpp"
+#include "gui/core/widget_definition.hpp"
+#include "gui/core/window_builder.hpp"
+#include "gui/core/window_builder/helper.hpp"
 
 #include "gui/widgets/detail/register.hpp"
 #include "gui/widgets/settings.hpp"

src/gui/widgets/button.hpp

@@ -15,8 +15,8 @@
 #ifndef GUI_WIDGETS_BUTTON_HPP_INCLUDED
 #define GUI_WIDGETS_BUTTON_HPP_INCLUDED
 
-#include "gui/auxiliary/widget_definition.hpp"
-#include "gui/auxiliary/window_builder.hpp"
+#include "gui/core/widget_definition.hpp"
+#include "gui/core/window_builder.hpp"
 
 #include "gui/widgets/control.hpp"
 #include "gui/widgets/clickable.hpp"

src/gui/widgets/clickable.hpp

@@ -15,7 +15,7 @@
 #ifndef GUI_WIDGETS_CLICKABLE_HPP_INCLUDED
 #define GUI_WIDGETS_CLICKABLE_HPP_INCLUDED
 
-#include "gui/auxiliary/event/dispatcher.hpp"
+#include "gui/core/event/dispatcher.hpp"
 
 namespace gui2
 {

src/gui/widgets/combobox.cpp

@@ -16,10 +16,10 @@
 
 #include "gui/widgets/combobox.hpp"
 
-#include "gui/auxiliary/log.hpp"
-#include "gui/auxiliary/widget_definition.hpp"
-#include "gui/auxiliary/window_builder.hpp"
-#include "gui/auxiliary/window_builder/helper.hpp"
+#include "gui/core/log.hpp"
+#include "gui/core/widget_definition.hpp"
+#include "gui/core/window_builder.hpp"
+#include "gui/core/window_builder/helper.hpp"
 #include "gui/widgets/detail/register.hpp"
 #include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"

src/gui/widgets/combobox.hpp

@@ -14,8 +14,8 @@
 
 #pragma once
 
-#include "gui/auxiliary/widget_definition.hpp"
-#include "gui/auxiliary/window_builder.hpp"
+#include "gui/core/widget_definition.hpp"
+#include "gui/core/window_builder.hpp"
 
 #include "gui/widgets/control.hpp"
 #include "gui/widgets/selectable.hpp"

src/gui/widgets/container.cpp

@@ -16,7 +16,7 @@
 
 #include "gui/widgets/container.hpp"
 
-#include "gui/auxiliary/log.hpp"
+#include "gui/core/log.hpp"
 
 #define LOG_SCOPE_HEADER                                                       \
 	"tcontainer(" + get_control_type() + ") [" + id() + "] " + __func__

src/gui/widgets/container.hpp

@@ -17,7 +17,7 @@
 
 #include "gui/widgets/grid.hpp"
 #include "gui/widgets/control.hpp"
-#include "gui/auxiliary/window_builder.hpp"
+#include "gui/core/window_builder.hpp"
 
 namespace gui2
 {

src/gui/widgets/control.cpp

@@ -19,8 +19,8 @@
 #include "font.hpp"
 #include "formula/string_utils.hpp"
 #include "gui/auxiliary/iterator/walker_widget.hpp"
-#include "gui/auxiliary/log.hpp"
-#include "gui/auxiliary/event/message.hpp"
+#include "gui/core/log.hpp"
+#include "gui/core/event/message.hpp"
 #include "gui/dialogs/tip.hpp"
 #include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"

src/gui/widgets/control.hpp

@@ -15,8 +15,8 @@
 #ifndef GUI_WIDGETS_CONTROL_HPP_INCLUDED
 #define GUI_WIDGETS_CONTROL_HPP_INCLUDED
 
-#include "gui/auxiliary/widget_definition.hpp"
-#include "gui/auxiliary/window_builder.hpp"
+#include "gui/core/widget_definition.hpp"
+#include "gui/core/window_builder.hpp"
 #include "gui/widgets/widget.hpp"
 #include "../../text.hpp" // We want the file in src/
 

src/gui/widgets/drawing.cpp

@@ -16,8 +16,8 @@
 
 #include "gui/widgets/drawing.hpp"
 
-#include "gui/auxiliary/widget_definition.hpp"
-#include "gui/auxiliary/window_builder.hpp"
+#include "gui/core/widget_definition.hpp"
+#include "gui/core/window_builder.hpp"
 
 #include "gui/widgets/detail/register.hpp"
 #include "gui/widgets/settings.hpp"

src/gui/widgets/drawing.hpp

@@ -17,8 +17,8 @@
 
 #include "gui/widgets/control.hpp"
 
-#include "gui/auxiliary/widget_definition.hpp"
-#include "gui/auxiliary/window_builder.hpp"
+#include "gui/core/widget_definition.hpp"
+#include "gui/core/window_builder.hpp"
 
 namespace gui2
 {

src/gui/widgets/grid.cpp

@@ -17,8 +17,8 @@
 #include "gui/widgets/grid_private.hpp"
 
 #include "gui/auxiliary/iterator/walker_grid.hpp"
-#include "gui/auxiliary/log.hpp"
-#include "gui/auxiliary/layout_exception.hpp"
+#include "gui/core/log.hpp"
+#include "gui/core/layout_exception.hpp"
 #include "gui/widgets/control.hpp"
 #include "utils/foreach.hpp"
 

src/gui/widgets/group.hpp

@@ -14,7 +14,7 @@
 #ifndef GUI_WIDGETS_GROUP_HPP_INCLUDED
 #define GUI_WIDGETS_GROUP_HPP_INCLUDED
 
-#include "gui/auxiliary/event/dispatcher.hpp"
+#include "gui/core/event/dispatcher.hpp"
 #include "gui/widgets/selectable.hpp"
 #include "gui/widgets/widget.hpp"
 #include "utils/foreach.hpp"

src/gui/widgets/helper.cpp

@@ -16,8 +16,8 @@
 
 #include "gui/widgets/helper.hpp"
 
-#include "gui/auxiliary/log.hpp"
-#include "gui/lib/types/point.hpp"
+#include "gui/core/log.hpp"
+#include "gui/core/point.hpp"
 #include "gui/widgets/settings.hpp"
 #include "sdl/rect.hpp"
 #include "formula/callable.hpp"

src/gui/widgets/horizontal_scrollbar.cpp

@@ -19,8 +19,8 @@
 #include "gui/widgets/detail/register.hpp"
 #include "gui/widgets/settings.hpp"
 
-#include "gui/auxiliary/widget_definition.hpp"
-#include "gui/auxiliary/window_builder.hpp"
+#include "gui/core/widget_definition.hpp"
+#include "gui/core/window_builder.hpp"
 
 #include "wml_exception.hpp"
 

src/gui/widgets/horizontal_scrollbar.hpp

@@ -17,8 +17,8 @@
 
 #include "gui/widgets/scrollbar.hpp"
 
-#include "gui/auxiliary/widget_definition.hpp"
-#include "gui/auxiliary/window_builder.hpp"
+#include "gui/core/widget_definition.hpp"
+#include "gui/core/window_builder.hpp"
 
 namespace gui2
 {

src/gui/widgets/image.cpp

@@ -18,9 +18,9 @@
 
 #include "../../image.hpp" // We want the file in src/
 
-#include "gui/auxiliary/widget_definition.hpp"
-#include "gui/auxiliary/window_builder.hpp"
-#include "gui/auxiliary/log.hpp"
+#include "gui/core/widget_definition.hpp"
+#include "gui/core/window_builder.hpp"
+#include "gui/core/log.hpp"
 #include "gui/widgets/detail/register.hpp"
 #include "gui/widgets/settings.hpp"
 

src/gui/widgets/image.hpp

@@ -17,8 +17,8 @@
 
 #include "gui/widgets/control.hpp"
 
-#include "gui/auxiliary/widget_definition.hpp"
-#include "gui/auxiliary/window_builder.hpp"
+#include "gui/core/widget_definition.hpp"
+#include "gui/core/window_builder.hpp"
 
 namespace gui2
 {

src/gui/widgets/label.cpp

@@ -16,10 +16,10 @@
 
 #include "gui/widgets/label.hpp"
 
-#include "gui/auxiliary/log.hpp"
+#include "gui/core/log.hpp"
 
-#include "gui/auxiliary/widget_definition.hpp"
-#include "gui/auxiliary/window_builder.hpp"
+#include "gui/core/widget_definition.hpp"
+#include "gui/core/window_builder.hpp"
 #include "gui/dialogs/message.hpp"
 #include "gui/widgets/detail/register.hpp"
 #include "gui/widgets/settings.hpp"

src/gui/widgets/label.hpp

@@ -17,8 +17,8 @@
 
 #include "gui/widgets/control.hpp"
 
-#include "gui/auxiliary/widget_definition.hpp"
-#include "gui/auxiliary/window_builder.hpp"
+#include "gui/core/widget_definition.hpp"
+#include "gui/core/window_builder.hpp"
 
 namespace gui2
 {

src/gui/widgets/list.cpp

@@ -20,7 +20,7 @@
 #include "gui/widgets/listbox.hpp"
 
 #include "gui/auxiliary/find_widget.hpp"
-#include "gui/auxiliary/log.hpp"
+#include "gui/core/log.hpp"
 #include "gui/widgets/detail/register.hpp"
 #include "gui/widgets/selectable.hpp"
 #include "gui/widgets/settings.hpp"

src/gui/widgets/listbox.cpp

@@ -19,11 +19,11 @@
 #include "gui/widgets/listbox.hpp"
 
 #include "gui/auxiliary/find_widget.hpp"
-#include "gui/auxiliary/layout_exception.hpp"
-#include "gui/auxiliary/log.hpp"
-#include "gui/auxiliary/widget_definition.hpp"
-#include "gui/auxiliary/window_builder.hpp"
-#include "gui/auxiliary/window_builder/helper.hpp"
+#include "gui/core/layout_exception.hpp"
+#include "gui/core/log.hpp"
+#include "gui/core/widget_definition.hpp"
+#include "gui/core/window_builder.hpp"
+#include "gui/core/window_builder/helper.hpp"
 #include "gui/widgets/detail/register.hpp"
 #include "gui/widgets/pane.hpp"
 #include "gui/widgets/settings.hpp"

src/gui/widgets/listbox.hpp

@@ -20,8 +20,8 @@
 #include "gui/widgets/generator.hpp"
 #include "gui/widgets/scrollbar_container.hpp"
 
-#include "gui/auxiliary/widget_definition.hpp"
-#include "gui/auxiliary/window_builder.hpp"
+#include "gui/core/widget_definition.hpp"
+#include "gui/core/window_builder.hpp"
 
 namespace gui2
 {

src/gui/widgets/matrix.cpp

@@ -17,10 +17,10 @@
 #include "gui/widgets/matrix.hpp"
 
 #include "gui/auxiliary/find_widget.hpp"
-#include "gui/auxiliary/log.hpp"
-#include "gui/auxiliary/widget_definition.hpp"
-#include "gui/auxiliary/window_builder.hpp"
-#include "gui/auxiliary/window_builder/helper.hpp"
+#include "gui/core/log.hpp"
+#include "gui/core/widget_definition.hpp"
+#include "gui/core/window_builder.hpp"
+#include "gui/core/window_builder/helper.hpp"
 #include "gui/widgets/detail/register.hpp"
 #include "gui/widgets/settings.hpp"
 

src/gui/widgets/matrix.hpp

@@ -19,8 +19,8 @@
 #include "gui/widgets/pane.hpp"
 #include "gui/widgets/scrollbar_container.hpp"
 
-#include "gui/auxiliary/widget_definition.hpp"
-#include "gui/auxiliary/window_builder.hpp"
+#include "gui/core/widget_definition.hpp"
+#include "gui/core/window_builder.hpp"
 
 namespace gui2
 {

src/gui/widgets/minimap.cpp

@@ -16,9 +16,9 @@
 
 #include "gui/widgets/minimap.hpp"
 
-#include "gui/auxiliary/log.hpp"
-#include "gui/auxiliary/widget_definition.hpp"
-#include "gui/auxiliary/window_builder.hpp"
+#include "gui/core/log.hpp"
+#include "gui/core/widget_definition.hpp"
+#include "gui/core/window_builder.hpp"
 #include "gui/widgets/detail/register.hpp"
 #include "gui/widgets/settings.hpp"
 #include "map/map.hpp"

src/gui/widgets/minimap.hpp

@@ -17,8 +17,8 @@
 
 #include "gui/widgets/control.hpp"
 
-#include "gui/auxiliary/widget_definition.hpp"
-#include "gui/auxiliary/window_builder.hpp"
+#include "gui/core/widget_definition.hpp"
+#include "gui/core/window_builder.hpp"
 
 class config;
 

src/gui/widgets/multi_page.hpp

@@ -18,8 +18,8 @@
 
 #include "gui/widgets/container.hpp"
 
-#include "gui/auxiliary/widget_definition.hpp"
-#include "gui/auxiliary/window_builder.hpp"
+#include "gui/core/widget_definition.hpp"
+#include "gui/core/window_builder.hpp"
 
 namespace gui2
 {

src/gui/widgets/pane.cpp

@@ -17,11 +17,11 @@
 #include "gui/widgets/pane.hpp"
 
 #include "gui/auxiliary/find_widget.hpp"
-#include "gui/auxiliary/log.hpp"
+#include "gui/core/log.hpp"
 #include "gui/widgets/grid.hpp"
 #include "gui/widgets/window.hpp"
 #include "utils/const_clone.hpp"
-#include "gui/auxiliary/event/message.hpp"
+#include "gui/core/event/message.hpp"
 #include "gettext.hpp"
 
 #include <boost/bind.hpp>

src/gui/widgets/pane.hpp

@@ -16,8 +16,8 @@
 #define GUI_WIDGETS_PANE_HPP_INCLUDED
 
 #include "gui/widgets/widget.hpp"
-#include "gui/auxiliary/window_builder.hpp"
-#include "gui/auxiliary/placer.hpp"
+#include "gui/core/window_builder.hpp"
+#include "gui/core/placer.hpp"
 
 #include "utils/boost_function_guarded.hpp"
 

src/gui/widgets/panel.cpp

@@ -16,7 +16,7 @@
 
 #include "gui/widgets/panel.hpp"
 
-#include "gui/auxiliary/log.hpp"
+#include "gui/core/log.hpp"
 #include "gui/widgets/detail/register.hpp"
 #include "gui/widgets/settings.hpp"
 #include "gettext.hpp"

src/gui/widgets/panel.hpp

@@ -17,8 +17,8 @@
 
 #include "gui/widgets/container.hpp"
 
-#include "gui/auxiliary/widget_definition.hpp"
-#include "gui/auxiliary/window_builder.hpp"
+#include "gui/core/widget_definition.hpp"
+#include "gui/core/window_builder.hpp"
 
 namespace gui2
 {

src/gui/widgets/password_box.cpp

@@ -18,7 +18,7 @@
 
 #include "gui/widgets/password_box.hpp"
 
-#include "gui/auxiliary/log.hpp"
+#include "gui/core/log.hpp"
 #include "gui/widgets/detail/register.hpp"
 #include "gui/widgets/settings.hpp"
 #include "serialization/string_utils.hpp"

src/gui/widgets/progress_bar.cpp

@@ -16,7 +16,7 @@
 
 #include "gui/widgets/progress_bar.hpp"
 
-#include "gui/auxiliary/log.hpp"
+#include "gui/core/log.hpp"
 #include "gui/widgets/detail/register.hpp"
 #include "gui/widgets/settings.hpp"
 #include "utils/foreach.hpp"

src/gui/widgets/progress_bar.hpp

@@ -17,8 +17,8 @@
 
 #include "gui/widgets/control.hpp"
 
-#include "gui/auxiliary/widget_definition.hpp"
-#include "gui/auxiliary/window_builder.hpp"
+#include "gui/core/widget_definition.hpp"
+#include "gui/core/window_builder.hpp"
 
 namespace gui2
 {

src/gui/widgets/repeating_button.cpp

@@ -16,8 +16,8 @@
 
 #include "gui/widgets/repeating_button.hpp"
 
-#include "gui/auxiliary/log.hpp"
-#include "gui/auxiliary/timer.hpp"
+#include "gui/core/log.hpp"
+#include "gui/core/timer.hpp"
 #include "gui/widgets/detail/register.hpp"
 #include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"

src/gui/widgets/repeating_button.hpp

@@ -18,8 +18,8 @@
 #include "gui/widgets/control.hpp"
 #include "gui/widgets/clickable.hpp"
 
-#include "gui/auxiliary/widget_definition.hpp"
-#include "gui/auxiliary/window_builder.hpp"
+#include "gui/core/widget_definition.hpp"
+#include "gui/core/window_builder.hpp"
 
 namespace gui2
 {

src/gui/widgets/scroll_label.cpp

@@ -18,8 +18,8 @@
 
 #include "gui/widgets/label.hpp"
 #include "gui/auxiliary/find_widget.hpp"
-#include "gui/auxiliary/log.hpp"
-#include "gui/auxiliary/window_builder/helper.hpp"
+#include "gui/core/log.hpp"
+#include "gui/core/window_builder/helper.hpp"
 #include "gui/widgets/detail/register.hpp"
 #include "gui/widgets/settings.hpp"
 #include "gui/widgets/scrollbar.hpp"

src/gui/widgets/scroll_label.hpp

@@ -17,8 +17,8 @@
 
 #include "gui/widgets/scrollbar_container.hpp"
 
-#include "gui/auxiliary/widget_definition.hpp"
-#include "gui/auxiliary/window_builder.hpp"
+#include "gui/core/widget_definition.hpp"
+#include "gui/core/window_builder.hpp"
 
 namespace gui2
 {

src/gui/widgets/scrollbar.cpp

@@ -16,7 +16,7 @@
 
 #include "gui/widgets/scrollbar.hpp"
 
-#include "gui/auxiliary/log.hpp"
+#include "gui/core/log.hpp"
 #include "gui/widgets/window.hpp" // Needed for invalidate_layout()
 #include "utils/foreach.hpp"
 

src/gui/widgets/scrollbar.hpp

@@ -15,7 +15,7 @@
 #ifndef GUI_WIDGETS_SCROLLBAR_HPP_INCLUDED
 #define GUI_WIDGETS_SCROLLBAR_HPP_INCLUDED
 
-#include "gui/auxiliary/notifier.hpp"
+#include "gui/core/notifier.hpp"
 #include "gui/widgets/control.hpp"
 
 #include "utils/boost_function_guarded.hpp"

src/gui/widgets/scrollbar_container.cpp

@@ -17,8 +17,8 @@
 #include "gui/widgets/scrollbar_container_private.hpp"
 
 #include "gui/auxiliary/find_widget.hpp"
-#include "gui/auxiliary/log.hpp"
-#include "gui/auxiliary/layout_exception.hpp"
+#include "gui/core/log.hpp"
+#include "gui/core/layout_exception.hpp"
 #include "gui/widgets/clickable.hpp"
 #include "gui/widgets/spacer.hpp"
 #include "gui/widgets/window.hpp"

src/gui/widgets/scrollbar_container.hpp

@@ -15,7 +15,7 @@
 #ifndef GUI_WIDGETS_SCROLLBAR_CONTAINER_HPP_INCLUDED
 #define GUI_WIDGETS_SCROLLBAR_CONTAINER_HPP_INCLUDED
 
-#include "gui/auxiliary/notifiee.hpp"
+#include "gui/core/notifiee.hpp"
 #include "gui/widgets/container.hpp"
 #include "gui/widgets/scrollbar.hpp"
 

src/gui/widgets/scrollbar_panel.cpp

@@ -18,7 +18,7 @@
 
 #include "gui/widgets/detail/register.hpp"
 #include "gui/widgets/settings.hpp"
-#include "gui/auxiliary/window_builder/helper.hpp"
+#include "gui/core/window_builder/helper.hpp"
 
 #include "gettext.hpp"
 #include "wml_exception.hpp"

src/gui/widgets/scrollbar_panel.hpp

@@ -17,8 +17,8 @@
 
 #include "gui/widgets/scrollbar_container.hpp"
 
-#include "gui/auxiliary/widget_definition.hpp"
-#include "gui/auxiliary/window_builder.hpp"
+#include "gui/core/widget_definition.hpp"
+#include "gui/core/window_builder.hpp"
 
 namespace gui2
 {

src/gui/widgets/settings.cpp

@@ -25,8 +25,8 @@
 #include "config_cache.hpp"
 #include "filesystem.hpp"
 #include "gettext.hpp"
-#include "gui/auxiliary/log.hpp"
-#include "gui/auxiliary/tips.hpp"
+#include "gui/core/log.hpp"
+#include "gui/core/tips.hpp"
 #include "gui/widgets/window.hpp"
 #include "serialization/parser.hpp"
 #include "serialization/preprocessor.hpp"

src/gui/widgets/settings.hpp

@@ -23,8 +23,8 @@
 #include "utils/foreach.hpp"
 #include "utils/boost_function_guarded.hpp"
 #include "config.hpp"
-#include "gui/auxiliary/widget_definition.hpp"
-#include "gui/auxiliary/window_builder.hpp"
+#include "gui/core/widget_definition.hpp"
+#include "gui/core/window_builder.hpp"
 #include "tstring.hpp"
 
 #include <string>

src/gui/widgets/slider.cpp

@@ -17,7 +17,7 @@
 #include "gui/widgets/slider.hpp"
 
 #include "formatter.hpp"
-#include "gui/auxiliary/log.hpp"
+#include "gui/core/log.hpp"
 #include "gui/widgets/window.hpp"
 #include "gui/widgets/detail/register.hpp"
 #include "gui/widgets/settings.hpp"

src/gui/widgets/slider.hpp

@@ -18,8 +18,8 @@
 #include "gui/widgets/integer_selector.hpp"
 #include "gui/widgets/scrollbar.hpp"
 
-#include "gui/auxiliary/widget_definition.hpp"
-#include "gui/auxiliary/window_builder.hpp"
+#include "gui/core/widget_definition.hpp"
+#include "gui/core/window_builder.hpp"
 
 namespace gui2
 {