8 files changed, 14 insertions, 14 deletions
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index b987f75755..4ccd914023 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -28,7 +28,7 @@
 #include "sci/scicore/resource.h"
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
-#include "sci/gfx/sci_widgets.h"
+#include "sci/gfx/gfx_gui.h"
 #include "sci/gfx/gfx_widgets.h"
 #include "sci/gfx/gfx_state_internal.h"	// required for gfxw_container_t, gfxw_port_t, gfxw_visual_t
 
diff --git a/engines/sci/engine/kmenu.cpp b/engines/sci/engine/kmenu.cpp
index a8d505e183..e2f56f9434 100644
--- a/engines/sci/engine/kmenu.cpp
+++ b/engines/sci/engine/kmenu.cpp
@@ -26,7 +26,7 @@
 #include "sci/scicore/resource.h"
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
-#include "sci/gfx/sci_widgets.h"
+#include "sci/gfx/gfx_gui.h"
 #include "sci/gfx/menubar.h"
 #include "sci/gfx/gfx_state_internal.h"	// required for gfxw_port_t, gfxw_visual_t
 
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp
index e7ef55e4af..1e5b25271d 100644
--- a/engines/sci/engine/scriptdebug.cpp
+++ b/engines/sci/engine/scriptdebug.cpp
@@ -33,7 +33,7 @@
 #include "sci/engine/kernel.h"
 #include "sci/engine/savegame.h"
 #include "sci/gfx/gfx_widgets.h"
-#include "sci/gfx/sci_widgets.h"
+#include "sci/gfx/gfx_gui.h"
 #include "sci/gfx/gfx_state_internal.h"	// required for gfxw_container_t, gfxw_port_t, gfxw_visual_t
 #include "sci/scicore/resource.h"
 #include "sci/scicore/sciconsole.h"
diff --git a/engines/sci/gfx/sci_widgets.cpp b/engines/sci/gfx/gfx_gui.cpp
index c0a311f0d3..5567602b68 100644
--- a/engines/sci/gfx/sci_widgets.cpp
+++ b/engines/sci/gfx/gfx_gui.cpp
@@ -27,7 +27,7 @@
 #include "sci/gfx/operations.h"
 #include "sci/gfx/gfx_widgets.h"
 #include "sci/gfx/menubar.h"
-#include "sci/gfx/sci_widgets.h"
+#include "sci/gfx/gfx_gui.h"
 #include "sci/gfx/gfx_state_internal.h"
 #include "sci/gfx/font.h"
 
diff --git a/engines/sci/gfx/sci_widgets.h b/engines/sci/gfx/gfx_gui.h
index 9ecb8f4f83..7eff8b5bfb 100644
--- a/engines/sci/gfx/sci_widgets.h
+++ b/engines/sci/gfx/gfx_gui.h
@@ -36,12 +36,14 @@ class Menu;
 
 // The following flags are applicable to windows in SCI0
 enum windowFlags {
-	kWindowTransparent  = 0x01,          // 0001
-	kWindowNoFrame      = 0x02,          // 0010 - a window without a frame
+	kWindowTransparent  = 0x01,          // 0000 0001
+	kWindowNoFrame      = 0x02,          // 0000 0010 - a window without a frame
 	// Add title bar to window (10 pixels high, framed, text is centered and written in white on dark gray)
-	kWindowTitle        = 0x04,          // 0100
+	kWindowTitle        = 0x04,          // 0000 0100
+	// bits 3-6 are unused
 	kWindowDontDraw     = 0x80,          // 1000 0000 - don't draw anything
-	kWindowNoDropShadow = 0x1000000      // 0001 0000 0000 0000 0000 0000 0000
+	kWindowNoDropShadow = 0x1000000,     // 0001 0000 0000 0000 0000 0000 0000 (not in SCI)
+	kWindowAutoRestore  = 0x2000000
 };
 
 enum controlStateFlags {
diff --git a/engines/sci/gfx/gfx_widgets.cpp b/engines/sci/gfx/gfx_widgets.cpp
index 70a971e1d6..3aacd8f42c 100644
--- a/engines/sci/gfx/gfx_widgets.cpp
+++ b/engines/sci/gfx/gfx_widgets.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "sci/sci_memory.h"
+#include "sci/gfx/gfx_gui.h"		// for kWindowAutoRestore
 #include "sci/gfx/gfx_widgets.h"
 #include "sci/gfx/gfx_state_internal.h"
 
@@ -1822,7 +1823,7 @@ gfxw_port_t *gfxw_new_port(gfxw_visual_t *visual, gfxw_port_t *predecessor, rect
 }
 
 void gfxw_port_auto_restore_background(gfxw_visual_t *visual, gfxw_port_t *window, rect_t auto_rect) {
-	window->port_flags |= WINDOW_FLAG_AUTO_RESTORE;
+	window->port_flags |= kWindowAutoRestore;
 	window->restore_snap = gfxw_make_snapshot(visual, auto_rect);
 }
 
@@ -1837,7 +1838,7 @@ gfxw_port_t *gfxw_remove_port(gfxw_visual_t *visual, gfxw_port_t *port) {
 	}
 
 	parent = (gfxw_port_t *)port->parent;
-	if (port->port_flags & WINDOW_FLAG_AUTO_RESTORE)
+	if (port->port_flags & kWindowAutoRestore)
 		gfxw_restore_snapshot(visual, port->restore_snap);
 
 	if (port->widfree(GFXW(port)))
diff --git a/engines/sci/gfx/gfx_widgets.h b/engines/sci/gfx/gfx_widgets.h
index 5a0f813748..0f1c562826 100644
--- a/engines/sci/gfx/gfx_widgets.h
+++ b/engines/sci/gfx/gfx_widgets.h
@@ -56,9 +56,6 @@ struct gfxw_widget_t;
 /* Our strategy for dirty rectangle management */
 #define GFXW_DIRTY_STRATEGY GFXOP_DIRTY_FRAMES_CLUSTERS
 
-/* Properly belongs in sci_widgets.h, but we need it here */
-#define WINDOW_FLAG_AUTO_RESTORE 0x2000000
-
 /* Indicates that a Chrono-Port should not be created even if it doesn't exist. */
 #define GFXW_CHRONO_NO_CREATE 1
 
diff --git a/engines/sci/module.mk b/engines/sci/module.mk
index 93b85709c0..61ce2a697a 100644
--- a/engines/sci/module.mk
+++ b/engines/sci/module.mk
@@ -36,12 +36,12 @@ MODULE_OBJS = \
 	engine/vm.o \
 	gfx/font.o \
 	gfx/gfx_driver.o \
+	gfx/gfx_gui.o \
 	gfx/gfx_res_options.o \
 	gfx/gfx_resmgr.o \
 	gfx/gfx_resource.o \
 	gfx/gfx_support.o \
 	gfx/gfx_tools.o \
-	gfx/gfx_widgets.o \
 	gfx/menubar.o \
 	gfx/operations.o \
 	gfx/palette.o \