diff --git a/include/amqpcpp/bytebuffer.h b/include/amqpcpp/bytebuffer.h
index eaedbd09..85f6e135 100644
--- a/include/amqpcpp/bytebuffer.h
+++ b/include/amqpcpp/bytebuffer.h
@@ -13,6 +13,11 @@
  */
 #pragma once
 
+
+#ifdef __APPLE__
+#include "buffer.h"
+#endif
+
 /**
  *  Open namespace
  */
diff --git a/include/amqpcpp/channel.h b/include/amqpcpp/channel.h
index 5844609f..787e890b 100644
--- a/include/amqpcpp/channel.h
+++ b/include/amqpcpp/channel.h
@@ -9,6 +9,10 @@
  */
 #pragma once
 
+#ifdef __APPLE__
+#include "envelope.h"
+#endif
+
 /**
  *  Set up namespace
  */
diff --git a/include/amqpcpp/connection.h b/include/amqpcpp/connection.h
index ee4bb222..4045799f 100644
--- a/include/amqpcpp/connection.h
+++ b/include/amqpcpp/connection.h
@@ -9,6 +9,11 @@
  */
 #pragma once
 
+#ifdef __APPLE__
+#include "connectionimpl.h"
+#include "bytebuffer.h"
+#endif
+
 /**
  *  Set up namespace
  */
diff --git a/include/amqpcpp/linux_tcp/tcpchannel.h b/include/amqpcpp/linux_tcp/tcpchannel.h
index cfd11090..5de60420 100644
--- a/include/amqpcpp/linux_tcp/tcpchannel.h
+++ b/include/amqpcpp/linux_tcp/tcpchannel.h
@@ -12,6 +12,10 @@
  */
 #pragma once
 
+#ifdef __APPLE__
+#include "../channel.h"
+#endif
+
 /**
  *  Set up namespace
  */
diff --git a/include/amqpcpp/linux_tcp/tcpconnection.h b/include/amqpcpp/linux_tcp/tcpconnection.h
index 5095be1e..bf92cfd7 100644
--- a/include/amqpcpp/linux_tcp/tcpconnection.h
+++ b/include/amqpcpp/linux_tcp/tcpconnection.h
@@ -13,6 +13,13 @@
  */
 #pragma once
 
+#ifdef __APPLE__
+#include "../connectionhandler.h"
+#include "../watchable.h"
+#include "../connection.h"
+#include "../address.h"
+#endif
+
 /**
  *  Set up namespace
  */
diff --git a/include/amqpcpp/linux_tcp/tcphandler.h b/include/amqpcpp/linux_tcp/tcphandler.h
index 1b64fe9a..2b9a89dd 100644
--- a/include/amqpcpp/linux_tcp/tcphandler.h
+++ b/include/amqpcpp/linux_tcp/tcphandler.h
@@ -14,6 +14,10 @@
  */
 #pragma once
 
+#ifdef __APPLE__
+#include "../table.h"
+#endif
+
 /**
  *  Set up namespace
  */