diff --git a/3rdparty/mongoose/mongoose.c b/3rdparty/mongoose/mongoose.c
index d85f6ff3c0a..5a7f74ea942 100644
--- a/3rdparty/mongoose/mongoose.c
+++ b/3rdparty/mongoose/mongoose.c
@@ -2811,7 +2811,7 @@ static int is_big_endian(void) {
 // Copyright(c) By Steve Reid <steve@edmweb.com>
 #define SHA1HANDSOFF
 #if defined(__sun)
-#include "solarisfixes.h"
+//#include "solarisfixes.h"
 #endif
 
 union char64long16 { unsigned char c[64]; uint32_t l[16]; };
diff --git a/scripts/genie.lua b/scripts/genie.lua
index e42c92bd455..c56434aebe6 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -41,7 +41,8 @@ function findfunction(x)
 end
 
 function layoutbuildtask(_folder, _name)
-	return { MAME_DIR .. "src/".._folder.."/".. _name ..".lay" ,    GEN_DIR .. _folder .. "/".._name..".lh",    {  MAME_DIR .. "src/build/file2str.py" }, {"@echo Converting src/".._folder.."/".._name..".lay...",    PYTHON .. " $(1) $(<) $(@) layout_".._name }};
+	return { MAME_DIR .. "src/".._folder.."/".. _name ..".lay" ,    GEN_DIR .. _folder .. "/".._name..".lh",   
+		{  MAME_DIR .. "src/build/file2str.py" }, {"@echo Converting src/".._folder.."/".._name..".lay...",    PYTHON .. " $(1) $(<) $(@) layout_".._name }};
 end
 
 CPUS = {}
@@ -612,10 +613,17 @@ end
 	if _ACTION == "gmake" then
 
 	--we compile C-only to C89 standard with GNU extensions
+if (_OPTIONS["targetos"]=="solaris") then
+	buildoptions_c {
+		"-std=gnu99",
+	}
+else
 	buildoptions_c {
 		"-std=gnu89",
 
 	}
+end	
+
 	
 if _OPTIONS["CPP11"]=="1" then
 	buildoptions_cpp {