--- uae/src/include/xwin.h	2018/04/24 16:42:26	1.1.1.4
+++ uae/src/include/xwin.h	2018/04/24 17:18:47	1.1.1.8
@@ -14,12 +14,12 @@ extern xcolnr xcolors[4096];
 
 extern int buttonstate[3];
 extern int newmousecounters;
-extern int lastmx, lastmy;
-extern int ievent_alive;
 
 extern int graphics_setup (void);
 extern int graphics_init (void);
 extern void graphics_leave (void);
+extern void graphics_subshutdown (int final);
+extern int graphics_subinit (void);
 extern void handle_events (void);
 extern void setup_brkhandler (void);
 
@@ -55,7 +55,7 @@ struct vidbuf_description
      *   - set bufmem to point at it
      *   - set linemem to 0
      *   - if memcpy within bufmem would be very slow, i.e. because bufmem is
-     *     in graphics card memory, also set emergmem to point to a buffer 
+     *     in graphics card memory, also set emergmem to point to a buffer
      *     that is large enough to hold a single line.
      *   - implement flush_line to be a no-op.
      * If you use a single line buffer:
@@ -82,19 +82,3 @@ extern struct vidbuf_description gfxvidi
 /* For ports using tui.c, this should be built by graphics_setup(). */
 extern struct bstring *video_mode_menu;
 extern void vidmode_menu_selected(int);
-
-extern int inhibit_frame;
-
-static __inline__ void set_inhibit_frame (int bit)
-{
-    inhibit_frame |= 1 << bit;
-}
-static __inline__ void clear_inhibit_frame (int bit)
-{
-    inhibit_frame &= ~(1 << bit);
-}
-static __inline__ void toggle_inhibit_frame (int bit)
-{
-    inhibit_frame ^= ~(1 << bit);
-}
-