diff --git a/src/emu/emucore.h b/src/emu/emucore.h
index 7c5f2343a0e..683f031715d 100644
--- a/src/emu/emucore.h
+++ b/src/emu/emucore.h
@@ -402,8 +402,8 @@ inline _Dest downcast(_Source &src)
 //  FUNCTION PROTOTYPES
 //**************************************************************************
 
-DECL_NORETURN void fatalerror(const char *format, ...) ATTR_PRINTF(1,2) ATTR_NORETURN;
-DECL_NORETURN void fatalerror_exitcode(running_machine &machine, int exitcode, const char *format, ...) ATTR_PRINTF(3,4) ATTR_NORETURN;
+ATTR_NORETURN void fatalerror(const char *format, ...) ATTR_PRINTF(1,2);
+ATTR_NORETURN void fatalerror_exitcode(running_machine &machine, int exitcode, const char *format, ...) ATTR_PRINTF(3,4);
 
 inline void fatalerror(const char *format, ...)
 {
diff --git a/src/osd/osdcomm.h b/src/osd/osdcomm.h
index 722fef1aa23..66ae5758e6d 100644
--- a/src/osd/osdcomm.h
+++ b/src/osd/osdcomm.h
@@ -82,7 +82,11 @@
 #define SETJMP_GNUC_PROTECT()   (void)__builtin_return_address(1)
 #else
 #define ATTR_UNUSED
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#define ATTR_NORETURN			__declspec(noreturn)
+#else
 #define ATTR_NORETURN
+#endif
 #define ATTR_PRINTF(x,y)
 #define ATTR_MALLOC
 #define ATTR_PURE
@@ -99,14 +103,6 @@
 #endif
 
 
-/* And some MSVC optimizations/warnings */
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#define DECL_NORETURN           __declspec(noreturn)
-#else
-#define DECL_NORETURN
-#endif
-
-
 
 /***************************************************************************
     FUNDAMENTAL TYPES