diff --git a/Makefile.target b/Makefile.target
index 6471984..1c0119d 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -731,8 +731,6 @@ LDFLAGS+=-p
 main.o: CFLAGS+=-p
 endif
 
-vl.o: CFLAGS+=$(SDL_CFLAGS)
-
 vl.o: qemu-options.h
 
 monitor.o: qemu-monitor.h
diff --git a/vl.c b/vl.c
index dd15414..e8b5862 100644
--- a/vl.c
+++ b/vl.c
@@ -112,24 +112,6 @@
 #define memalign(align, size) malloc(size)
 #endif
 
-#ifdef CONFIG_SDL
-#if defined(__APPLE__) || defined(main)
-#include <SDL.h>
-int qemu_main(int argc, char **argv, char **envp);
-int main(int argc, char **argv)
-{
-    return qemu_main(argc, argv, NULL);
-}
-#undef main
-#define main qemu_main
-#endif
-#endif /* CONFIG_SDL */
-
-#ifdef CONFIG_COCOA
-#undef main
-#define main qemu_main
-#endif /* CONFIG_COCOA */
-
 #include "hw/hw.h"
 #include "hw/boards.h"
 #include "hw/usb.h"
@@ -4954,7 +4936,7 @@ char *qemu_find_file(int type, const char *name)
     return buf;
 }
 
-int main(int argc, char **argv, char **envp)
+int main(int argc, char **argv)
 {
     const char *gdbstub_dev = NULL;
     uint32_t boot_devices_bitmap = 0;
@@ -5001,7 +4983,7 @@ int main(int argc, char **argv, char **envp)
     CPUState *env;
     int show_vnc_port = 0;
 
-    qemu_cache_utils_init(envp);
+    qemu_cache_utils_init(environ);
 
     LIST_INIT (&vm_change_state_head);
 #ifndef _WIN32