--- uae/src/rpc.c	2018/04/24 16:39:56	1.1.1.1
+++ uae/src/rpc.c	2018/04/24 17:16:27	1.1.1.5
@@ -10,9 +10,8 @@
 #include "sysconfig.h"
 #include "sysdeps.h"
 
-#include "config.h"
 #include "options.h"
-#include "threaddep/penguin.h"
+#include "threaddep/thread.h"
 #include "memory.h"
 #include "custom.h"
 #include "keyboard.h"
@@ -517,7 +516,6 @@ void setsonst(int *reserved)
     blits_32bit_enabled=reserved[10];
     immediate_blits=reserved[11];
     fake_joystick=reserved[12];
-    automount_uaedev=1-reserved[13];
     bogomem_size=reserved[14];
     chipmem_size=reserved[15];
     fastmem_size=reserved[16];
@@ -576,7 +574,7 @@ void gui_messagereceive(void)
     case message_QUIT:
       if(uae_startedup)
       {
-	regs.spcflags |= SPCFLAG_BRK;
+	set_special (SPCFLAG_BRK);
 	quit_program=1;
 	uae_running=1;
       }