diff --git a/common/include/window.h b/common/include/window.h
index bd3b9c1f0..c86aa9d63 100644
--- a/common/include/window.h
+++ b/common/include/window.h
@@ -19,11 +19,11 @@
 #include "gr.h"
 #include "console.h"
 
-#ifdef __cplusplus
 #include <assert.h>
 
 #include "fwd-window.h"
 #include "event.h"
+
 namespace dcx {
 
 constexpr const unused_window_userdata_t *unused_window_userdata = nullptr;
@@ -101,11 +101,6 @@ public:
 		w_modal = modal;
 	}
 
-	friend void window_set_modal(window *wind, int modal)
-	{
-		wind->set_modal(modal);
-	}
-
 	friend int window_is_modal(window &wind)
 	{
 		return wind.w_modal;
@@ -174,4 +169,3 @@ static inline window_event_result (WINDOW_SEND_EVENT)(window &w, const d_event &
 void menu_destroy_hook(window *w);
 
 }
-#endif
diff --git a/common/ui/dialog.cpp b/common/ui/dialog.cpp
index 37fec3a95..4d947f783 100644
--- a/common/ui/dialog.cpp
+++ b/common/ui/dialog.cpp
@@ -171,7 +171,7 @@ d_callback(callback), gadget(nullptr), keyboard_focus_gadget(nullptr), d_userdat
 						 req_w, req_h, ui_dialog_handler, dlg, createdata);
 	
 	if (!(flags & DF_MODAL))
-		window_set_modal(dlg->wind, 0);	// make this window modeless, allowing events to propogate through the window stack
+		dlg->wind->set_modal(0);	// make this window modeless, allowing events to propogate through the window stack
 }
 
 window *ui_dialog_get_window(UI_DIALOG *dlg)
diff --git a/common/ui/menubar.cpp b/common/ui/menubar.cpp
index f495ebdd0..13d0fb7fc 100644
--- a/common/ui/menubar.cpp
+++ b/common/ui/menubar.cpp
@@ -154,10 +154,10 @@ static void menu_show( MENU * menu )
 			return;
 		
 		if (menu == &Menu[0])
-			window_set_modal(Menu[0].wind, 0);	// allow windows behind the menubar to accept events (e.g. the keypad dialogs)
+			Menu[0].wind->set_modal(0);	// allow windows behind the menubar to accept events (e.g. the keypad dialogs)
 	}
 
-	window_set_visible(menu->wind, 1);
+	window_set_visible(*menu->wind, 1);
 	
 	// Mark as displayed.
 	menu->Displayed = 1;
@@ -172,12 +172,11 @@ static void menu_hide( MENU * menu )
 	if (!menu->Displayed) return;
 	
 	if ((menu != &Menu[0]) && menu->wind)
-		window_set_visible(menu->wind, 0);	// don't draw or receive events
+		window_set_visible(*menu->wind, 0);	// don't draw or receive events
 
 	menu->Active = 0;
 	if (Menu[0].wind && menu == &Menu[0])
-		window_set_modal(Menu[0].wind, 0);
-		
+		Menu[0].wind->set_modal(0);
 	// Mark as hidden.
 	menu->Displayed = 0;
 }
@@ -262,11 +261,10 @@ static void menu_hide_all()
 {
 	range_for (auto &i, partial_range(Menu, 1u, num_menus))
 		menu_hide(&i);
-	
 	Menu[0].ShowBar = 0;
 	Menu[0].Active = 0;
 	if (Menu[0].wind)
-		window_set_modal(Menu[0].wind, 0);
+		Menu[0].wind->set_modal(0);
 	menu_show( &Menu[0] );
 
 }
@@ -283,7 +281,7 @@ static window_event_result do_state_0(const d_event &event)
 	
 	Menu[0].Active = 0;
 	if (Menu[0].wind)
-		window_set_modal(Menu[0].wind, 0);
+		Menu[0].wind->set_modal(0);
 	Menu[0].ShowBar = 0;
 
 	if ( keypress & KEY_ALTED )	{
@@ -293,7 +291,7 @@ static window_event_result do_state_0(const d_event &event)
 			Menu[0].CurrentItem = i;
 			Menu[0].Active = 0;
 			if (Menu[0].wind)
-				window_set_modal(Menu[0].wind, 0);
+				Menu[0].wind->set_modal(0);
 
 			state = 3;	
 			Menu[ CMENU ].ShowBar = 1;
@@ -329,7 +327,7 @@ static window_event_result do_state_0(const d_event &event)
 		// (Personally, I just use either the mouse or 'hotkeys' for menus)
 		window_select(*Menu[0].wind);
 
-		window_set_modal(Menu[0].wind, 1);
+		Menu[0].wind->set_modal(1);
 		menu_show( &Menu[0] );
 		return window_event_result::handled;
 	}
@@ -344,7 +342,7 @@ static window_event_result do_state_0(const d_event &event)
 		Menu[0].ShowBar = 1;
 		Menu[ CMENU ].Active = 1;
 		Menu[0].Active = 0;
-		window_set_modal(Menu[0].wind, 0);
+		Menu[0].wind->set_modal(0);
 		menu_show( &Menu[ CMENU ] );
 		menu_show( &Menu[0] );
 		return window_event_result::handled;
@@ -377,7 +375,7 @@ static window_event_result do_state_1(const d_event &event)
 	{
 		Menu[0].CurrentItem = i;
 		Menu[0].Active = 0;
-		window_set_modal(Menu[0].wind, 0);
+		Menu[0].wind->set_modal(0);
 		state = 3;	
 		Menu[ CMENU ].ShowBar = 1;
 		Menu[ CMENU ].Active = 1;
@@ -405,7 +403,7 @@ static window_event_result do_state_1(const d_event &event)
 		Menu[ CMENU ].Active = 1;
 		Menu[0].ShowBar = 1;
 		Menu[0].Active = 0;
-		window_set_modal(Menu[0].wind, 0);
+		Menu[0].wind->set_modal(0);
 		menu_show( &Menu[ CMENU ] );
 		menu_show( &Menu[0] );
 		return window_event_result::handled;
@@ -461,7 +459,7 @@ static window_event_result do_state_2(const d_event &event)
 		Menu[ CMENU ].ShowBar = 1;
 		Menu[ CMENU ].Active = 1;
 		Menu[0].Active = 0;
-		window_set_modal(Menu[0].wind, 0);
+		Menu[0].wind->set_modal(0);
 		menu_show( &Menu[ 0 ] );
 		menu_show( &Menu[ CMENU ] );
 		return window_event_result::handled;
@@ -473,7 +471,7 @@ static window_event_result do_state_2(const d_event &event)
 		{
 			Menu[0].CurrentItem = i;
 			Menu[0].Active = 0;
-			window_set_modal(Menu[0].wind, 0);
+			Menu[0].wind->set_modal(0);
 			state = 3;	
 			Menu[ CMENU ].ShowBar = 1;
 			Menu[ CMENU ].Active = 1;
@@ -496,7 +494,7 @@ static window_event_result do_state_2(const d_event &event)
 		{
 			Menu[0].CurrentItem = i;
 			Menu[0].Active = 0;
-			window_set_modal(Menu[0].wind, 0);
+			Menu[0].wind->set_modal(0);
 			state = 3;	
 			Menu[ CMENU ].ShowBar = 1;
 			Menu[ CMENU ].Active = 1;
diff --git a/similar/editor/info.cpp b/similar/editor/info.cpp
index c7e50bd12..2d1bed245 100644
--- a/similar/editor/info.cpp
+++ b/similar/editor/info.cpp
@@ -363,8 +363,7 @@ window *info_window_create(void)
 {
 	const auto wind = window_create(*Canv_editor, PAD_X + 250, PAD_Y + 8, 180, 160, info_display_all, unused_window_userdata);
 	if (wind)
-		window_set_modal(wind, 0);
-	
+		wind->set_modal(0);
 	return wind;
 }