diff --git a/common/event_sub.cpp b/common/event_sub.cpp
index d8c772df1..c2d94b175 100644
--- a/common/event_sub.cpp
+++ b/common/event_sub.cpp
@@ -1,5 +1,4 @@
 #include "event_sub.h"
-#include <string.h>
 
 void EventSubscriptionWatcher::Subscribe(const std::string &event_name)
 {
diff --git a/common/event_sub.h b/common/event_sub.h
index 71b90f338..389b4ed07 100644
--- a/common/event_sub.h
+++ b/common/event_sub.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <unordered_map>
+#include <string>
 
 class EventSubscriptionWatcher
 {
diff --git a/common/mysql_request_result.h b/common/mysql_request_result.h
index 0cc02a366..ec9b3e57f 100644
--- a/common/mysql_request_result.h
+++ b/common/mysql_request_result.h
@@ -6,6 +6,7 @@
 	#include <windows.h>
 #endif
 
+#include <string>
 #include <mysql.h>
 #include "types.h"
 #include "mysql_request_row.h"
diff --git a/common/useperl.h b/common/useperl.h
index e9a02d604..a6345df5d 100644
--- a/common/useperl.h
+++ b/common/useperl.h
@@ -6,6 +6,10 @@
 #include <EXTERN.h>
 #define WIN32IO_IS_STDIO
 
+// header to detect if libc++ is the std lib
+// this doesn't do shit for C++ but libc++ and GCC 6.1+ use it to define some macros
+#include <ciso646>
+
 #ifndef WIN32
 extern "C" {	//the perl headers dont do this for us...
 #endif
@@ -47,7 +51,7 @@ extern "C" {	//the perl headers dont do this for us...
 #endif
 
 //These need to be cleaned up on FreeBSD
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(_LIBCPP_VERSION)
 #ifdef do_open
 #undef do_open
 #endif