diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -1014,7 +1014,7 @@ static const WindowDesc _network_game_wi
 	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_s
 	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_w
 	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_pop
 	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_des
 	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_st
 	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
 	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)