diff --git a/console.c b/console.c
--- a/console.c
+++ b/console.c
@@ -152,7 +152,7 @@ static void IConsoleWndProc(Window *w, W
 					break;
 				case WKC_CTRL | WKC_RETURN:
 					_iconsole_mode = (_iconsole_mode == ICONSOLE_FULL) ? ICONSOLE_OPENED : ICONSOLE_FULL;
-					IConsoleResize(w);
+					IConsoleResize();
 					MarkWholeScreenDirty();
 					break;
 				case (WKC_CTRL | 'V'):
@@ -283,10 +283,8 @@ void IConsoleFree(void)
 	CloseConsoleLogIfActive();
 }
 
-void IConsoleResize(Window *w)
+void IConsoleResize(void)
 {
-	assert(_iconsole_win == w);
-
 	switch (_iconsole_mode) {
 		case ICONSOLE_OPENED:
 			_iconsole_win->height = _screen.height / 3;
diff --git a/console.h b/console.h
--- a/console.h
+++ b/console.h
@@ -118,7 +118,7 @@ VARDEF IConsoleModes _iconsole_mode;
 void IConsoleInit(void);
 void IConsoleFree(void);
 void IConsoleClearBuffer(void);
-void IConsoleResize(Window *w);
+void IConsoleResize(void);
 void IConsoleSwitch(void);
 void IConsoleClose(void);
 void IConsoleOpen(void);
diff --git a/engine_gui.c b/engine_gui.c
--- a/engine_gui.c
+++ b/engine_gui.c
@@ -115,7 +115,7 @@ static const WindowDesc _engine_preview_
 
 void ShowEnginePreviewWindow(EngineID engine)
 {
-	Window *w = AllocateWindowDescFront(&_engine_preview_desc, engine);
+	AllocateWindowDescFront(&_engine_preview_desc, engine);
 }
 
 static void DrawTrainEngineInfo(EngineID engine, int x, int y, int maxw)
diff --git a/misc_gui.c b/misc_gui.c
--- a/misc_gui.c
+++ b/misc_gui.c
@@ -1852,10 +1852,8 @@ static const WindowDesc _cheats_desc = {
 
 void ShowCheatWindow(void)
 {
-	Window *w;
-
 	DeleteWindowById(WC_CHEATS, 0);
-	w = AllocateWindowDesc(&_cheats_desc);
+	AllocateWindowDesc(&_cheats_desc);
 }
 
 /** Resize the widgets in a window
diff --git a/sound.c b/sound.c
--- a/sound.c
+++ b/sound.c
@@ -194,7 +194,7 @@ void SndCopyToPool(void)
 
 static void SndPlayScreenCoordFx(SoundFx sound, int x, int y)
 {
-	const Window* const *wz;
+	Window* const *wz;
 
 	if (msf.effect_vol == 0) return;
 
diff --git a/viewport.c b/viewport.c
--- a/viewport.c
+++ b/viewport.c
@@ -183,7 +183,7 @@ void AssignWindowViewport(Window *w, int
 
 static Point _vp_move_offs;
 
-static void DoSetViewportPosition(const Window* const *wz, int left, int top, int width, int height)
+static void DoSetViewportPosition(Window* const *wz, int left, int top, int width, int height)
 {
 
 	for (; wz != _last_z_window; wz++) {
diff --git a/window.c b/window.c
--- a/window.c
+++ b/window.c
@@ -222,7 +222,7 @@ void DrawOverlappedWindowForAll(int left
 
 static void DrawOverlappedWindow(Window* const *wz, int left, int top, int right, int bottom)
 {
-	const Window* const *vz = wz;
+	Window* const *vz = wz;
 	int x;
 
 	while (++vz != _last_z_window) {
@@ -1058,7 +1058,7 @@ static bool HandleWindowDragging(void)
 			ny = y;
 
 			if (_patches.window_snap_radius != 0) {
-				const Window* const *vz;
+				Window* const *vz;
 
 				int hsnap = _patches.window_snap_radius;
 				int vsnap = _patches.window_snap_radius;
@@ -1370,8 +1370,8 @@ static bool HandleViewportScroll(void)
 
 static void MaybeBringWindowToFront(const Window *w)
 {
-	const Window* const *wz;
-	const Window* const *uz;
+	Window* const *wz;
+	Window* const *uz;
 
 	if (w->window_class == WC_MAIN_WINDOW ||
 			IsVitalWindow(w) ||
@@ -1725,7 +1725,7 @@ int GetMenuItemIndex(const Window *w, in
 
 void InvalidateWindow(WindowClass cls, WindowNumber number)
 {
-	const Window* const *wz;
+	Window* const *wz;
 
 	FOR_ALL_WINDOWS(wz) {
 		const Window *w = *wz;
@@ -1745,7 +1745,7 @@ void InvalidateWidget(const Window *w, b
 
 void InvalidateWindowWidget(WindowClass cls, WindowNumber number, byte widget_index)
 {
-	const Window* const *wz;
+	Window* const *wz;
 
 	FOR_ALL_WINDOWS(wz) {
 		const Window *w = *wz;
@@ -1757,7 +1757,7 @@ void InvalidateWindowWidget(WindowClass 
 
 void InvalidateWindowClasses(WindowClass cls)
 {
-	const Window* const *wz;
+	Window* const *wz;
 
 	FOR_ALL_WINDOWS(wz) {
 		if ((*wz)->window_class == cls) SetWindowDirty(*wz);
@@ -1917,8 +1917,8 @@ void RelocateAllWindows(int neww, int ne
 				break;
 
 			case WC_CONSOLE:
-				IConsoleResize(w);
-				break;
+				IConsoleResize();
+				continue;
 
 			default:
 				left = w->left;