diff --git a/Mac/Modules/ae/AEmodule.c b/Mac/Modules/ae/AEmodule.c
index f8c3c91..58b4d13 100644
--- a/Mac/Modules/ae/AEmodule.c
+++ b/Mac/Modules/ae/AEmodule.c
@@ -34,15 +34,14 @@
 
 #include <AppleEvents.h>
 
-#ifdef THINK_C
+#ifndef HAVE_UNIVERSAL_HEADERS
 #define AEIdleProcPtr IdleProcPtr
 #define AEFilterProcPtr EventFilterProcPtr
 #define AEEventHandlerProcPtr EventHandlerProcPtr
 #endif
 
-#ifndef __MWERKS__
-/* Actually, this is "if not universal headers".
-** I'm trying to setup the code here so that is easily automated,
+#ifndef HAVE_UNIVERSAL_HEADERS
+/* I'm trying to setup the code here so that is easily automated,
 ** as follows:
 ** - Use the UPP in the source
 ** - for pre-universal headers, #define each UPP as the corresponding ProcPtr
diff --git a/Mac/Modules/ae/aesupport.py b/Mac/Modules/ae/aesupport.py
index eb18956..3e63656 100644
--- a/Mac/Modules/ae/aesupport.py
+++ b/Mac/Modules/ae/aesupport.py
@@ -78,15 +78,14 @@
 includestuff = includestuff + """
 #include <AppleEvents.h>
 
-#ifdef THINK_C
+#ifndef HAVE_UNIVERSAL_HEADERS
 #define AEIdleProcPtr IdleProcPtr
 #define AEFilterProcPtr EventFilterProcPtr
 #define AEEventHandlerProcPtr EventHandlerProcPtr
 #endif
 
-#ifndef __MWERKS__
-/* Actually, this is "if not universal headers".
-** I'm trying to setup the code here so that is easily automated,
+#ifndef HAVE_UNIVERSAL_HEADERS
+/* I'm trying to setup the code here so that is easily automated,
 ** as follows:
 ** - Use the UPP in the source
 ** - for pre-universal headers, #define each UPP as the corresponding ProcPtr