diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp
index a88f56aa02..ccc2249fc6 100644
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@@ -236,7 +236,7 @@ static const WindowDesc _ai_list_desc(
 	WDP_CENTER, WDP_CENTER, 200, 234, 200, 234,
 	WC_AI_LIST, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE,
-	NULL, _nested_ai_list_widgets, lengthof(_nested_ai_list_widgets)
+	_nested_ai_list_widgets, lengthof(_nested_ai_list_widgets)
 );
 
 static void ShowAIListWindow(CompanyID slot)
@@ -435,7 +435,7 @@ static const WindowDesc _ai_settings_desc(
 	WDP_CENTER, WDP_CENTER, 200, 208, 500, 208,
 	WC_AI_SETTINGS, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE,
-	NULL, _nested_ai_settings_widgets, lengthof(_nested_ai_settings_widgets)
+	_nested_ai_settings_widgets, lengthof(_nested_ai_settings_widgets)
 );
 
 static void ShowAISettingsWindow(CompanyID slot)
@@ -484,7 +484,7 @@ static const WindowDesc _ai_config_desc(
 	WDP_CENTER, WDP_CENTER, 300, 172, 300, 172,
 	WC_GAME_OPTIONS, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
-	NULL, _nested_ai_config_widgets, lengthof(_nested_ai_config_widgets)
+	_nested_ai_config_widgets, lengthof(_nested_ai_config_widgets)
 );
 
 /**
@@ -952,7 +952,7 @@ static const WindowDesc _ai_debug_desc(
 	WDP_AUTO, WDP_AUTO, 299, 241, 299, 241,
 	WC_AI_DEBUG, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_RESIZABLE,
-	NULL, _nested_ai_debug_widgets, lengthof(_nested_ai_debug_widgets)
+	_nested_ai_debug_widgets, lengthof(_nested_ai_debug_widgets)
 );
 
 void ShowAIDebugWindow(CompanyID show_company)
diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp
index 9ae53029c8..2fec6b4399 100644
--- a/src/airport_gui.cpp
+++ b/src/airport_gui.cpp
@@ -154,7 +154,7 @@ static const WindowDesc _air_toolbar_desc(
 	WDP_ALIGN_TBR, 22, 64, 36, 64, 36,
 	WC_BUILD_TOOLBAR, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_CONSTRUCTION,
-	NULL, _nested_air_toolbar_widgets, lengthof(_nested_air_toolbar_widgets)
+	_nested_air_toolbar_widgets, lengthof(_nested_air_toolbar_widgets)
 );
 
 void ShowBuildAirToolbar()
@@ -387,7 +387,7 @@ static const WindowDesc _build_airport_desc(
 	WDP_AUTO, WDP_AUTO, 148, 245, 148, 245,
 	WC_BUILD_STATION, WC_BUILD_TOOLBAR,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION,
-	NULL, _nested_build_airport_widgets, lengthof(_nested_build_airport_widgets)
+	_nested_build_airport_widgets, lengthof(_nested_build_airport_widgets)
 );
 
 static void ShowBuildAirportPicker(Window *parent)
diff --git a/src/autoreplace_gui.cpp b/src/autoreplace_gui.cpp
index 7441db8fba..cbf7f45887 100644
--- a/src/autoreplace_gui.cpp
+++ b/src/autoreplace_gui.cpp
@@ -528,7 +528,7 @@ static const WindowDesc _replace_rail_vehicle_desc(
 	WDP_AUTO, WDP_AUTO, 456, 140, 456, 140,
 	WC_REPLACE_VEHICLE, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE | WDF_CONSTRUCTION,
-	NULL, _nested_replace_rail_vehicle_widgets, lengthof(_nested_replace_rail_vehicle_widgets)
+	_nested_replace_rail_vehicle_widgets, lengthof(_nested_replace_rail_vehicle_widgets)
 );
 
 static const NWidgetPart _nested_replace_vehicle_widgets[] = {
@@ -559,7 +559,7 @@ static const WindowDesc _replace_vehicle_desc(
 	WDP_AUTO, WDP_AUTO, 456, 118, 456, 118,
 	WC_REPLACE_VEHICLE, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE | WDF_CONSTRUCTION,
-	NULL, _nested_replace_vehicle_widgets, lengthof(_nested_replace_vehicle_widgets)
+	_nested_replace_vehicle_widgets, lengthof(_nested_replace_vehicle_widgets)
 );
 
 void ShowReplaceGroupVehicleWindow(GroupID id_g, VehicleType vehicletype)
diff --git a/src/bridge_gui.cpp b/src/bridge_gui.cpp
index 6eb7904759..0f30cb4232 100644
--- a/src/bridge_gui.cpp
+++ b/src/bridge_gui.cpp
@@ -342,7 +342,7 @@ static const WindowDesc _build_bridge_desc(
 	WDP_AUTO, WDP_AUTO, 200, 114, 200, 114,
 	WC_BUILD_BRIDGE, WC_BUILD_TOOLBAR,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_RESIZABLE | WDF_CONSTRUCTION,
-	NULL, _nested_build_bridge_widgets, lengthof(_nested_build_bridge_widgets)
+	_nested_build_bridge_widgets, lengthof(_nested_build_bridge_widgets)
 );
 
 /**
diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp
index 80d84e5a06..7e6a678fab 100644
--- a/src/build_vehicle_gui.cpp
+++ b/src/build_vehicle_gui.cpp
@@ -1187,7 +1187,7 @@ static const WindowDesc _build_vehicle_desc(
 	WDP_AUTO, WDP_AUTO, 240, 186, 240, 268,
 	WC_BUILD_VEHICLE, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE | WDF_CONSTRUCTION,
-	NULL, _nested_build_vehicle_widgets, lengthof(_nested_build_vehicle_widgets)
+	_nested_build_vehicle_widgets, lengthof(_nested_build_vehicle_widgets)
 );
 
 void ShowBuildVehicleWindow(TileIndex tile, VehicleType type)
diff --git a/src/cheat_gui.cpp b/src/cheat_gui.cpp
index 3922e9c587..878f1edfe8 100644
--- a/src/cheat_gui.cpp
+++ b/src/cheat_gui.cpp
@@ -311,7 +311,7 @@ static const WindowDesc _cheats_desc(
 	240, 22, 0, 0, 0, 0,
 	WC_CHEATS, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
-	NULL, _nested_cheat_widgets, lengthof(_nested_cheat_widgets)
+	_nested_cheat_widgets, lengthof(_nested_cheat_widgets)
 );
 
 
diff --git a/src/company_gui.cpp b/src/company_gui.cpp
index 6d72f9a25e..e6a98f6b26 100644
--- a/src/company_gui.cpp
+++ b/src/company_gui.cpp
@@ -461,7 +461,7 @@ static const WindowDesc _company_finances_desc(
 	WDP_AUTO, WDP_AUTO, 0, 0, 0, 0,
 	WC_FINANCES, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON,
-	NULL, _nested_company_finances_widgets, lengthof(_nested_company_finances_widgets)
+	_nested_company_finances_widgets, lengthof(_nested_company_finances_widgets)
 );
 
 /** Open the finances window of a company.
@@ -801,7 +801,7 @@ static const WindowDesc _select_company_livery_desc(
 	WDP_AUTO, WDP_AUTO, 0, 0, 0, 0,
 	WC_COMPANY_COLOUR, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
-	NULL, _nested_select_company_livery_widgets, lengthof(_nested_select_company_livery_widgets)
+	_nested_select_company_livery_widgets, lengthof(_nested_select_company_livery_widgets)
 );
 
 /**
@@ -1382,7 +1382,7 @@ static const WindowDesc _select_company_manager_face_desc(
 	WDP_AUTO, WDP_AUTO, 190, 163, 190, 163,
 	WC_COMPANY_MANAGER_FACE, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION,
-	NULL, _nested_select_company_manager_face_widgets, lengthof(_nested_select_company_manager_face_widgets)
+	_nested_select_company_manager_face_widgets, lengthof(_nested_select_company_manager_face_widgets)
 );
 
 /** advanced company manager face selection window description */
@@ -1390,7 +1390,7 @@ static const WindowDesc _select_company_manager_face_adv_desc(
 	WDP_AUTO, WDP_AUTO, 220, 220, 220, 220,
 	WC_COMPANY_MANAGER_FACE, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION,
-	NULL, _nested_select_company_manager_face_adv_widgets, lengthof(_nested_select_company_manager_face_adv_widgets)
+	_nested_select_company_manager_face_adv_widgets, lengthof(_nested_select_company_manager_face_adv_widgets)
 );
 
 /**
@@ -1427,23 +1427,6 @@ enum CompanyWindowWidgets {
 	CW_WIDGET_COMPANY_JOIN,
 };
 
-static const Widget _company_widgets[] = {
-{   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_GREY,     0,    10,     0,    13, STR_BLACK_CROSS,                        STR_TOOLTIP_CLOSE_WINDOW},
-{    WWT_CAPTION,   RESIZE_NONE,  COLOUR_GREY,    11,   359,     0,    13, STR_COMPANY_VIEW_CAPTION,               STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   359,    14,   157, 0x0,                                    STR_NULL},
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,     0,    89,   158,   169, STR_COMPANY_VIEW_NEW_FACE_BUTTON,       STR_COMPANY_VIEW_NEW_FACE_TOOLTIP},
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,    90,   179,   158,   169, STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON,  STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP},
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   180,   269,   158,   169, STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON, STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP},
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   270,   359,   158,   169, STR_COMPANY_VIEW_COMPANY_NAME_BUTTON,   STR_COMPANY_VIEW_COMPANY_NAME_TOOLTIP},
-{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,   266,   355,    18,    29, STR_COMPANY_VIEW_VIEW_HQ_BUTTON,        STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP},
-{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,   266,   355,    32,    43, STR_COMPANY_VIEW_RELOCATE_HQ,                        STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS},
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,     0,   179,   158,   169, STR_COMPANY_VIEW_BUY_SHARE_BUTTON,      STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP},
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   180,   359,   158,   169, STR_COMPANY_VIEW_SELL_SHARE_BUTTON,     STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP},
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   266,   355,   138,   149, STR_COMPANY_VIEW_PASSWORD,                   STR_COMPANY_VIEW_PASSWORD_TOOLTIP},
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   266,   355,   138,   149, STR_COMPANY_VIEW_JOIN,                       STR_COMPANY_VIEW_JOIN_TOOLTIP},
-{   WIDGETS_END},
-};
-
 static const NWidgetPart _nested_company_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_GREY, CW_WIDGET_CLOSEBOX),
@@ -1784,7 +1767,7 @@ static const WindowDesc _company_desc(
 	WDP_AUTO, WDP_AUTO, 360, 170, 360, 170,
 	WC_COMPANY, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
-	_company_widgets, _nested_company_widgets,lengthof(_nested_company_widgets)
+	_nested_company_widgets, lengthof(_nested_company_widgets)
 );
 
 void ShowCompany(CompanyID company)
@@ -1896,7 +1879,7 @@ static const WindowDesc _buy_company_desc(
 	153, 171, 334, 137, 334, 137,
 	WC_BUY_COMPANY, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION,
-	NULL, _nested_buy_company_widgets, lengthof(_nested_buy_company_widgets)
+	_nested_buy_company_widgets, lengthof(_nested_buy_company_widgets)
 );
 
 
diff --git a/src/console_gui.cpp b/src/console_gui.cpp
index 4c0a2c1761..8de4b43aa7 100644
--- a/src/console_gui.cpp
+++ b/src/console_gui.cpp
@@ -161,7 +161,7 @@ static const WindowDesc _console_window_desc(
 	0, 0, 0, 0, 0, 0,
 	WC_CONSOLE, WC_NONE,
 	0,
-	NULL, _nested_console_window_widgets, lengthof(_nested_console_window_widgets)
+	_nested_console_window_widgets, lengthof(_nested_console_window_widgets)
 );
 
 struct IConsoleWindow : Window
diff --git a/src/depot_gui.cpp b/src/depot_gui.cpp
index 0617ab4352..4b06bc576d 100644
--- a/src/depot_gui.cpp
+++ b/src/depot_gui.cpp
@@ -95,28 +95,28 @@ static const WindowDesc _train_depot_desc(
 	WDP_AUTO, WDP_AUTO, 36, 27, 362, 123,
 	WC_VEHICLE_DEPOT, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
-	NULL, _nested_train_depot_widgets, lengthof(_nested_train_depot_widgets)
+	_nested_train_depot_widgets, lengthof(_nested_train_depot_widgets)
 );
 
 static const WindowDesc _road_depot_desc(
 	WDP_AUTO, WDP_AUTO, 36, 27, 316, 97,
 	WC_VEHICLE_DEPOT, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
-	NULL, _nested_train_depot_widgets, lengthof(_nested_train_depot_widgets)
+	_nested_train_depot_widgets, lengthof(_nested_train_depot_widgets)
 );
 
 static const WindowDesc _ship_depot_desc(
 	WDP_AUTO, WDP_AUTO, 36, 27, 306, 99,
 	WC_VEHICLE_DEPOT, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
-	NULL, _nested_train_depot_widgets, lengthof(_nested_train_depot_widgets)
+	_nested_train_depot_widgets, lengthof(_nested_train_depot_widgets)
 );
 
 static const WindowDesc _aircraft_depot_desc(
 	WDP_AUTO, WDP_AUTO, 36, 27, 332, 99,
 	WC_VEHICLE_DEPOT, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
-	NULL, _nested_train_depot_widgets, lengthof(_nested_train_depot_widgets)
+	_nested_train_depot_widgets, lengthof(_nested_train_depot_widgets)
 );
 
 extern void DepotSortList(VehicleList *list);
diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp
index b55d6a1317..b538a5f9ad 100644
--- a/src/dock_gui.cpp
+++ b/src/dock_gui.cpp
@@ -288,7 +288,7 @@ static const WindowDesc _build_docks_toolbar_desc(
 	WDP_ALIGN_TBR, 22, 160, 36, 160, 36,
 	WC_BUILD_TOOLBAR, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_CONSTRUCTION,
-	NULL, _nested_build_docks_toolbar_widgets, lengthof(_nested_build_docks_toolbar_widgets)
+	_nested_build_docks_toolbar_widgets, lengthof(_nested_build_docks_toolbar_widgets)
 );
 
 void ShowBuildDocksToolbar()
@@ -324,7 +324,7 @@ static const WindowDesc _build_docks_scen_toolbar_desc(
 	WDP_AUTO, WDP_AUTO, 115, 36, 115, 36,
 	WC_SCEN_BUILD_TOOLBAR, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_CONSTRUCTION,
-	NULL, _nested_build_docks_scen_toolbar_widgets, lengthof(_nested_build_docks_scen_toolbar_widgets)
+	_nested_build_docks_scen_toolbar_widgets, lengthof(_nested_build_docks_scen_toolbar_widgets)
 );
 
 void ShowBuildDocksScenToolbar()
@@ -421,7 +421,7 @@ static const WindowDesc _build_dock_station_desc(
 	WDP_AUTO, WDP_AUTO, 148, 75, 148, 75,
 	WC_BUILD_STATION, WC_BUILD_TOOLBAR,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION,
-	NULL, _nested_build_dock_station_widgets, lengthof(_nested_build_dock_station_widgets)
+	_nested_build_dock_station_widgets, lengthof(_nested_build_dock_station_widgets)
 );
 
 static void ShowBuildDockStationPicker(Window *parent)
@@ -507,7 +507,7 @@ static const WindowDesc _build_docks_depot_desc(
 	WDP_AUTO, WDP_AUTO, 204, 86, 204, 86,
 	WC_BUILD_DEPOT, WC_BUILD_TOOLBAR,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION,
-	NULL, _nested_build_docks_depot_widgets, lengthof(_nested_build_docks_depot_widgets)
+	_nested_build_docks_depot_widgets, lengthof(_nested_build_docks_depot_widgets)
 );
 
 
diff --git a/src/engine_gui.cpp b/src/engine_gui.cpp
index 023bab0a10..0ce2428bce 100644
--- a/src/engine_gui.cpp
+++ b/src/engine_gui.cpp
@@ -127,7 +127,7 @@ static const WindowDesc _engine_preview_desc(
 	WDP_CENTER, WDP_CENTER, 300, 192, 300, 192,
 	WC_ENGINE_PREVIEW, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION,
-	NULL, _nested_engine_preview_widgets, lengthof(_nested_engine_preview_widgets)
+	_nested_engine_preview_widgets, lengthof(_nested_engine_preview_widgets)
 );
 
 
diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp
index d89f134fdb..98ffa9e824 100644
--- a/src/genworld_gui.cpp
+++ b/src/genworld_gui.cpp
@@ -765,14 +765,14 @@ static const WindowDesc _generate_landscape_desc(
 	WDP_CENTER, WDP_CENTER, 338, 313, 338, 313,
 	WC_GENERATE_LANDSCAPE, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
-	NULL, _nested_generate_landscape_widgets, lengthof(_nested_generate_landscape_widgets)
+	_nested_generate_landscape_widgets, lengthof(_nested_generate_landscape_widgets)
 );
 
 static const WindowDesc _heightmap_load_desc(
 	WDP_CENTER, WDP_CENTER, 338, 236, 338, 236,
 	WC_GENERATE_LANDSCAPE, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_STD_BTN | WDF_UNCLICK_BUTTONS,
-	NULL, _nested_heightmap_load_widgets, lengthof(_nested_heightmap_load_widgets)
+	_nested_heightmap_load_widgets, lengthof(_nested_heightmap_load_widgets)
 );
 
 static void _ShowGenerateLandscape(glwp_modes mode)
@@ -1074,7 +1074,7 @@ static const WindowDesc _create_scenario_desc(
 	WDP_CENTER, WDP_CENTER, 338, 170, 338, 170,
 	WC_GENERATE_LANDSCAPE, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_STD_BTN | WDF_UNCLICK_BUTTONS,
-	NULL, _nested_create_scenario_widgets, lengthof(_nested_create_scenario_widgets)
+	_nested_create_scenario_widgets, lengthof(_nested_create_scenario_widgets)
 );
 
 void ShowCreateScenario()
@@ -1109,7 +1109,7 @@ static const WindowDesc _generate_progress_desc(
 	WDP_CENTER, WDP_CENTER, 181, 97, 181, 97,
 	WC_GENERATE_PROGRESS_WINDOW, WC_NONE,
 	WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
-	NULL, _nested_generate_progress_widgets, lengthof(_nested_generate_progress_widgets)
+	_nested_generate_progress_widgets, lengthof(_nested_generate_progress_widgets)
 );
 
 struct tp_info {
diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp
index f5e0f068ae..40df2c1573 100644
--- a/src/graph_gui.cpp
+++ b/src/graph_gui.cpp
@@ -143,7 +143,7 @@ static const WindowDesc _graph_legend_desc(
 	WDP_AUTO, WDP_AUTO, 250, 196, 250, 196,
 	WC_GRAPH_LEGEND, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
-	NULL, _nested_graph_legend_widgets, lengthof(_nested_graph_legend_widgets)
+	_nested_graph_legend_widgets, lengthof(_nested_graph_legend_widgets)
 );
 
 static void ShowGraphLegend()
@@ -529,7 +529,7 @@ static const WindowDesc _operating_profit_desc(
 	WDP_AUTO, WDP_AUTO, 576, 174, 576, 174,
 	WC_OPERATING_PROFIT, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
-	NULL, _nested_operating_profit_widgets, lengthof(_nested_operating_profit_widgets)
+	_nested_operating_profit_widgets, lengthof(_nested_operating_profit_widgets)
 );
 
 
@@ -570,7 +570,7 @@ static const WindowDesc _income_graph_desc(
 	WDP_AUTO, WDP_AUTO, 576, 142, 576, 142,
 	WC_INCOME_GRAPH, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
-	NULL, _nested_income_graph_widgets, lengthof(_nested_income_graph_widgets)
+	_nested_income_graph_widgets, lengthof(_nested_income_graph_widgets)
 );
 
 void ShowIncomeGraph()
@@ -608,7 +608,7 @@ static const WindowDesc _delivered_cargo_graph_desc(
 	WDP_AUTO, WDP_AUTO, 576, 142, 576, 142,
 	WC_DELIVERED_CARGO, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
-	NULL, _nested_delivered_cargo_graph_widgets, lengthof(_nested_delivered_cargo_graph_widgets)
+	_nested_delivered_cargo_graph_widgets, lengthof(_nested_delivered_cargo_graph_widgets)
 );
 
 void ShowDeliveredCargoGraph()
@@ -662,7 +662,7 @@ static const WindowDesc _performance_history_desc(
 	WDP_AUTO, WDP_AUTO, 576, 238, 576, 238,
 	WC_PERFORMANCE_HISTORY, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
-	NULL, _nested_performance_history_widgets, lengthof(_nested_performance_history_widgets)
+	_nested_performance_history_widgets, lengthof(_nested_performance_history_widgets)
 );
 
 void ShowPerformanceHistoryGraph()
@@ -700,7 +700,7 @@ static const WindowDesc _company_value_graph_desc(
 	WDP_AUTO, WDP_AUTO, 576, 238, 576, 238,
 	WC_COMPANY_VALUE, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
-	NULL, _nested_company_value_graph_widgets, lengthof(_nested_company_value_graph_widgets)
+	_nested_company_value_graph_widgets, lengthof(_nested_company_value_graph_widgets)
 );
 
 void ShowCompanyValueGraph()
@@ -862,7 +862,7 @@ static const WindowDesc _cargo_payment_rates_desc(
 	WDP_AUTO, WDP_AUTO, 568, 46, 568, 46,
 	WC_PAYMENT_RATES, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
-	NULL, _nested_cargo_payment_rates_widgets, lengthof(_nested_cargo_payment_rates_widgets)
+	_nested_cargo_payment_rates_widgets, lengthof(_nested_cargo_payment_rates_widgets)
 );
 
 
@@ -992,7 +992,7 @@ static const WindowDesc _company_league_desc(
 	WDP_AUTO, WDP_AUTO, 400, 167, 400, 167,
 	WC_COMPANY_LEAGUE, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,
-	NULL, _nested_company_league_widgets, lengthof(_nested_company_league_widgets)
+	_nested_company_league_widgets, lengthof(_nested_company_league_widgets)
 );
 
 void ShowCompanyLeagueTable()
@@ -1275,7 +1275,7 @@ static const WindowDesc _performance_rating_detail_desc(
 	WDP_AUTO, WDP_AUTO, 299, 241, 299, 241,
 	WC_PERFORMANCE_DETAIL, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
-	NULL, _nested_performance_rating_detail_widgets, lengthof(_nested_performance_rating_detail_widgets)
+	_nested_performance_rating_detail_widgets, lengthof(_nested_performance_rating_detail_widgets)
 );
 
 void ShowPerformanceRatingDetail()
diff --git a/src/group_gui.cpp b/src/group_gui.cpp
index 1364e357e5..bf5e553202 100644
--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -686,14 +686,14 @@ static WindowDesc _other_group_desc(
 	WDP_AUTO, WDP_AUTO, 460, 194, 460, 246,
 	WC_INVALID, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
-	NULL, _nested_group_widgets, lengthof(_nested_group_widgets)
+	_nested_group_widgets, lengthof(_nested_group_widgets)
 );
 
 const static WindowDesc _train_group_desc(
 	WDP_AUTO, WDP_AUTO, 525, 194, 525, 246,
 	WC_TRAINS_LIST, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
-	NULL, _nested_group_widgets, lengthof(_nested_group_widgets)
+	_nested_group_widgets, lengthof(_nested_group_widgets)
 );
 
 void ShowCompanyGroup(CompanyID company, VehicleType vehicle_type)
diff --git a/src/highscore_gui.cpp b/src/highscore_gui.cpp
index 3ae8cfa142..d23e3310e8 100644
--- a/src/highscore_gui.cpp
+++ b/src/highscore_gui.cpp
@@ -182,14 +182,14 @@ static const WindowDesc _highscore_desc(
 	0, 0, 641, 481, 641, 481,
 	WC_HIGHSCORE, WC_NONE,
 	0,
-	NULL, _nested_highscore_widgets, lengthof(_nested_highscore_widgets)
+	_nested_highscore_widgets, lengthof(_nested_highscore_widgets)
 );
 
 static const WindowDesc _endgame_desc(
 	0, 0, 641, 481, 641, 481,
 	WC_ENDSCREEN, WC_NONE,
 	0,
-	NULL, _nested_highscore_widgets, lengthof(_nested_highscore_widgets)
+	_nested_highscore_widgets, lengthof(_nested_highscore_widgets)
 );
 
 /** Show the highscore table for a given difficulty. When called from
diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp
index 57e2f58fb6..37563de68f 100644
--- a/src/industry_gui.cpp
+++ b/src/industry_gui.cpp
@@ -128,7 +128,7 @@ static const WindowDesc _build_industry_desc(
 	WDP_AUTO, WDP_AUTO, 170, 212, 170, 212,
 	WC_BUILD_INDUSTRY, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_RESIZABLE | WDF_CONSTRUCTION,
-	NULL, _nested_build_industry_widgets, lengthof(_nested_build_industry_widgets)
+	_nested_build_industry_widgets, lengthof(_nested_build_industry_widgets)
 );
 
 /** Build (fund or prospect) a new industry, */
@@ -823,7 +823,7 @@ static const WindowDesc _industry_view_desc(
 	WDP_AUTO, WDP_AUTO, 260, 120, 260, 120,
 	WC_INDUSTRY_VIEW, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
-	NULL, _nested_industry_view_widgets, lengthof(_nested_industry_view_widgets)
+	_nested_industry_view_widgets, lengthof(_nested_industry_view_widgets)
 );
 
 void ShowIndustryViewWindow(int industry)
@@ -1200,7 +1200,7 @@ static const WindowDesc _industry_directory_desc(
 	WDP_AUTO, WDP_AUTO, 428, 190, 428, 190,
 	WC_INDUSTRY_DIRECTORY, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
-	NULL, _nested_industry_directory_widgets, lengthof(_nested_industry_directory_widgets)
+	_nested_industry_directory_widgets, lengthof(_nested_industry_directory_widgets)
 );
 
 void ShowIndustryDirectory()
diff --git a/src/intro_gui.cpp b/src/intro_gui.cpp
index ce636f61aa..4aca99a203 100644
--- a/src/intro_gui.cpp
+++ b/src/intro_gui.cpp
@@ -254,7 +254,6 @@ static const WindowDesc _select_game_desc(
 	WDP_CENTER, WDP_CENTER, 336, 213, 336, 213,
 	WC_SELECT_GAME, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
-	NULL,
 	_nested_select_game_widgets, lengthof(_nested_select_game_widgets)
 );
 
diff --git a/src/main_gui.cpp b/src/main_gui.cpp
index 8fcb1f2008..bf7dd90e13 100644
--- a/src/main_gui.cpp
+++ b/src/main_gui.cpp
@@ -203,7 +203,7 @@ static const WindowDesc _main_window_desc(
 	0, 0, 0, 0, 0, 0,
 	WC_MAIN_WINDOW, WC_NONE,
 	0,
-	NULL, _nested_main_window_widgets, lengthof(_nested_main_window_widgets)
+	_nested_main_window_widgets, lengthof(_nested_main_window_widgets)
 );
 
 struct MainWindow : Window
diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp
index eea17b11ef..5494042447 100644
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@@ -75,7 +75,7 @@ static const WindowDesc _land_info_desc(
 	WDP_AUTO, WDP_AUTO, 0, 0, 0, 0,
 	WC_LAND_INFO, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
-	NULL, _nested_land_info_widgets, lengthof(_nested_land_info_widgets)
+	_nested_land_info_widgets, lengthof(_nested_land_info_widgets)
 );
 
 class LandInfoWindow : public Window {
@@ -349,7 +349,7 @@ static const WindowDesc _about_desc(
 	WDP_CENTER, WDP_CENTER, 0, 0, 0, 0,
 	WC_GAME_OPTIONS, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
-	NULL, _nested_about_widgets, lengthof(_nested_about_widgets)
+	_nested_about_widgets, lengthof(_nested_about_widgets)
 );
 
 static const char * const _credits[] = {
@@ -509,7 +509,7 @@ static const WindowDesc _errmsg_desc(
 	0, 0, 240, 46, 240, 46, // x/y position is not used.
 	WC_ERRMSG, WC_NONE,
 	WDF_STD_BTN | WDF_DEF_WIDGET,
-	NULL, _nested_errmsg_widgets, lengthof(_nested_errmsg_widgets)
+	_nested_errmsg_widgets, lengthof(_nested_errmsg_widgets)
 );
 
 static const NWidgetPart _nested_errmsg_face_widgets[] = {
@@ -529,7 +529,7 @@ static const WindowDesc _errmsg_face_desc(
 	0, 0, 334, 137, 334, 137, // x/y position is not used.
 	WC_ERRMSG, WC_NONE,
 	WDF_STD_BTN | WDF_DEF_WIDGET,
-	NULL, _nested_errmsg_face_widgets, lengthof(_nested_errmsg_face_widgets)
+	_nested_errmsg_face_widgets, lengthof(_nested_errmsg_face_widgets)
 );
 
 /** Window class for displaying an error message window. */
@@ -776,7 +776,7 @@ static const WindowDesc _tool_tips_desc(
 	100, 100, 0, 0, 0, 0, // Coordinates and sizes are not used,
 	WC_TOOLTIPS, WC_NONE,
 	0,
-	NULL, _nested_tooltips_widgets, lengthof(_nested_tooltips_widgets)
+	_nested_tooltips_widgets, lengthof(_nested_tooltips_widgets)
 );
 
 /** Window for displaying a tooltip. */
@@ -1459,7 +1459,7 @@ static const WindowDesc _query_string_desc(
 	190, 219, 260, 42, 260, 42,
 	WC_QUERY_STRING, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
-	NULL, _nested_query_string_widgets, lengthof(_nested_query_string_widgets)
+	_nested_query_string_widgets, lengthof(_nested_query_string_widgets)
 );
 
 /** Show a query popup window with a textbox in it.
@@ -1614,7 +1614,7 @@ static const WindowDesc _query_desc(
 	WDP_CENTER, WDP_CENTER, 210, 82, 210, 82,
 	WC_CONFIRM_POPUP_QUERY, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_UNCLICK_BUTTONS | WDF_DEF_WIDGET | WDF_MODAL,
-	NULL, _nested_query_widgets, lengthof(_nested_query_widgets)
+	_nested_query_widgets, lengthof(_nested_query_widgets)
 );
 
 /** Show a modal confirmation window with standard 'yes' and 'no' buttons
@@ -2062,14 +2062,14 @@ static const WindowDesc _load_dialog_desc(
 	WDP_CENTER, WDP_CENTER, 257, 154, 257, 294,
 	WC_SAVELOAD, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_STD_BTN | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE,
-	NULL, _nested_load_dialog_widgets, lengthof(_nested_load_dialog_widgets)
+	_nested_load_dialog_widgets, lengthof(_nested_load_dialog_widgets)
 );
 
 static const WindowDesc _save_dialog_desc(
 	WDP_CENTER, WDP_CENTER, 257, 180, 257, 320,
 	WC_SAVELOAD, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_STD_BTN | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE,
-	NULL, _nested_save_dialog_widgets, lengthof(_nested_save_dialog_widgets)
+	_nested_save_dialog_widgets, lengthof(_nested_save_dialog_widgets)
 );
 
 /** These values are used to convert the file/operations mode into a corresponding file type.
diff --git a/src/music_gui.cpp b/src/music_gui.cpp
index 4e3023d2f2..37fa6baba3 100644
--- a/src/music_gui.cpp
+++ b/src/music_gui.cpp
@@ -413,7 +413,7 @@ static const WindowDesc _music_track_selection_desc(
 	104, 131, 432, 218, 432, 218,
 	WC_MUSIC_TRACK_SELECTION, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
-	NULL, _nested_music_track_selection_widgets, lengthof(_nested_music_track_selection_widgets)
+	_nested_music_track_selection_widgets, lengthof(_nested_music_track_selection_widgets)
 );
 
 static void ShowMusicTrackSelection()
@@ -675,7 +675,7 @@ static const WindowDesc _music_window_desc(
 	0, 22, 300, 66, 300, 66,
 	WC_MUSIC_WINDOW, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
-	NULL, _nested_music_window_widgets, lengthof(_nested_music_window_widgets)
+	_nested_music_window_widgets, lengthof(_nested_music_window_widgets)
 );
 
 void ShowMusicWindow()
diff --git a/src/network/network_chat_gui.cpp b/src/network/network_chat_gui.cpp
index 1b5b132902..242048b1fb 100644
--- a/src/network/network_chat_gui.cpp
+++ b/src/network/network_chat_gui.cpp
@@ -546,7 +546,7 @@ static const WindowDesc _chat_window_desc(
 	WDP_CENTER, 0, 320, 14, 640, 14, // x, y, width, height
 	WC_SEND_NETWORK_MSG, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET,
-	NULL, _nested_chat_window_widgets, lengthof(_nested_chat_window_widgets)
+	_nested_chat_window_widgets, lengthof(_nested_chat_window_widgets)
 );
 
 void ShowNetworkChatQueryWindow(DestType type, int dest)
diff --git a/src/network/network_content_gui.cpp b/src/network/network_content_gui.cpp
index 2e07a7bc74..5678aa04de 100644
--- a/src/network/network_content_gui.cpp
+++ b/src/network/network_content_gui.cpp
@@ -50,7 +50,7 @@ static const WindowDesc _network_content_download_status_window_desc(
 	WDP_CENTER, WDP_CENTER, 350, 85, 350, 85,
 	WC_NETWORK_STATUS_WINDOW, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_MODAL,
-	NULL, _nested_network_content_download_status_window_widgets, lengthof(_nested_network_content_download_status_window_widgets)
+	_nested_network_content_download_status_window_widgets, lengthof(_nested_network_content_download_status_window_widgets)
 );
 
 /** Window for showing the download status of content */
@@ -874,7 +874,7 @@ static const WindowDesc _network_content_list_desc(
 	WDP_CENTER, WDP_CENTER, 450, 278, 630, 460,
 	WC_NETWORK_WINDOW, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_STD_BTN | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE,
-	NULL, _nested_network_content_list_widgets, lengthof(_nested_network_content_list_widgets)
+	_nested_network_content_list_widgets, lengthof(_nested_network_content_list_widgets)
 );
 
 /**
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index e43ea6ef26..779a463b0e 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -1014,7 +1014,7 @@ static const WindowDesc _network_game_window_desc(
 	WDP_CENTER, WDP_CENTER, 450, 264, 1000, 730,
 	WC_NETWORK_WINDOW, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_STD_BTN | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE,
-	NULL, _nested_network_game_widgets, lengthof(_nested_network_game_widgets)
+	_nested_network_game_widgets, lengthof(_nested_network_game_widgets)
 );
 
 void ShowNetworkGameWindow()
@@ -1431,7 +1431,7 @@ static const WindowDesc _network_start_server_window_desc(
 	WDP_CENTER, WDP_CENTER, 420, 244, 420, 244,
 	WC_NETWORK_WINDOW, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
-	NULL, _nested_network_start_server_window_widgets, lengthof(_nested_network_start_server_window_widgets)
+	_nested_network_start_server_window_widgets, lengthof(_nested_network_start_server_window_widgets)
 );
 
 static void ShowNetworkStartServerWindow()
@@ -1722,7 +1722,7 @@ static const WindowDesc _network_lobby_window_desc(
 	WDP_CENTER, WDP_CENTER, 0, 0, 0, 0,
 	WC_NETWORK_WINDOW, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE,
-	NULL, _nested_network_lobby_window_widgets, lengthof(_nested_network_lobby_window_widgets)
+	_nested_network_lobby_window_widgets, lengthof(_nested_network_lobby_window_widgets)
 );
 
 /* Show the networklobbywindow with the selected server
@@ -1765,7 +1765,7 @@ static const WindowDesc _client_list_popup_desc(
 	WDP_AUTO, WDP_AUTO, 150, 1, 150, 1,
 	WC_TOOLBAR_MENU, WC_CLIENT_LIST,
 	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET,
-	NULL, _nested_client_list_popup_widgets, lengthof(_nested_client_list_popup_widgets)
+	_nested_client_list_popup_widgets, lengthof(_nested_client_list_popup_widgets)
 );
 
 /* Finds the Xth client-info that is active */
@@ -1981,7 +1981,7 @@ static const WindowDesc _client_list_desc(
 	WDP_AUTO, WDP_AUTO, 250, 16, 250, 16,
 	WC_CLIENT_LIST, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_RESIZABLE,
-	NULL, _nested_client_list_widgets, lengthof(_nested_client_list_widgets)
+	_nested_client_list_widgets, lengthof(_nested_client_list_widgets)
 );
 
 /**
@@ -2220,7 +2220,7 @@ static const WindowDesc _network_join_status_window_desc(
 	WDP_CENTER, WDP_CENTER, 250, 85, 250, 85,
 	WC_NETWORK_STATUS_WINDOW, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_MODAL,
-	NULL, _nested_network_join_status_window_widgets, lengthof(_nested_network_join_status_window_widgets)
+	_nested_network_join_status_window_widgets, lengthof(_nested_network_join_status_window_widgets)
 );
 
 void ShowJoinStatusWindow()
@@ -2345,7 +2345,7 @@ static const WindowDesc _network_company_password_window_desc(
 	WDP_AUTO, WDP_AUTO, 300, 63, 300, 63,
 	WC_COMPANY_PASSWORD_WINDOW, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON,
-	NULL, _nested_network_company_password_window_widgets, lengthof(_nested_network_company_password_window_widgets)
+	_nested_network_company_password_window_widgets, lengthof(_nested_network_company_password_window_widgets)
 );
 
 void ShowNetworkCompanyPasswordWindow(Window *parent)
diff --git a/src/newgrf_gui.cpp b/src/newgrf_gui.cpp
index 579193c29b..7980733b23 100644
--- a/src/newgrf_gui.cpp
+++ b/src/newgrf_gui.cpp
@@ -491,7 +491,7 @@ static const WindowDesc _newgrf_add_dlg_desc(
 	WDP_CENTER, WDP_CENTER, 0, 0, 306, 347,
 	WC_SAVELOAD, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_STD_BTN | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE,
-	NULL, _nested_newgrf_add_dlg_widgets, lengthof(_nested_newgrf_add_dlg_widgets)
+	_nested_newgrf_add_dlg_widgets, lengthof(_nested_newgrf_add_dlg_widgets)
 );
 
 static GRFPresetList _grf_preset_list;
@@ -1045,7 +1045,7 @@ static const WindowDesc _newgrf_desc(
 	WDP_CENTER, WDP_CENTER, 300, 263, 300, 263,
 	WC_GAME_OPTIONS, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE,
-	NULL, _nested_newgrf_widgets, lengthof(_nested_newgrf_widgets)
+	_nested_newgrf_widgets, lengthof(_nested_newgrf_widgets)
 );
 
 /** Callback function for the newgrf 'apply changes' confirmation window
diff --git a/src/news_gui.cpp b/src/news_gui.cpp
index 84eb246659..8f94646b8c 100644
--- a/src/news_gui.cpp
+++ b/src/news_gui.cpp
@@ -109,7 +109,7 @@ static WindowDesc _normal_news_desc(
 	WDP_CENTER, 476, 430, 170, 430, 170,
 	WC_NEWS_WINDOW, WC_NONE,
 	WDF_DEF_WIDGET,
-	NULL, _nested_normal_news_widgets, lengthof(_nested_normal_news_widgets)
+	_nested_normal_news_widgets, lengthof(_nested_normal_news_widgets)
 );
 
 /* New vehicles news items. */
@@ -136,7 +136,7 @@ static WindowDesc _vehicle_news_desc(
 	WDP_CENTER, 476, 430, 170, 430, 170,
 	WC_NEWS_WINDOW, WC_NONE,
 	WDF_DEF_WIDGET,
-	NULL, _nested_vehicle_news_widgets, lengthof(_nested_vehicle_news_widgets)
+	_nested_vehicle_news_widgets, lengthof(_nested_vehicle_news_widgets)
 );
 
 /* Company news items. */
@@ -167,7 +167,7 @@ static WindowDesc _company_news_desc(
 	WDP_CENTER, 476, 430, 170, 430, 170,
 	WC_NEWS_WINDOW, WC_NONE,
 	WDF_DEF_WIDGET,
-	NULL, _nested_company_news_widgets, lengthof(_nested_company_news_widgets)
+	_nested_company_news_widgets, lengthof(_nested_company_news_widgets)
 );
 
 /* Thin news items. */
@@ -190,7 +190,7 @@ static WindowDesc _thin_news_desc(
 	WDP_CENTER, 476, 430, 130, 430, 130,
 	WC_NEWS_WINDOW, WC_NONE,
 	WDF_DEF_WIDGET,
-	NULL, _nested_thin_news_widgets, lengthof(_nested_thin_news_widgets)
+	_nested_thin_news_widgets, lengthof(_nested_thin_news_widgets)
 );
 
 /* Small news items. */
@@ -214,7 +214,7 @@ static WindowDesc _small_news_desc(
 	WDP_CENTER, 476, 280, 87, 280, 87,
 	WC_NEWS_WINDOW, WC_NONE,
 	WDF_DEF_WIDGET,
-	NULL, _nested_small_news_widgets, lengthof(_nested_small_news_widgets)
+	_nested_small_news_widgets, lengthof(_nested_small_news_widgets)
 );
 
 /**
@@ -1023,7 +1023,7 @@ static const WindowDesc _message_history_desc(
 	240, 22, 400, 140, 400, 140,
 	WC_MESSAGE_HISTORY, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
-	NULL, _nested_message_history, lengthof(_nested_message_history)
+	_nested_message_history, lengthof(_nested_message_history)
 );
 
 /** Display window with news messages history */
@@ -1311,7 +1311,7 @@ static const WindowDesc _message_options_desc(
 	270,  22,  0, 0, 0, 0,
 	WC_GAME_OPTIONS, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
-	NULL, _nested_message_options_widgets, lengthof(_nested_message_options_widgets)
+	_nested_message_options_widgets, lengthof(_nested_message_options_widgets)
 );
 
 void ShowMessageOptions()
diff --git a/src/order_gui.cpp b/src/order_gui.cpp
index 65ed865cb2..36f5dba410 100644
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -1345,7 +1345,7 @@ static const WindowDesc _orders_train_desc(
 	WDP_AUTO, WDP_AUTO, 384, 100, 384, 100,
 	WC_VEHICLE_ORDERS, WC_VEHICLE_VIEW,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_RESIZABLE,
-	NULL, _nested_orders_train_widgets, lengthof(_nested_orders_train_widgets)
+	_nested_orders_train_widgets, lengthof(_nested_orders_train_widgets)
 );
 
 /** Nested widget definition for "your" orders (non-train). */
@@ -1409,7 +1409,7 @@ static const WindowDesc _orders_desc(
 	WDP_AUTO, WDP_AUTO, 384, 100, 384, 100,
 	WC_VEHICLE_ORDERS, WC_VEHICLE_VIEW,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_RESIZABLE,
-	NULL, _nested_orders_widgets, lengthof(_nested_orders_widgets)
+	_nested_orders_widgets, lengthof(_nested_orders_widgets)
 );
 
 /** Nested widget definition for competitor orders. */
@@ -1435,7 +1435,7 @@ static const WindowDesc _other_orders_desc(
 	WDP_AUTO, WDP_AUTO, 384, 86, 384, 86,
 	WC_VEHICLE_ORDERS, WC_VEHICLE_VIEW,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE | WDF_CONSTRUCTION,
-	NULL, _nested_other_orders_widgets, lengthof(_nested_other_orders_widgets)
+	_nested_other_orders_widgets, lengthof(_nested_other_orders_widgets)
 );
 
 void ShowOrdersWindow(const Vehicle *v)
diff --git a/src/osk_gui.cpp b/src/osk_gui.cpp
index 4b66e98b0c..a9897b3b47 100644
--- a/src/osk_gui.cpp
+++ b/src/osk_gui.cpp
@@ -394,7 +394,7 @@ static const WindowDesc _osk_desc(
 	WDP_CENTER, WDP_CENTER, 256, 140, 256, 140,
 	WC_OSK, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
-	NULL, _nested_osk_widgets, lengthof(_nested_osk_widgets)
+	_nested_osk_widgets, lengthof(_nested_osk_widgets)
 );
 
 /**
diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp
index b435eb626b..ebd09c26b1 100644
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -862,7 +862,7 @@ static const WindowDesc _build_rail_desc(
 	WDP_ALIGN_TBR, 22, 350, 36, 350, 36,
 	WC_BUILD_TOOLBAR, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_CONSTRUCTION,
-	NULL, _nested_build_rail_widgets, lengthof(_nested_build_rail_widgets)
+	_nested_build_rail_widgets, lengthof(_nested_build_rail_widgets)
 );
 
 
@@ -1472,7 +1472,7 @@ static const WindowDesc _station_builder_desc(
 	WDP_AUTO, WDP_AUTO, 148, 200, 148, 200,
 	WC_BUILD_STATION, WC_BUILD_TOOLBAR,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION,
-	NULL, _nested_station_builder_widgets, lengthof(_nested_station_builder_widgets)
+	_nested_station_builder_widgets, lengthof(_nested_station_builder_widgets)
 );
 
 /** High level window description of the newGRF station-build window */
@@ -1480,7 +1480,7 @@ static const WindowDesc _newstation_builder_desc(
 	WDP_AUTO, WDP_AUTO, 148, 290, 148, 290,
 	WC_BUILD_STATION, WC_BUILD_TOOLBAR,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION,
-	NULL, _nested_newstation_builder_widgets, lengthof(_nested_newstation_builder_widgets)
+	_nested_newstation_builder_widgets, lengthof(_nested_newstation_builder_widgets)
 );
 
 /** Open station build window */
@@ -1687,7 +1687,7 @@ static const WindowDesc _signal_builder_desc(
 	WDP_AUTO, WDP_AUTO, 154, 68, 154, 68,
 	WC_BUILD_SIGNAL, WC_BUILD_TOOLBAR,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION,
-	NULL, _nested_signal_builder_widgets, lengthof(_nested_signal_builder_widgets)
+	_nested_signal_builder_widgets, lengthof(_nested_signal_builder_widgets)
 );
 
 /**
@@ -1780,7 +1780,7 @@ static const WindowDesc _build_depot_desc(
 	WDP_AUTO, WDP_AUTO, 140, 122, 140, 122,
 	WC_BUILD_DEPOT, WC_BUILD_TOOLBAR,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION,
-	NULL, _nested_build_depot_widgets, lengthof(_nested_build_depot_widgets)
+	_nested_build_depot_widgets, lengthof(_nested_build_depot_widgets)
 );
 
 static void ShowBuildTrainDepotPicker(Window *parent)
@@ -1882,7 +1882,7 @@ static const WindowDesc _build_waypoint_desc(
 	WDP_AUTO, WDP_AUTO, 344, 92, 344, 92,
 	WC_BUILD_DEPOT, WC_BUILD_TOOLBAR,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION,
-	NULL, _nested_build_waypoint_widgets, lengthof(_nested_build_waypoint_widgets)
+	_nested_build_waypoint_widgets, lengthof(_nested_build_waypoint_widgets)
 );
 
 static void ShowBuildWaypointPicker(Window *parent)
diff --git a/src/road_gui.cpp b/src/road_gui.cpp
index 0b4939cfc6..e56edbe593 100644
--- a/src/road_gui.cpp
+++ b/src/road_gui.cpp
@@ -666,7 +666,7 @@ static const WindowDesc _build_road_desc(
 	WDP_ALIGN_TBR, 22, 263, 36, 263, 36,
 	WC_BUILD_TOOLBAR, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_CONSTRUCTION,
-	NULL, _nested_build_road_widgets, lengthof(_nested_build_road_widgets)
+	_nested_build_road_widgets, lengthof(_nested_build_road_widgets)
 );
 
 static const NWidgetPart _nested_build_tramway_widgets[] = {
@@ -704,7 +704,7 @@ static const WindowDesc _build_tramway_desc(
 	WDP_ALIGN_TBR, 22, 241, 36, 241, 36,
 	WC_BUILD_TOOLBAR, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_CONSTRUCTION,
-	NULL, _nested_build_tramway_widgets, lengthof(_nested_build_tramway_widgets)
+	_nested_build_tramway_widgets, lengthof(_nested_build_tramway_widgets)
 );
 
 void ShowBuildRoadToolbar(RoadType roadtype)
@@ -746,7 +746,7 @@ static const WindowDesc _build_road_scen_desc(
 	WDP_AUTO, WDP_AUTO, 197, 36, 197, 36,
 	WC_SCEN_BUILD_TOOLBAR, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_CONSTRUCTION,
-	NULL, _nested_build_road_scen_widgets, lengthof(_nested_build_road_scen_widgets)
+	_nested_build_road_scen_widgets, lengthof(_nested_build_road_scen_widgets)
 );
 
 void ShowBuildRoadScenToolbar()
@@ -846,7 +846,7 @@ static const WindowDesc _build_road_depot_desc(
 	WDP_AUTO, WDP_AUTO, 140, 122, 140, 122,
 	WC_BUILD_DEPOT, WC_BUILD_TOOLBAR,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION,
-	NULL, _nested_build_road_depot_widgets, lengthof(_nested_build_road_depot_widgets)
+	_nested_build_road_depot_widgets, lengthof(_nested_build_road_depot_widgets)
 );
 
 static void ShowRoadDepotPicker(Window *parent)
@@ -1011,7 +1011,7 @@ static const WindowDesc _rv_station_picker_desc(
 	WDP_AUTO, WDP_AUTO, 207, 178, 207, 178,
 	WC_BUS_STATION, WC_BUILD_TOOLBAR,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION,
-	NULL, _nested_rv_station_picker_widgets, lengthof(_nested_rv_station_picker_widgets)
+	_nested_rv_station_picker_widgets, lengthof(_nested_rv_station_picker_widgets)
 );
 
 static void ShowRVStationPicker(Window *parent, RoadStopType rs)
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
index ad77dd6a0b..3849d53dcf 100644
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -492,7 +492,7 @@ static const WindowDesc _game_options_desc(
 	WDP_CENTER, WDP_CENTER, 370, 249, 370, 249,
 	WC_GAME_OPTIONS, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
-	NULL, _nested_game_options_widgets, lengthof(_nested_game_options_widgets)
+	_nested_game_options_widgets, lengthof(_nested_game_options_widgets)
 );
 
 
@@ -770,7 +770,7 @@ static const WindowDesc _game_difficulty_desc(
 	WDP_CENTER, WDP_CENTER, 370, 279, 370, 279,
 	WC_GAME_OPTIONS, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
-	NULL, _nested_game_difficulty_widgets, lengthof(_nested_game_difficulty_widgets)
+	_nested_game_difficulty_widgets, lengthof(_nested_game_difficulty_widgets)
 );
 
 void ShowGameDifficulty()
@@ -1656,7 +1656,7 @@ static const WindowDesc _settings_selection_desc(
 	WDP_CENTER, WDP_CENTER, 412, 188, 450, 397,
 	WC_GAME_OPTIONS, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_RESIZABLE,
-	NULL, _nested_settings_selection_widgets, lengthof(_nested_settings_selection_widgets)
+	_nested_settings_selection_widgets, lengthof(_nested_settings_selection_widgets)
 );
 
 void ShowGameSettings()
@@ -1938,7 +1938,7 @@ static const WindowDesc _cust_currency_desc(
 	WDP_CENTER, WDP_CENTER, 230, 120, 230, 120,
 	WC_CUSTOM_CURRENCY, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
-	NULL, _nested_cust_currency_widgets, lengthof(_nested_cust_currency_widgets)
+	_nested_cust_currency_widgets, lengthof(_nested_cust_currency_widgets)
 );
 
 static void ShowCustCurrency()
diff --git a/src/signs_gui.cpp b/src/signs_gui.cpp
index e6fc427c06..212e7f5b02 100644
--- a/src/signs_gui.cpp
+++ b/src/signs_gui.cpp
@@ -206,7 +206,7 @@ static const WindowDesc _sign_list_desc(
 	WDP_AUTO, WDP_AUTO, 0, 0, 358, 138,
 	WC_SIGN_LIST, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_RESIZABLE,
-	NULL, _nested_sign_list_widgets, lengthof(_nested_sign_list_widgets)
+	_nested_sign_list_widgets, lengthof(_nested_sign_list_widgets)
 );
 
 
@@ -404,7 +404,7 @@ static const WindowDesc _query_sign_edit_desc(
 	190, 170, 260, 42, 260, 42,
 	WC_QUERY_STRING, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION | WDF_UNCLICK_BUTTONS,
-	NULL, _nested_query_sign_edit_widgets, lengthof(_nested_query_sign_edit_widgets)
+	_nested_query_sign_edit_widgets, lengthof(_nested_query_sign_edit_widgets)
 );
 
 void HandleClickOnSign(const Sign *si)
diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp
index 98779441e3..a9bb68492b 100644
--- a/src/smallmap_gui.cpp
+++ b/src/smallmap_gui.cpp
@@ -1151,7 +1151,7 @@ static const WindowDesc _smallmap_desc(
 	WDP_AUTO, WDP_AUTO, 350, 214, 446, 314,
 	WC_SMALLMAP, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_RESIZABLE | WDF_UNCLICK_BUTTONS,
-	NULL, _nested_smallmap_widgets, lengthof(_nested_smallmap_widgets)
+	_nested_smallmap_widgets, lengthof(_nested_smallmap_widgets)
 );
 
 void ShowSmallMap()
diff --git a/src/station_gui.cpp b/src/station_gui.cpp
index a81f034266..d0ee9d4d94 100644
--- a/src/station_gui.cpp
+++ b/src/station_gui.cpp
@@ -664,7 +664,7 @@ static const WindowDesc _company_stations_desc(
 	WDP_AUTO, WDP_AUTO, 358, 162, 358, 162,
 	WC_STATION_LIST, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_RESIZABLE,
-	NULL, _nested_company_stations_widgets, lengthof(_nested_company_stations_widgets)
+	_nested_company_stations_widgets, lengthof(_nested_company_stations_widgets)
 );
 
 /**
@@ -1113,7 +1113,7 @@ static const WindowDesc _station_view_desc(
 	WDP_AUTO, WDP_AUTO, 249, 110, 249, 110,
 	WC_STATION_VIEW, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
-	NULL, _nested_station_view_widgets, lengthof(_nested_station_view_widgets)
+	_nested_station_view_widgets, lengthof(_nested_station_view_widgets)
 );
 
 /**
@@ -1363,7 +1363,7 @@ static const WindowDesc _select_station_desc(
 	WDP_AUTO, WDP_AUTO, 200, 80, 200, 180,
 	WC_SELECT_STATION, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_RESIZABLE | WDF_CONSTRUCTION,
-	NULL, _nested_select_station_widgets, lengthof(_nested_select_station_widgets)
+	_nested_select_station_widgets, lengthof(_nested_select_station_widgets)
 );
 
 
diff --git a/src/statusbar_gui.cpp b/src/statusbar_gui.cpp
index d8c2f3fbff..a582f44b1a 100644
--- a/src/statusbar_gui.cpp
+++ b/src/statusbar_gui.cpp
@@ -217,7 +217,7 @@ static const WindowDesc _main_status_desc(
 	WDP_CENTER, 0, 320, 12, 640, 12,
 	WC_STATUS_BAR, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_NO_FOCUS,
-	NULL, _nested_main_status_widgets, lengthof(_nested_main_status_widgets)
+	_nested_main_status_widgets, lengthof(_nested_main_status_widgets)
 );
 
 /**
diff --git a/src/subsidy_gui.cpp b/src/subsidy_gui.cpp
index ab6aac3d46..6cbae2da0e 100644
--- a/src/subsidy_gui.cpp
+++ b/src/subsidy_gui.cpp
@@ -250,7 +250,7 @@ static const WindowDesc _subsidies_list_desc(
 	WDP_AUTO, WDP_AUTO, 320, 127, 500, 127,
 	WC_SUBSIDIES_LIST, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_RESIZABLE,
-	NULL, _nested_subsidies_list_widgets, lengthof(_nested_subsidies_list_widgets)
+	_nested_subsidies_list_widgets, lengthof(_nested_subsidies_list_widgets)
 );
 
 
diff --git a/src/terraform_gui.cpp b/src/terraform_gui.cpp
index 94c0c43de7..37827b800d 100644
--- a/src/terraform_gui.cpp
+++ b/src/terraform_gui.cpp
@@ -344,7 +344,7 @@ static const WindowDesc _terraform_desc(
 	WDP_ALIGN_TBR, 22 + 36, 158, 36, 158, 36,
 	WC_SCEN_LAND_GEN, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_CONSTRUCTION,
-	NULL, _nested_terraform_widgets, lengthof(_nested_terraform_widgets)
+	_nested_terraform_widgets, lengthof(_nested_terraform_widgets)
 );
 
 Window *ShowTerraformToolbar(Window *link)
@@ -777,7 +777,7 @@ static const WindowDesc _scen_edit_land_gen_desc(
 	WDP_AUTO, WDP_AUTO, 163, 103, 163, 103,
 	WC_SCEN_LAND_GEN, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_CONSTRUCTION,
-	NULL, _nested_scen_edit_land_gen_widgets, lengthof(_nested_scen_edit_land_gen_widgets)
+	_nested_scen_edit_land_gen_widgets, lengthof(_nested_scen_edit_land_gen_widgets)
 );
 
 Window *ShowEditorTerraformToolbar()
diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp
index 3bea4caa61..fe19a27e4f 100644
--- a/src/timetable_gui.cpp
+++ b/src/timetable_gui.cpp
@@ -385,7 +385,7 @@ static const WindowDesc _timetable_desc(
 	WDP_AUTO, WDP_AUTO, 400, 130, 400, 130,
 	WC_VEHICLE_TIMETABLE, WC_VEHICLE_VIEW,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE | WDF_CONSTRUCTION,
-	NULL, _nested_timetable_widgets, lengthof(_nested_timetable_widgets)
+	_nested_timetable_widgets, lengthof(_nested_timetable_widgets)
 );
 
 void ShowTimetableWindow(const Vehicle *v)
diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
index 224edafb3a..231c1d52f1 100644
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -1366,7 +1366,7 @@ static const WindowDesc _toolb_normal_desc(
 	0, 0, 0, 22, 640, 22,
 	WC_MAIN_TOOLBAR, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_NO_FOCUS,
-	NULL, _nested_toolbar_normal_widgets, lengthof(_nested_toolbar_normal_widgets)
+	_nested_toolbar_normal_widgets, lengthof(_nested_toolbar_normal_widgets)
 );
 
 
@@ -1589,7 +1589,7 @@ static const WindowDesc _toolb_scen_desc(
 	0, 0, 0, 22, 640, 22,
 	WC_MAIN_TOOLBAR, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_NO_FOCUS,
-	NULL, _nested_toolb_scen_widgets, lengthof(_nested_toolb_scen_widgets)
+	_nested_toolb_scen_widgets, lengthof(_nested_toolb_scen_widgets)
 );
 
 /* --- Allocating the toolbar --- */
diff --git a/src/town_gui.cpp b/src/town_gui.cpp
index c5585a595e..2e60e57044 100644
--- a/src/town_gui.cpp
+++ b/src/town_gui.cpp
@@ -270,7 +270,7 @@ static const WindowDesc _town_authority_desc(
 	WDP_AUTO, WDP_AUTO, 317, 222, 317, 222,
 	WC_TOWN_AUTHORITY, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
-	NULL, _nested_town_authority_widgets, lengthof(_nested_town_authority_widgets)
+	_nested_town_authority_widgets, lengthof(_nested_town_authority_widgets)
 );
 
 static void ShowTownAuthorityWindow(uint town)
@@ -512,7 +512,7 @@ static const WindowDesc _town_game_view_desc(
 	WDP_AUTO, WDP_AUTO, 260, TownViewWindow::TVW_HEIGHT_NORMAL, 260, TownViewWindow::TVW_HEIGHT_NORMAL,
 	WC_TOWN_VIEW, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON,
-	NULL, _nested_town_game_view_widgets, lengthof(_nested_town_game_view_widgets)
+	_nested_town_game_view_widgets, lengthof(_nested_town_game_view_widgets)
 );
 
 static const NWidgetPart _nested_town_editor_view_widgets[] = {
@@ -539,7 +539,7 @@ static const WindowDesc _town_editor_view_desc(
 	WDP_AUTO, WDP_AUTO, 260, TownViewWindow::TVW_HEIGHT_NORMAL, 260, TownViewWindow::TVW_HEIGHT_NORMAL,
 	WC_TOWN_VIEW, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON,
-	NULL, _nested_town_editor_view_widgets, lengthof(_nested_town_editor_view_widgets)
+	_nested_town_editor_view_widgets, lengthof(_nested_town_editor_view_widgets)
 );
 
 void ShowTownViewWindow(TownID town)
@@ -830,7 +830,7 @@ static const WindowDesc _town_directory_desc(
 	WDP_AUTO, WDP_AUTO, 208, 202, 208, 202,
 	WC_TOWN_DIRECTORY, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
-	NULL, _nested_town_directory_widgets, lengthof(_nested_town_directory_widgets)
+	_nested_town_directory_widgets, lengthof(_nested_town_directory_widgets)
 );
 
 void ShowTownDirectory()
@@ -1106,7 +1106,7 @@ static const WindowDesc _found_town_desc(
 	WDP_AUTO, WDP_AUTO, 160, 162, 160, 162,
 	WC_FOUND_TOWN, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_CONSTRUCTION,
-	NULL, _nested_found_town_widgets, lengthof(_nested_found_town_widgets)
+	_nested_found_town_widgets, lengthof(_nested_found_town_widgets)
 );
 
 void ShowFoundTownWindow()
diff --git a/src/transparency_gui.cpp b/src/transparency_gui.cpp
index 043b1d1451..9e8ae192c8 100644
--- a/src/transparency_gui.cpp
+++ b/src/transparency_gui.cpp
@@ -155,7 +155,7 @@ static const WindowDesc _transparency_desc(
 	WDP_ALIGN_TBR, 94, 219, 49, 219, 49,
 	WC_TRANSPARENCY_TOOLBAR, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,
-	NULL, _nested_transparency_widgets, lengthof(_nested_transparency_widgets)
+	_nested_transparency_widgets, lengthof(_nested_transparency_widgets)
 );
 
 void ShowTransparencyToolbar()
diff --git a/src/tree_gui.cpp b/src/tree_gui.cpp
index 38fcd02828..15d1740a0f 100644
--- a/src/tree_gui.cpp
+++ b/src/tree_gui.cpp
@@ -231,7 +231,7 @@ static const WindowDesc _build_trees_desc(
 	WDP_AUTO, WDP_AUTO, 143, 184, 143, 184,
 	WC_BUILD_TREES, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION,
-	NULL, _nested_build_trees_widgets, lengthof(_nested_build_trees_widgets)
+	_nested_build_trees_widgets, lengthof(_nested_build_trees_widgets)
 );
 
 void ShowBuildTreesToolbar()
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index 2f67b50234..abcd56acb9 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -433,7 +433,7 @@ static const WindowDesc _vehicle_refit_desc(
 	WDP_AUTO, WDP_AUTO, 240, 174, 240, 174,
 	WC_VEHICLE_REFIT, WC_VEHICLE_VIEW,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE | WDF_CONSTRUCTION,
-	NULL, _nested_vehicle_refit_widgets, lengthof(_nested_vehicle_refit_widgets)
+	_nested_vehicle_refit_widgets, lengthof(_nested_vehicle_refit_widgets)
 );
 
 /** Show the refit window for a vehicle
@@ -1144,7 +1144,7 @@ static WindowDesc _vehicle_list_desc(
 	WDP_AUTO, WDP_AUTO, 260, 194, 260, 246,
 	WC_INVALID, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
-	NULL, _nested_vehicle_list, lengthof(_nested_vehicle_list)
+	_nested_vehicle_list, lengthof(_nested_vehicle_list)
 );
 
 static void ShowVehicleListWindowLocal(CompanyID company, uint16 VLW_flag, VehicleType vehicle_type, uint16 unique_number)
@@ -1555,7 +1555,7 @@ static const WindowDesc _train_vehicle_details_desc(
 	WDP_AUTO, WDP_AUTO, 405, 113, 405, 178,
 	WC_VEHICLE_DETAILS, WC_VEHICLE_VIEW,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
-	NULL, _nested_train_vehicle_details_widgets, lengthof(_nested_train_vehicle_details_widgets)
+	_nested_train_vehicle_details_widgets, lengthof(_nested_train_vehicle_details_widgets)
 );
 
 /** Vehicle details window descriptor for other vehicles than a train. */
@@ -1563,7 +1563,7 @@ static const WindowDesc _nontrain_vehicle_details_desc(
 	WDP_AUTO, WDP_AUTO, 405, 113, 405, 113,
 	WC_VEHICLE_DETAILS, WC_VEHICLE_VIEW,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
-	NULL, _nested_nontrain_vehicle_details_widgets, lengthof(_nested_nontrain_vehicle_details_widgets)
+	_nested_nontrain_vehicle_details_widgets, lengthof(_nested_nontrain_vehicle_details_widgets)
 );
 
 /** Shows the vehicle details window of the given vehicle. */
@@ -1620,7 +1620,7 @@ static const WindowDesc _vehicle_view_desc(
 	WDP_AUTO, WDP_AUTO, 250, 116, 250, 116,
 	WC_VEHICLE_VIEW, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
-	NULL, _nested_vehicle_view_widgets, lengthof(_nested_vehicle_view_widgets)
+	_nested_vehicle_view_widgets, lengthof(_nested_vehicle_view_widgets)
 );
 
 /** Vehicle view window descriptor for trains. Only minimum_height and
@@ -1630,7 +1630,7 @@ static const WindowDesc _train_view_desc(
 	WDP_AUTO, WDP_AUTO, 250, 134, 250, 134,
 	WC_VEHICLE_VIEW, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
-	NULL, _nested_vehicle_view_widgets, lengthof(_nested_vehicle_view_widgets)
+	_nested_vehicle_view_widgets, lengthof(_nested_vehicle_view_widgets)
 );
 
 
diff --git a/src/viewport_gui.cpp b/src/viewport_gui.cpp
index 9d118fad8f..1ec1af0862 100644
--- a/src/viewport_gui.cpp
+++ b/src/viewport_gui.cpp
@@ -168,7 +168,7 @@ static const WindowDesc _extra_view_port_desc(
 	WDP_AUTO, WDP_AUTO, 300, 68, 300, 268,
 	WC_EXTRA_VIEW_PORT, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
-	NULL, _nested_extra_view_port_widgets, lengthof(_nested_extra_view_port_widgets)
+	_nested_extra_view_port_widgets, lengthof(_nested_extra_view_port_widgets)
 );
 
 void ShowExtraViewPortWindow(TileIndex tile)
diff --git a/src/waypoint_gui.cpp b/src/waypoint_gui.cpp
index e08066dfe8..6a30251d51 100644
--- a/src/waypoint_gui.cpp
+++ b/src/waypoint_gui.cpp
@@ -145,7 +145,7 @@ static const WindowDesc _waypoint_view_desc(
 	WDP_AUTO, WDP_AUTO, 260, 118, 260, 118,
 	WC_WAYPOINT_VIEW, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON,
-	NULL, _nested_waypoint_view_widgets, lengthof(_nested_waypoint_view_widgets)
+	_nested_waypoint_view_widgets, lengthof(_nested_waypoint_view_widgets)
 );
 
 void ShowWaypointWindow(const Waypoint *wp)
diff --git a/src/widgets/dropdown.cpp b/src/widgets/dropdown.cpp
index 750347c493..c55292191b 100644
--- a/src/widgets/dropdown.cpp
+++ b/src/widgets/dropdown.cpp
@@ -86,7 +86,7 @@ const WindowDesc _dropdown_desc(
 	0, 0, 0, 0, 0, 0, // x/y position not used.
 	WC_DROPDOWN_MENU, WC_NONE,
 	WDF_DEF_WIDGET,
-	NULL, _nested_dropdown_menu_widgets, lengthof(_nested_dropdown_menu_widgets)
+	_nested_dropdown_menu_widgets, lengthof(_nested_dropdown_menu_widgets)
 );
 
 /** Drop-down menu window */
diff --git a/src/window.cpp b/src/window.cpp
index 0a1de820fd..0c3c8fbab6 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -60,7 +60,7 @@ byte _special_mouse_mode;
 
 /** Window description constructor. */
 WindowDesc::WindowDesc(int16 left, int16 top, int16 min_width, int16 min_height, int16 def_width, int16 def_height,
-			WindowClass window_class, WindowClass parent_class, uint32 flags, const Widget *widgets,
+			WindowClass window_class, WindowClass parent_class, uint32 flags,
 			const NWidgetPart *nwid_parts, int16 nwid_length)
 {
 	this->left = left;
@@ -72,7 +72,6 @@ WindowDesc::WindowDesc(int16 left, int16 top, int16 min_width, int16 min_height,
 	this->cls = window_class;
 	this->parent_cls = parent_class;
 	this->flags = flags;
-	this->widgets = widgets;
 	this->nwid_parts = nwid_parts;
 	this->nwid_length = nwid_length;
 	this->new_widgets = NULL;
@@ -82,9 +81,9 @@ WindowDesc::WindowDesc(int16 left, int16 top, int16 min_width, int16 min_height,
 const Widget *WindowDesc::GetWidgets() const
 {
 	if (this->nwid_parts != NULL) {
-		InitializeWidgetArrayFromNestedWidgets(this->nwid_parts, this->nwid_length, this->widgets, &this->new_widgets);
+		InitializeWidgetArrayFromNestedWidgets(this->nwid_parts, this->nwid_length, NULL, &this->new_widgets);
 	}
-	const Widget *wids = (this->new_widgets != NULL) ? this->new_widgets : this->widgets;
+	const Widget *wids = this->new_widgets;
 	assert(wids != NULL);
 	return wids;
 }
diff --git a/src/window_gui.h b/src/window_gui.h
index 0a529fffef..d31769b5fe 100644
--- a/src/window_gui.h
+++ b/src/window_gui.h
@@ -127,7 +127,7 @@ extern Window *_focused_window;
 struct WindowDesc : ZeroedMemoryAllocator {
 
 	WindowDesc(int16 left, int16 top, int16 min_width, int16 min_height, int16 def_width, int16 def_height,
-			WindowClass window_class, WindowClass parent_class, uint32 flags, const Widget *widgets,
+			WindowClass window_class, WindowClass parent_class, uint32 flags,
 			const NWidgetPart *nwid_parts = NULL, int16 nwid_length = 0);
 
 	~WindowDesc();
@@ -141,7 +141,6 @@ struct WindowDesc : ZeroedMemoryAllocator {
 	WindowClass cls;               ///< Class of the window, @see WindowClass.
 	WindowClass parent_cls;        ///< Class of the parent window. @see WindowClass
 	uint32 flags;                  ///< Flags. @see WindowDefaultFlags
-	const Widget *widgets;         ///< List of widgets with their position and size for the window.
 	const NWidgetPart *nwid_parts; ///< Nested widget parts describing the window.
 	int16 nwid_length;             ///< Length of the #nwid_parts array.
 	mutable Widget *new_widgets;   ///< Widgets generated from #nwid_parts.