diff --git a/include/header_encryption.h b/include/header_encryption.h
index a5e3f89..6e10254 100644
--- a/include/header_encryption.h
+++ b/include/header_encryption.h
@@ -16,6 +16,7 @@
  *
  */
 
+#include "n2n_typedefs.h"
 
 int packet_header_decrypt (uint8_t packet[], uint16_t packet_len,
                            char *community_name,
diff --git a/include/n2n.h b/include/n2n.h
index 61b8db0..8c52927 100644
--- a/include/n2n.h
+++ b/include/n2n.h
@@ -155,7 +155,6 @@
 
 /* ************************************** */
 
-#include "header_encryption.h"
 #include "tf.h"
 
 #ifndef TRACE_ERROR
diff --git a/src/edge_utils.c b/src/edge_utils.c
index 81b5e3a..a5acc73 100644
--- a/src/edge_utils.c
+++ b/src/edge_utils.c
@@ -17,6 +17,7 @@
  */
 
 #include "auth.h"                    // for generate_private_key
+#include "header_encryption.h"       // for packet_header_encrypt, packet_he...
 #include "n2n.h"
 #include "network_traffic_filter.h"
 #include "edge_utils_win32.h"
diff --git a/src/header_encryption.c b/src/header_encryption.c
index 5511557..3567bbe 100644
--- a/src/header_encryption.c
+++ b/src/header_encryption.c
@@ -17,6 +17,7 @@
  */
 
 
+#include "header_encryption.h"  // for packet_header_change_dynamic_key, pac...
 #include "n2n.h"
 
 
diff --git a/src/sn_utils.c b/src/sn_utils.c
index ed90b9e..13e2ffb 100644
--- a/src/sn_utils.c
+++ b/src/sn_utils.c
@@ -17,6 +17,7 @@
  */
 
 #include "auth.h"               // for ascii_to_bin, calculate_dynamic_key
+#include "header_encryption.h"  // for packet_header_encrypt, packet_header_...
 #include "n2n.h"
 
 #define HASH_FIND_COMMUNITY(head, name, out) HASH_FIND_STR(head, name, out)
diff --git a/src/supernode.c b/src/supernode.c
index b178d81..4454fbd 100644
--- a/src/supernode.c
+++ b/src/supernode.c
@@ -19,7 +19,6 @@
 /* Supernode for n2n-2.x */
 
 #include "n2n.h"
-#include "header_encryption.h"
 
 #define HASH_FIND_COMMUNITY(head, name, out) HASH_FIND_STR(head, name, out)