diff --git a/osx/config.h b/osx/config.h
index edceac4cd..4431c9c2a 100644
--- a/osx/config.h
+++ b/osx/config.h
@@ -17,6 +17,9 @@
    */
 #define HAVE_DIRENT_H 1
 
+/* Define to 1 if you have the `dirfd' function. */
+#define HAVE_DIRFD 1
+
 /* Define to 1 if you have the <execinfo.h> header file. */
 #define HAVE_EXECINFO_H 1
 
@@ -86,6 +89,15 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1
 
+/* Define to 1 if you have the `std::wcscasecmp' function. */
+/* #undef HAVE_STD__WCSCASECMP */
+
+/* Define to 1 if you have the `std::wcsdup' function. */
+/* #undef HAVE_STD__WCSDUP */
+
+/* Define to 1 if you have the `std::wcsncasecmp' function. */
+/* #undef HAVE_STD__WCSNCASECMP */
+
 /* Define to 1 if you have the <strings.h> header file. */
 #define HAVE_STRINGS_H 1
 
@@ -148,6 +160,9 @@
 /* Define to 1 if you have the `wcslcpy' function. */
 #define HAVE_WCSLCPY 1
 
+/* Define to 1 if you have the `wcsncasecmp' function. */
+#define HAVE_WCSNCASECMP 1
+
 /* Define to 1 if you have the `wcsndup' function. */
 /* #undef HAVE_WCSNDUP */
 
diff --git a/src/fallback.cpp b/src/fallback.cpp
index d7803a0dc..8abb133c2 100644
--- a/src/fallback.cpp
+++ b/src/fallback.cpp
@@ -156,7 +156,7 @@ int wcsncasecmp(const wchar_t *a, const wchar_t *b, size_t n) {
     return wcsncasecmp_fallback(a, b, n);
 }
 #endif  // __DARWIN_C_LEVEL >= 200809L
-#endif  // __APPLE__
+#else  // __APPLE__
 
 /// These functions are missing from Solaris 10
 #ifndef HAVE_WCSDUP
@@ -170,6 +170,7 @@ int wcsncasecmp(const wchar_t *a, const wchar_t *b, size_t n) {
     return wcsncasecmp_fallback(a, b, n);
 }
 #endif
+#endif
 
 #ifndef HAVE_WCSNDUP
 wchar_t *wcsndup(const wchar_t *in, size_t c) {
diff --git a/src/fallback.h b/src/fallback.h
index a986b16ad..f29f2fffb 100644
--- a/src/fallback.h
+++ b/src/fallback.h
@@ -75,7 +75,7 @@ int wcscasecmp(const wchar_t *a, const wchar_t *b);
 int wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n);
 wchar_t *wcsndup(const wchar_t *in, size_t c);
 #endif
-#endif  //__APPLE__
+#else  //__APPLE__
 
 /// These functions are missing from Solaris 10
 #ifndef HAVE_WCSDUP
@@ -94,6 +94,7 @@ int wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n);
 #define dirfd(d) (d->d_fd)
 #endif
 #endif
+#endif
 
 #ifndef HAVE_WCSNDUP
 /// Fallback for wcsndup function. Returns a copy of \c in, truncated to a maximum length of \c c.