diff --git a/sysemu.h b/sysemu.h
index 143fe9b9d9..0547d93edc 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -88,7 +88,6 @@ extern int cursor_hide;
 extern int graphic_rotate;
 extern int no_quit;
 extern int semihosting_enabled;
-extern int autostart;
 extern int old_param;
 extern const char *bootp_filename;
 
diff --git a/vl.c b/vl.c
index cd55b9eb5e..c94fdc02b6 100644
--- a/vl.c
+++ b/vl.c
@@ -230,7 +230,6 @@ int daemonize = 0;
 const char *option_rom[MAX_OPTION_ROMS];
 int nb_option_roms;
 int semihosting_enabled = 0;
-int autostart = 1;
 #ifdef TARGET_ARM
 int old_param = 0;
 #endif
@@ -8502,6 +8501,7 @@ int main(int argc, char **argv)
     int tb_size;
     const char *pid_file = NULL;
     VLANState *vlan;
+    int autostart;
 
     LIST_INIT (&vm_change_state_head);
 #ifndef _WIN32
@@ -8573,7 +8573,8 @@ int main(int argc, char **argv)
     nb_nics = 0;
 
     tb_size = 0;
-    
+    autostart= 1;
+
     optind = 1;
     for(;;) {
         if (optind >= argc)