diff --git a/Xosdefs.h b/Xosdefs.h
index 14971c4..903a5a0 100644
--- a/Xosdefs.h
+++ b/Xosdefs.h
@@ -156,7 +156,7 @@ in this Software without prior written authorization from The Open Group.
 #endif
 
 #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) \
-	|| defined(__Darwin__) || defined(__DragonFly__)
+	|| defined(__APPLE__) || defined(__DragonFly__)
 # ifndef CSRG_BASED
 #  define CSRG_BASED
 # endif
diff --git a/Xpoll.h.in b/Xpoll.h.in
index 3940489..33fdad4 100644
--- a/Xpoll.h.in
+++ b/Xpoll.h.in
@@ -91,7 +91,7 @@ from The Open Group.
 
 #ifdef CSRG_BASED
 #include <sys/param.h>
-# if BSD < 199103 || defined(__APPLE__)
+# if BSD < 199103
 typedef long fd_mask;
 # endif
 #endif