diff --git a/include/msgpack/cpp_config.hpp b/include/msgpack/cpp_config.hpp
index 8d33f8b40..97431246e 100644
--- a/include/msgpack/cpp_config.hpp
+++ b/include/msgpack/cpp_config.hpp
@@ -121,4 +121,10 @@ MSGPACK_API_VERSION_NAMESPACE(v1) {
 
 #endif // MSGPACK_USE_CPP03
 
+// Core Foundation headers under OS X define nil as NULL breaking compilation
+// of msgpack/adaptor/nil.hpp and all the headers including it.
+#ifdef nil
+#undef nil
+#endif
+
 #endif /* msgpack/cpp_config.hpp */