diff --git a/include/tins/pdu_option.h b/include/tins/pdu_option.h
index dc1ecdd..efb45a6 100644
--- a/include/tins/pdu_option.h
+++ b/include/tins/pdu_option.h
@@ -37,10 +37,10 @@
 #include <stdint.h>
 #include "exceptions.h"
 #include "endianness.h"
-#include "internals.h"
 #include "ip_address.h"
 #include "ipv6_address.h"
 #include "hw_address.h"
+#include "detail/type_traits.h"
 
 namespace Tins {
 /**
diff --git a/src/crypto.cpp b/src/crypto.cpp
index eafcf4b..9ffd2c1 100644
--- a/src/crypto.cpp
+++ b/src/crypto.cpp
@@ -38,6 +38,7 @@
 #endif // TINS_HAVE_WPA2_DECRYPTION
 #include "dot11/dot11_data.h"
 #include "dot11/dot11_beacon.h"
+#include "internals.h"
 #include "exceptions.h"
 
 using std::string;
diff --git a/src/icmpv6.cpp b/src/icmpv6.cpp
index 52475eb..7426efd 100644
--- a/src/icmpv6.cpp
+++ b/src/icmpv6.cpp
@@ -36,6 +36,7 @@
 #include "constants.h"
 #include "exceptions.h"
 #include "memory_helpers.h"
+#include "internals.h"
 
 using std::memset;
 using std::vector;
diff --git a/src/ip.cpp b/src/ip.cpp
index ded12e5..3bcbdb3 100644
--- a/src/ip.cpp
+++ b/src/ip.cpp
@@ -46,6 +46,7 @@
 #include "exceptions.h"
 #include "pdu_allocator.h"
 #include "memory_helpers.h"
+#include "internals.h"
 
 using std::list;
 using std::min;