diff --git a/config-mac.h b/config-mac.h
index 8915defa68afc23d8da241f81f8ed3bab4a5aed3..2328ada13884b7eed5aa3c35be13193f5f946f20 100644
--- a/config-mac.h
+++ b/config-mac.h
@@ -31,11 +31,15 @@
 //#define HAVE_STRICMP		1
 #define HAVE_SIGACTION		1
 
-#define USE_SSLEAY			1
-#define USE_OPENSSL			1
+#ifdef MACOS_SSL_SUPPORT
+#	define USE_SSLEAY			1
+#	define USE_OPENSSL			1
+#endif
+
 #define HAVE_RAND_STATUS	1
 #define HAVE_RAND_EGD		1
 
 #define HAVE_FIONBIO        1
 
-#include "GUSIExtra.h"
+#include <extra/stricmp.h>
+#include <extra/strdup.h>
diff --git a/src/config-mac.h b/src/config-mac.h
index 9e8daf0e44b255d12489e32829b685496562271a..e43a9a5932e5eedfc249b3397e18ad68dad63fff 100644
--- a/src/config-mac.h
+++ b/src/config-mac.h
@@ -1,3 +1,11 @@
+#define HAVE_UNISTD_H		1
+#define HAVE_FCNTL_H		1
+#define HAVE_UTIME_H		1
+#define HAVE_SYS_UTIME_H	1
+
+#define HAVE_SETVBUF		1
+#define HAVE_UTIME			1
+
 #define main(x,y) curl_main(x,y)
 
 /* we provide our own strdup prototype */