diff --git a/src/emu/cpu/m68000/m68kcpu.h b/src/emu/cpu/m68000/m68kcpu.h
index 0ca635c630d..d4b33b04a8e 100644
--- a/src/emu/cpu/m68000/m68kcpu.h
+++ b/src/emu/cpu/m68000/m68kcpu.h
@@ -32,7 +32,7 @@ class m68000_base_device;
 
 #include <limits.h>
 
-#ifdef SDLMAME_SOLARIS
+#ifdef defined(__sun__) && defined(__svr4__)
 #undef REG_SP
 #undef REG_PC
 #undef REG_FP
diff --git a/src/emu/emucore.h b/src/emu/emucore.h
index 899ee9fa670..bbec24ecfd8 100644
--- a/src/emu/emucore.h
+++ b/src/emu/emucore.h
@@ -23,7 +23,7 @@
 #include <stdarg.h>
 
 // some cleanups for Solaris for things defined in stdlib.h
-#ifdef SDLMAME_SOLARIS
+#ifdef defined(__sun__) && defined(__svr4__)
 #undef si_status
 #undef WWORD
 #endif
@@ -373,7 +373,7 @@ ATTR_NORETURN void fatalerror_exitcode(running_machine &machine, int exitcode, c
 //**************************************************************************
 
 // population count
-#ifndef SDLMAME_NETBSD
+#ifndef defined(__NetBSD__)
 inline int popcount(UINT32 val)
 {
 	int count;
diff --git a/src/emu/luaengine.c b/src/emu/luaengine.c
index c8bb21eedc3..f31e7c4550d 100644
--- a/src/emu/luaengine.c
+++ b/src/emu/luaengine.c
@@ -130,7 +130,7 @@ lua_engine::hook::hook()
 	cb = -1;
 }
 
-#if defined(SDLMAME_SOLARIS) || defined(__ANDROID__)
+#if (defined(__sun__) && defined(__svr4__)) || defined(__ANDROID__)
 #undef _L
 #endif
 
diff --git a/src/emu/machine.c b/src/emu/machine.c
index badd3ecc90e..4791aa0f590 100644
--- a/src/emu/machine.c
+++ b/src/emu/machine.c
@@ -385,7 +385,7 @@ int running_machine::run(bool firstrun)
 		{
 			g_profiler.start(PROFILER_EXTRA);
 
-			#ifdef SDLMAME_EMSCRIPTEN
+			#if defined(EMSCRIPTEN)
 			//break out to our async javascript loop and halt
 			js_set_main_loop(this);
 			#endif
@@ -1344,7 +1344,7 @@ void system_time::full_time::set(struct tm &t)
 //  JAVASCRIPT PORT-SPECIFIC
 //**************************************************************************
 
-#ifdef SDLMAME_EMSCRIPTEN
+#if defined(EMSCRIPTEN)
 
 static running_machine * jsmess_machine;
 
@@ -1377,4 +1377,4 @@ sound_manager * js_get_sound() {
 	return &(jsmess_machine->sound());
 }
 
-#endif /* SDLMAME_EMSCRIPTEN */
+#endif /* defined(EMSCRIPTEN) */
diff --git a/src/emu/netlist/plists.h b/src/emu/netlist/plists.h
index e3d3a99d184..6a694a2e086 100644
--- a/src/emu/netlist/plists.h
+++ b/src/emu/netlist/plists.h
@@ -199,7 +199,7 @@ private:
 // pnamedlist_t: a simple list
 // ----------------------------------------------------------------------------------------
 
-#if defined(SDLMAME_SOLARIS) || defined(__ANDROID__)
+#if defined(defined(__sun__) && defined(__svr4__)) || defined(__ANDROID__)
 #undef _C
 #endif
 
diff --git a/src/emu/ui/ui.c b/src/emu/ui/ui.c
index b968937cbea..8d119e131f6 100644
--- a/src/emu/ui/ui.c
+++ b/src/emu/ui/ui.c
@@ -319,7 +319,7 @@ void ui_manager::display_startup_screens(bool first_time, bool show_disclaimer)
 	if (!first_time || (str > 0 && str < 60*5) || &machine().system() == &GAME_NAME(___empty) || (machine().debug_flags & DEBUG_FLAG_ENABLED) != 0)
 		show_gameinfo = show_warnings = show_disclaimer = show_mandatory_fileman = FALSE;
 
-	#ifdef SDLMAME_EMSCRIPTEN
+	#if defined(EMSCRIPTEN)
 	// also disable for the JavaScript port since the startup screens do not run asynchronously
 	show_gameinfo = show_warnings = show_disclaimer = FALSE;
 	#endif