diff --git a/Include/pyport.h b/Include/pyport.h
index 7477f07..0ee42f0 100644
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -579,4 +579,11 @@
 #define Py_GCC_ATTRIBUTE(x) __attribute__(x)
 #endif
 
+/* Eliminate end-of-loop code not reached warnings from SunPro C
+ * when using do{...}while(0) macros
+ */
+#ifdef __SUNPRO_C
+#pragma error_messages (off,E_END_OF_LOOP_CODE_NOT_REACHED)
+#endif
+
 #endif /* Py_PYPORT_H */
diff --git a/Modules/_sre.c b/Modules/_sre.c
index 6ee0bb8..4be33d0 100644
--- a/Modules/_sre.c
+++ b/Modules/_sre.c
@@ -34,10 +34,6 @@
  * other compatibility work.
  */
 
-#ifdef __SUNPRO_C
-#pragma error_messages (off,E_END_OF_LOOP_CODE_NOT_REACHED)
-#endif
-
 #ifndef SRE_RECURSIVE
 
 static char copyright[] =
diff --git a/Modules/collectionsmodule.c b/Modules/collectionsmodule.c
index 367b444..c72c7a6 100644
--- a/Modules/collectionsmodule.c
+++ b/Modules/collectionsmodule.c
@@ -1,10 +1,6 @@
 #include "Python.h"
 #include "structmember.h"
 
-#ifdef __SUNPRO_C
-#pragma error_messages (off,E_END_OF_LOOP_CODE_NOT_REACHED)
-#endif
-
 /* collections module implementation of a deque() datatype
    Written and maintained by Raymond D. Hettinger <python@rcn.com>
    Copyright (c) 2004 Python Software Foundation.
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 252db8a..70f05e5 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -9,10 +9,6 @@
 
 #include "Python.h"
 
-#ifdef __SUNPRO_C
-#pragma error_messages (off,E_END_OF_LOOP_CODE_NOT_REACHED)
-#endif
-
 typedef PyDictEntry dictentry;
 typedef PyDictObject dictobject;
 
diff --git a/Objects/listobject.c b/Objects/listobject.c
index 4385e4b..ac8cd33 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -2,10 +2,6 @@
 
 #include "Python.h"
 
-#ifdef __SUNPRO_C
-#pragma error_messages (off,E_END_OF_LOOP_CODE_NOT_REACHED)
-#endif
-
 #ifdef STDC_HEADERS
 #include <stddef.h>
 #else
diff --git a/Objects/setobject.c b/Objects/setobject.c
index e94f920..289d5d3 100644
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -10,10 +10,6 @@
    All rights reserved.
 */
 
-#ifdef __SUNPRO_C
-#pragma error_messages (off,E_END_OF_LOOP_CODE_NOT_REACHED)
-#endif
-
 static PyObject *
 set_update(PySetObject *so, PyObject *other)
 {
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 00ccea8..6c73df4 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -41,10 +41,6 @@
 #include "unicodeobject.h"
 #include "ucnhash.h"
 
-#ifdef __SUNPRO_C
-#pragma error_messages (off,E_END_OF_LOOP_CODE_NOT_REACHED)
-#endif
-
 #ifdef MS_WINDOWS
 #include <windows.h>
 #endif