diff --git a/lib/config-mac.h b/lib/config-mac.h
index 1db255009..0af258620 100644
--- a/lib/config-mac.h
+++ b/lib/config-mac.h
@@ -71,5 +71,5 @@
 #define SEND_TYPE_ARG4 int
 #define SEND_TYPE_RETV ssize_t
 
-#include <extra/stricmp.h>
-#include <extra/strdup.h>
+#define HAVE_EXTRA_STRICMP_H 1
+#define HAVE_EXTRA_STRDUP_H  1
diff --git a/lib/setup.h b/lib/setup.h
index dca6da42d..ba3ddce0c 100644
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -165,6 +165,14 @@
 #define _REENTRANT
 #endif
 
+#ifdef HAVE_EXTRA_STRICMP_H
+#  include <extra/stricmp.h>
+#endif
+
+#ifdef HAVE_EXTRA_STRDUP_H
+#  include <extra/strdup.h>
+#endif
+
 #include <stdio.h>
 #ifdef HAVE_ASSERT_H
 #include <assert.h>