7 files changed, 35 insertions, 14 deletions
diff --git a/amiga/gui.c b/amiga/gui.c
index e98eec200..7999041ba 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -240,6 +240,13 @@ STRPTR ami_locale_langs(void)
 	return acceptlangs;
 }
 
+/** Normal entry point from OS */
+int main(int argc, char** argv)
+{
+	setbuf(stderr, NULL);
+	return netsurf_main(argc, argv);
+}
+
 void gui_init(int argc, char** argv)
 {
 	struct Locale *locale;
diff --git a/beos/beos_gui.cpp b/beos/beos_gui.cpp
index 0835a934c..3f83a8dcb 100644
--- a/beos/beos_gui.cpp
+++ b/beos/beos_gui.cpp
@@ -420,6 +420,13 @@ static int32 bapp_thread(void *arg)
 	return 0;
 }
 
+/** Normal entry point from OS */
+int main(int argc, char** argv)
+{
+	setbuf(stderr, NULL);
+	return netsurf_main(argc, argv);
+}
+
 void gui_init(int argc, char** argv)
 {
 	char buf[PATH_MAX];
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index 62adf63e8..a1b7dabae 100644
--- a/desktop/netsurf.c
+++ b/desktop/netsurf.c
@@ -40,7 +40,6 @@
 #include "utils/utils.h"
 
 bool netsurf_quit = false;
-bool netsurf_embedded = true;
 bool verbose_log = false;
 
 static void netsurf_poll(void);
@@ -48,18 +47,6 @@ static void lib_init(void);
 
 
 /**
- * The regular main(), when not embedded
- */
-
-int main(int argc, char** argv)
-{
-	setbuf(stderr, NULL);
-	netsurf_embedded = false;
-	return netsurf_main(argc, argv);
-}
-
-
-/**
  * Gui NetSurf main().
  */
 
diff --git a/desktop/netsurf.h b/desktop/netsurf.h
index e25934234..05b870333 100644
--- a/desktop/netsurf.h
+++ b/desktop/netsurf.h
@@ -22,7 +22,6 @@
 #include <stdbool.h>
 
 extern bool netsurf_quit;
-extern bool netsurf_embedded;
 extern bool verbose_log;
 extern const char * const netsurf_version;
 extern const int netsurf_version_major;
diff --git a/framebuffer/gui.c b/framebuffer/gui.c
index 3e6f9250e..eef613ce1 100644
--- a/framebuffer/gui.c
+++ b/framebuffer/gui.c
@@ -409,6 +409,13 @@ static bool process_cmdline(int argc, char** argv)
 	return true;
 }
 
+/** Normal entry point from OS */
+int main(int argc, char** argv)
+{
+	setbuf(stderr, NULL);
+	return netsurf_main(argc, argv);
+}
+
 void gui_init(int argc, char** argv)
 {
 	char buf[PATH_MAX];
diff --git a/gtk/gtk_gui.c b/gtk/gtk_gui.c
index 43860e9ab..d7c5fed18 100644
--- a/gtk/gtk_gui.c
+++ b/gtk/gtk_gui.c
@@ -195,6 +195,13 @@ static void *myrealloc(void *ptr, size_t len, void *pw)
 	return realloc(ptr, len);
 }
 
+/** Normal entry point from OS */
+int main(int argc, char** argv)
+{
+	setbuf(stderr, NULL);
+	return netsurf_main(argc, argv);
+}
+
 void gui_init(int argc, char** argv)
 {
 	char buf[PATH_MAX];
diff --git a/riscos/gui.c b/riscos/gui.c
index 3fa95eaca..fa1158ad5 100644
--- a/riscos/gui.c
+++ b/riscos/gui.c
@@ -275,6 +275,13 @@ static void *myrealloc(void *ptr, size_t len, void *pw)
 	return realloc(ptr, len);
 }
 
+/** Normal entry point from OS */
+int main(int argc, char** argv)
+{
+	setbuf(stderr, NULL);
+	return netsurf_main(argc, argv);
+}
+
 /**
  * Initialise the gui (RISC OS specific part).
  */