--- uae/src/main.c	2018/04/24 17:03:46	1.1.1.16
+++ uae/src/main.c	2018/04/24 17:12:27	1.1.1.19
@@ -32,7 +32,6 @@
 #include "autoconf.h"
 #include "osemu.h"
 #include "osdep/exectasks.h"
-#include "compiler.h"
 #include "picasso96.h"
 #include "bsdsocket.h"
 #include "uaeexe.h"
@@ -112,7 +111,7 @@ void default_prefs (struct uae_prefs *p)
     p->test_drawing_speed = 0;
 
     p->produce_sound = 0;
-    p->stereo = 0;
+    p->sound_stereo = 0;
     p->sound_bits = DEFAULT_SOUND_BITS;
     p->sound_freq = DEFAULT_SOUND_FREQ;
     p->sound_minbsiz = DEFAULT_SOUND_MINB;
@@ -147,7 +146,6 @@ void default_prefs (struct uae_prefs *p)
 
     p->immediate_blits = 0;
     p->collision_level = 1;
-    p->fast_copper = 1;
 
     strcpy (p->df[0], "df0.adf");
     strcpy (p->df[1], "df1.adf");
@@ -343,12 +341,12 @@ void parse_cmdline (int argc, char **arg
 	/* Check for new-style "-f xxx" argument, where xxx is config-file */
 	else if (strcmp (argv[i], "-f") == 0) {
 	    if (i + 1 == argc)
-		fprintf (stderr, "Missing argument for '-f' option.\n");
+		write_log ("Missing argument for '-f' option.\n");
 	    else
 		cfgfile_load (&currprefs, argv[++i]);
 	} else if (strcmp (argv[i], "-s") == 0) {
 	    if (i + 1 == argc)
-		fprintf (stderr, "Missing argument for '-s' option.\n");
+		write_log ("Missing argument for '-s' option.\n");
 	    else
 		cfgfile_parse_line (&currprefs, argv[++i]);
 	} else if (strcmp (argv[i], "-h") == 0 || strcmp (argv[i], "-help") == 0) {
@@ -390,8 +388,8 @@ static void parse_cmdline_and_init_file
 	/* sam: if not found in $HOME then look in current directory */
 	strcpy (optionsfile, OPTIONSFILENAME);
 	cfgfile_load (&currprefs, optionsfile);
-    }
 #endif
+    }
 
     parse_cmdline (argc, argv);
 }
@@ -469,7 +467,6 @@ void real_main (int argc, char **argv)
     rtarea_init ();
     hardfile_install ();
     scsidev_install ();
-    ahi_install ();
 
     parse_cmdline_and_init_file (argc, argv);
 
@@ -521,7 +518,6 @@ void real_main (int argc, char **argv)
     reset_frame_rate_hack ();
     init_m68k(); /* must come after reset_frame_rate_hack (); */
 
-    compiler_init ();
     gui_update ();
 
     if (graphics_init ()) {