- created encoding package

44 files changed, 99 insertions, 100 deletions

diff --git a/Source/charon/configuration_manager.c b/Source/charon/configuration_manager.c
index 740946fe8..3b1488cf6 100644
--- a/Source/charon/configuration_manager.c
+++ b/Source/charon/configuration_manager.c
@@ -29,10 +29,10 @@
 #include <types.h>
 #include <globals.h>
 #include <utils/allocator.h>
-#include <payloads/nonce_payload.h>
-#include <payloads/proposal_substructure.h>
-#include <payloads/ke_payload.h>
-#include <payloads/transform_attribute.h>
+#include <encoding/payloads/nonce_payload.h>
+#include <encoding/payloads/proposal_substructure.h>
+#include <encoding/payloads/ke_payload.h>
+#include <encoding/payloads/transform_attribute.h>
 
 /**
  * Private data of an configuration_t object
diff --git a/Source/charon/configuration_manager.h b/Source/charon/configuration_manager.h
index 3fd902420..b192c0cf7 100644
--- a/Source/charon/configuration_manager.h
+++ b/Source/charon/configuration_manager.h
@@ -26,7 +26,7 @@
 #include <types.h>
 #include <utils/linked_list.h>
 #include <utils/host.h>
-#include <payloads/transform_substructure.h>
+#include <encoding/payloads/transform_substructure.h>
 #include <transforms/prfs/prf.h>
 #include <transforms/signers/signer.h>
 #include <transforms/crypters/crypter.h>
diff --git a/Source/charon/generator.c b/Source/charon/encoding/generator.c
index 10b0c8c9e..734c089a0 100644
--- a/Source/charon/generator.c
+++ b/Source/charon/encoding/generator.c
@@ -33,13 +33,13 @@
 #include <utils/allocator.h>
 #include <utils/linked_list.h>
 #include <utils/logger_manager.h>
-#include <payloads/payload.h>
-#include <payloads/proposal_substructure.h>
-#include <payloads/transform_substructure.h>
-#include <payloads/sa_payload.h>
-#include <payloads/ke_payload.h>
-#include <payloads/notify_payload.h>
-#include <payloads/nonce_payload.h>
+#include <encoding/payloads/payload.h>
+#include <encoding/payloads/proposal_substructure.h>
+#include <encoding/payloads/transform_substructure.h>
+#include <encoding/payloads/sa_payload.h>
+#include <encoding/payloads/ke_payload.h>
+#include <encoding/payloads/notify_payload.h>
+#include <encoding/payloads/nonce_payload.h>
 
 /**
  * Private part of a generator_t object
diff --git a/Source/charon/generator.h b/Source/charon/encoding/generator.h
index efad1c183..312ac0054 100644
--- a/Source/charon/generator.h
+++ b/Source/charon/encoding/generator.h
@@ -24,8 +24,8 @@
 #define GENERATOR_H_
 
 #include <types.h>
-#include <payloads/encodings.h>
-#include <payloads/payload.h>
+#include <encoding/payloads/encodings.h>
+#include <encoding/payloads/payload.h>
 
 /**
  * Generating is done in a data buffer.
diff --git a/Source/charon/message.c b/Source/charon/encoding/message.c
index cb48e5061..d32126ec0 100644
--- a/Source/charon/message.c
+++ b/Source/charon/encoding/message.c
@@ -27,13 +27,13 @@
 #include <types.h>
 #include <globals.h>
 #include <ike_sa_id.h>
-#include <generator.h>
-#include <parser.h>
+#include <encoding/generator.h>
+#include <encoding/parser.h>
 #include <utils/linked_list.h>
 #include <utils/allocator.h>
 #include <utils/logger_manager.h>
-#include <payloads/encodings.h>
-#include <payloads/payload.h>
+#include <encoding/payloads/encodings.h>
+#include <encoding/payloads/payload.h>
 
 
 /**
diff --git a/Source/charon/message.h b/Source/charon/encoding/message.h
index 0385bd7f8..960be94af 100644
--- a/Source/charon/message.h
+++ b/Source/charon/encoding/message.h
@@ -26,7 +26,7 @@
 #include <types.h>
 #include <ike_sa_id.h>
 #include <network/packet.h>
-#include <payloads/ike_header.h>
+#include <encoding/payloads/ike_header.h>
 #include <utils/linked_list.h>
 
 
diff --git a/Source/charon/parser.c b/Source/charon/encoding/parser.c
index 22b60bdc4..cf7d0b8ee 100644
--- a/Source/charon/parser.c
+++ b/Source/charon/encoding/parser.c
@@ -31,15 +31,15 @@
 #include <utils/allocator.h>
 #include <utils/logger.h>
 #include <utils/linked_list.h>
-#include <payloads/encodings.h>
-#include <payloads/payload.h>
-#include <payloads/sa_payload.h>
-#include <payloads/proposal_substructure.h>
-#include <payloads/transform_substructure.h>
-#include <payloads/transform_attribute.h>
-#include <payloads/ke_payload.h>
-#include <payloads/nonce_payload.h>
-#include <payloads/notify_payload.h>
+#include <encoding/payloads/encodings.h>
+#include <encoding/payloads/payload.h>
+#include <encoding/payloads/sa_payload.h>
+#include <encoding/payloads/proposal_substructure.h>
+#include <encoding/payloads/transform_substructure.h>
+#include <encoding/payloads/transform_attribute.h>
+#include <encoding/payloads/ke_payload.h>
+#include <encoding/payloads/nonce_payload.h>
+#include <encoding/payloads/notify_payload.h>
 
 
 
diff --git a/Source/charon/parser.h b/Source/charon/encoding/parser.h
index bde0bbe43..9a99fabb4 100644
--- a/Source/charon/parser.h
+++ b/Source/charon/encoding/parser.h
@@ -24,8 +24,8 @@
 #define PARSER_H_
 
 #include <types.h>
-#include <payloads/encodings.h>
-#include <payloads/payload.h>
+#include <encoding/payloads/encodings.h>
+#include <encoding/payloads/payload.h>
 
 
 /**
diff --git a/Source/charon/payloads/encodings.c b/Source/charon/encoding/payloads/encodings.c
index 4747ddc22..4747ddc22 100644
--- a/Source/charon/payloads/encodings.c
+++ b/Source/charon/encoding/payloads/encodings.c
diff --git a/Source/charon/payloads/encodings.h b/Source/charon/encoding/payloads/encodings.h
index 1401ea798..1401ea798 100644
--- a/Source/charon/payloads/encodings.h
+++ b/Source/charon/encoding/payloads/encodings.h
diff --git a/Source/charon/payloads/ike_header.c b/Source/charon/encoding/payloads/ike_header.c
index 8152e33da..1f1c34253 100644
--- a/Source/charon/payloads/ike_header.c
+++ b/Source/charon/encoding/payloads/ike_header.c
@@ -28,7 +28,7 @@
 
 #include "ike_header.h"
 
-#include <payloads/encodings.h>
+#include <encoding/payloads/encodings.h>
 #include <utils/allocator.h>
 
 typedef struct private_ike_header_s private_ike_header_t;
diff --git a/Source/charon/payloads/ike_header.h b/Source/charon/encoding/payloads/ike_header.h
index 88bcbcfb0..ce52b55df 100644
--- a/Source/charon/payloads/ike_header.h
+++ b/Source/charon/encoding/payloads/ike_header.h
@@ -27,7 +27,7 @@
 #define IKE_HEADER_H_
 
 #include <types.h>
-#include <payloads/payload.h>
+#include <encoding/payloads/payload.h>
 
 /**
  * Major Version of IKEv2
diff --git a/Source/charon/payloads/ke_payload.c b/Source/charon/encoding/payloads/ke_payload.c
index 76f9b6f4e..478519634 100644
--- a/Source/charon/payloads/ke_payload.c
+++ b/Source/charon/encoding/payloads/ke_payload.c
@@ -29,7 +29,7 @@
 
 #include "ke_payload.h"
 
-#include <payloads/encodings.h>
+#include <encoding/payloads/encodings.h>
 #include <utils/allocator.h>
 
 
diff --git a/Source/charon/payloads/ke_payload.h b/Source/charon/encoding/payloads/ke_payload.h
index 84844010e..8855941f1 100644
--- a/Source/charon/payloads/ke_payload.h
+++ b/Source/charon/encoding/payloads/ke_payload.h
@@ -28,8 +28,8 @@
 #define KE_PAYLOAD_H_
 
 #include <types.h>
-#include <payloads/payload.h>
-#include <payloads/transform_substructure.h>
+#include <encoding/payloads/payload.h>
+#include <encoding/payloads/transform_substructure.h>
 #include <utils/linked_list.h>
 
 /**
diff --git a/Source/charon/payloads/nonce_payload.c b/Source/charon/encoding/payloads/nonce_payload.c
index 4dc10c62f..fa3730e2f 100644
--- a/Source/charon/payloads/nonce_payload.c
+++ b/Source/charon/encoding/payloads/nonce_payload.c
@@ -27,7 +27,7 @@
 
 #include "nonce_payload.h"
 
-#include <payloads/encodings.h>
+#include <encoding/payloads/encodings.h>
 #include <utils/allocator.h>
 
 
diff --git a/Source/charon/payloads/nonce_payload.h b/Source/charon/encoding/payloads/nonce_payload.h
index 918dc8e88..7768fa990 100644
--- a/Source/charon/payloads/nonce_payload.h
+++ b/Source/charon/encoding/payloads/nonce_payload.h
@@ -26,7 +26,7 @@
 #define NONCE_PAYLOAD_H_
 
 #include <types.h>
-#include <payloads/payload.h>
+#include <encoding/payloads/payload.h>
 
 /**
  * length of a nonce payload without a nonce in int
diff --git a/Source/charon/payloads/notify_payload.c b/Source/charon/encoding/payloads/notify_payload.c
index f430282d5..adcde11a2 100644
--- a/Source/charon/payloads/notify_payload.c
+++ b/Source/charon/encoding/payloads/notify_payload.c
@@ -29,7 +29,7 @@
 
 #include "notify_payload.h"
 
-#include <payloads/encodings.h>
+#include <encoding/payloads/encodings.h>
 #include <utils/allocator.h>
 
 /**
diff --git a/Source/charon/payloads/notify_payload.h b/Source/charon/encoding/payloads/notify_payload.h
index 026be97bc..cf4235fc3 100644
--- a/Source/charon/payloads/notify_payload.h
+++ b/Source/charon/encoding/payloads/notify_payload.h
@@ -29,7 +29,7 @@
 #define NOTIFY_PAYLOAD_H_
 
 #include <types.h>
-#include <payloads/payload.h>
+#include <encoding/payloads/payload.h>
 #include <utils/linked_list.h>
 
 /**
diff --git a/Source/charon/payloads/payload.c b/Source/charon/encoding/payloads/payload.c
index 322ec600e..a2333f6af 100644
--- a/Source/charon/payloads/payload.c
+++ b/Source/charon/encoding/payloads/payload.c
@@ -24,11 +24,11 @@
 
 #include "payload.h"
 
-#include <payloads/ike_header.h>
-#include <payloads/sa_payload.h>
-#include <payloads/nonce_payload.h>
-#include <payloads/ke_payload.h>
-#include <payloads/notify_payload.h>
+#include <encoding/payloads/ike_header.h>
+#include <encoding/payloads/sa_payload.h>
+#include <encoding/payloads/nonce_payload.h>
+#include <encoding/payloads/ke_payload.h>
+#include <encoding/payloads/notify_payload.h>
 
 
 
diff --git a/Source/charon/payloads/payload.h b/Source/charon/encoding/payloads/payload.h
index e88d9e6c7..9d8b753cb 100644
--- a/Source/charon/payloads/payload.h
+++ b/Source/charon/encoding/payloads/payload.h
@@ -24,9 +24,9 @@
 #ifndef PAYLOAD_H_
 #define PAYLOAD_H_
 
-#include <payloads/encodings.h>
 #include <types.h>
 #include <definitions.h>
+#include <encoding/payloads/encodings.h>
 
 
 /**
diff --git a/Source/charon/payloads/proposal_substructure.c b/Source/charon/encoding/payloads/proposal_substructure.c
index 511224aa4..b53633fb5 100644
--- a/Source/charon/payloads/proposal_substructure.c
+++ b/Source/charon/encoding/payloads/proposal_substructure.c
@@ -27,8 +27,8 @@
 
 #include "proposal_substructure.h"
 
-#include <payloads/encodings.h>
-#include <payloads/transform_substructure.h>
+#include <encoding/payloads/encodings.h>
+#include <encoding/payloads/transform_substructure.h>
 #include <types.h>
 #include <utils/allocator.h>
 #include <utils/linked_list.h>
diff --git a/Source/charon/payloads/proposal_substructure.h b/Source/charon/encoding/payloads/proposal_substructure.h
index 91b06067f..1da42d10d 100644
--- a/Source/charon/payloads/proposal_substructure.h
+++ b/Source/charon/encoding/payloads/proposal_substructure.h
@@ -26,8 +26,8 @@
 #define PROPOSAL_SUBSTRUCTURE_H_
 
 #include <types.h>
-#include <payloads/payload.h>
-#include <payloads/transform_substructure.h>
+#include <encoding/payloads/payload.h>
+#include <encoding/payloads/transform_substructure.h>
 #include <utils/linked_list.h>
 
 /**
diff --git a/Source/charon/payloads/sa_payload.c b/Source/charon/encoding/payloads/sa_payload.c
index ee88fa37c..83eb62acd 100644
--- a/Source/charon/payloads/sa_payload.c
+++ b/Source/charon/encoding/payloads/sa_payload.c
@@ -28,7 +28,7 @@
 
 #include "sa_payload.h"
 
-#include <payloads/encodings.h>
+#include <encoding/payloads/encodings.h>
 #include <utils/allocator.h>
 #include <utils/linked_list.h>
 
diff --git a/Source/charon/payloads/sa_payload.h b/Source/charon/encoding/payloads/sa_payload.h
index 42c2a7414..f13282de9 100644
--- a/Source/charon/payloads/sa_payload.h
+++ b/Source/charon/encoding/payloads/sa_payload.h
@@ -27,8 +27,8 @@
 #define SA_PAYLOAD_H_
 
 #include <types.h>
-#include <payloads/payload.h>
-#include <payloads/proposal_substructure.h>
+#include <encoding/payloads/payload.h>
+#include <encoding/payloads/proposal_substructure.h>
 #include <utils/linked_list.h>
 
 /**
diff --git a/Source/charon/payloads/transform_attribute.c b/Source/charon/encoding/payloads/transform_attribute.c
index 4fdcf38d9..9aed1e332 100644
--- a/Source/charon/payloads/transform_attribute.c
+++ b/Source/charon/encoding/payloads/transform_attribute.c
@@ -27,7 +27,7 @@
 
 #include "transform_attribute.h"
 
-#include <payloads/encodings.h>
+#include <encoding/payloads/encodings.h>
 #include <types.h>
 #include <utils/allocator.h>
 
diff --git a/Source/charon/payloads/transform_attribute.h b/Source/charon/encoding/payloads/transform_attribute.h
index 4cf289ca6..7cc72f207 100644
--- a/Source/charon/payloads/transform_attribute.h
+++ b/Source/charon/encoding/payloads/transform_attribute.h
@@ -26,7 +26,7 @@
 #define TRANSFORM_ATTRIBUTE_H_
 
 #include <types.h>
-#include <payloads/payload.h>
+#include <encoding/payloads/payload.h>
 
 
 /**
diff --git a/Source/charon/payloads/transform_substructure.c b/Source/charon/encoding/payloads/transform_substructure.c
index e65c590d1..d44d4c4f8 100644
--- a/Source/charon/payloads/transform_substructure.c
+++ b/Source/charon/encoding/payloads/transform_substructure.c
@@ -27,8 +27,8 @@
 
 #include "transform_substructure.h"
 
-#include <payloads/transform_attribute.h>
-#include <payloads/encodings.h>
+#include <encoding/payloads/transform_attribute.h>
+#include <encoding/payloads/encodings.h>
 #include <types.h>
 #include <utils/allocator.h>
 #include <utils/linked_list.h>
diff --git a/Source/charon/payloads/transform_substructure.h b/Source/charon/encoding/payloads/transform_substructure.h
index 924dfe754..1be66597e 100644
--- a/Source/charon/payloads/transform_substructure.h
+++ b/Source/charon/encoding/payloads/transform_substructure.h
@@ -27,8 +27,8 @@
 
 #include <types.h>
 #include <definitions.h>
-#include <payloads/payload.h>
-#include <payloads/transform_attribute.h>
+#include <encoding/payloads/payload.h>
+#include <encoding/payloads/transform_attribute.h>
 #include <utils/linked_list.h>
 
 
diff --git a/Source/charon/ike_sa.c b/Source/charon/ike_sa.c
index bd7af05ea..bd1669284 100644
--- a/Source/charon/ike_sa.c
+++ b/Source/charon/ike_sa.c
@@ -32,11 +32,11 @@
 #include <utils/randomizer.h>
 #include <transforms/diffie_hellman.h>
 #include <transforms/prf_plus.h>
-#include <payloads/sa_payload.h>
-#include <payloads/nonce_payload.h>
-#include <payloads/ke_payload.h>
-#include <payloads/transform_substructure.h>
-#include <payloads/transform_attribute.h>
+#include <encoding/payloads/sa_payload.h>
+#include <encoding/payloads/nonce_payload.h>
+#include <encoding/payloads/ke_payload.h>
+#include <encoding/payloads/transform_substructure.h>
+#include <encoding/payloads/transform_attribute.h>
 #include <states/initiator_init.h>
 #include <states/responder_init.h>
 
diff --git a/Source/charon/ike_sa.h b/Source/charon/ike_sa.h
index b47d8e571..5faddc4ff 100644
--- a/Source/charon/ike_sa.h
+++ b/Source/charon/ike_sa.h
@@ -25,7 +25,7 @@
 #define IKE_SA_H_
 
 #include <types.h>
-#include <message.h>
+#include <encoding/message.h>
 #include <ike_sa_id.h>
 #include <utils/logger.h>
 #include <utils/randomizer.h>
diff --git a/Source/charon/states/ike_sa_init_requested.c b/Source/charon/states/ike_sa_init_requested.c
index 4d545309d..ea03602a9 100644
--- a/Source/charon/states/ike_sa_init_requested.c
+++ b/Source/charon/states/ike_sa_init_requested.c
@@ -24,9 +24,9 @@
 
 #include <globals.h>
 #include <utils/allocator.h>
-#include <payloads/sa_payload.h>
-#include <payloads/ke_payload.h>
-#include <payloads/nonce_payload.h>
+#include <encoding/payloads/sa_payload.h>
+#include <encoding/payloads/ke_payload.h>
+#include <encoding/payloads/nonce_payload.h>
 #include <transforms/diffie_hellman.h>
 
 /**
diff --git a/Source/charon/states/initiator_init.c b/Source/charon/states/initiator_init.c
index 265bf3afa..d70db6937 100644
--- a/Source/charon/states/initiator_init.c
+++ b/Source/charon/states/initiator_init.c
@@ -28,9 +28,9 @@
 #include <states/ike_sa_init_requested.h>
 #include <utils/allocator.h>
 #include <transforms/diffie_hellman.h>
-#include <payloads/sa_payload.h>
-#include <payloads/ke_payload.h>
-#include <payloads/nonce_payload.h>
+#include <encoding/payloads/sa_payload.h>
+#include <encoding/payloads/ke_payload.h>
+#include <encoding/payloads/nonce_payload.h>
 
 
 /**
diff --git a/Source/charon/states/responder_init.c b/Source/charon/states/responder_init.c
index 869d868e9..7b2f4998f 100644
--- a/Source/charon/states/responder_init.c
+++ b/Source/charon/states/responder_init.c
@@ -26,9 +26,9 @@
 #include <states/state.h>
 #include <states/ike_sa_init_responded.h>
 #include <utils/allocator.h>
-#include <payloads/sa_payload.h>
-#include <payloads/ke_payload.h>
-#include <payloads/nonce_payload.h>
+#include <encoding/payloads/sa_payload.h>
+#include <encoding/payloads/ke_payload.h>
+#include <encoding/payloads/nonce_payload.h>
 #include <transforms/diffie_hellman.h>
 
 /**
diff --git a/Source/charon/states/state.h b/Source/charon/states/state.h
index 13a51338b..305199f3f 100644
--- a/Source/charon/states/state.h
+++ b/Source/charon/states/state.h
@@ -25,7 +25,7 @@
 
 #include <definitions.h>
 #include <types.h>
-#include <message.h>
+#include <encoding/message.h>
 
 extern mapping_t ike_sa_state_m[];
 
diff --git a/Source/charon/testcases/diffie_hellman_test.c b/Source/charon/testcases/diffie_hellman_test.c
index 7f5da9cf1..83758c908 100644
--- a/Source/charon/testcases/diffie_hellman_test.c
+++ b/Source/charon/testcases/diffie_hellman_test.c
@@ -27,7 +27,7 @@
 #include <globals.h>
 #include <utils/logger_manager.h>
 #include <utils/allocator.h>
-#include <payloads/transform_substructure.h>
+#include <encoding/payloads/transform_substructure.h>
 
 /* 
  * described in Header-File
diff --git a/Source/charon/testcases/generator_test.c b/Source/charon/testcases/generator_test.c
index 28d92048b..01090f747 100644
--- a/Source/charon/testcases/generator_test.c
+++ b/Source/charon/testcases/generator_test.c
@@ -25,19 +25,19 @@
 #include "generator_test.h"
 
 #include <globals.h>
-#include <generator.h>
+#include <encoding/generator.h>
 #include <utils/allocator.h>
 #include <utils/logger_manager.h>
 #include <utils/logger.h>
-#include <payloads/encodings.h>
-#include <payloads/ike_header.h>
-#include <payloads/transform_attribute.h>
-#include <payloads/transform_substructure.h>
-#include <payloads/proposal_substructure.h>
-#include <payloads/sa_payload.h>
-#include <payloads/ke_payload.h>
-#include <payloads/notify_payload.h>
-#include <payloads/nonce_payload.h>
+#include <encoding/payloads/encodings.h>
+#include <encoding/payloads/ike_header.h>
+#include <encoding/payloads/transform_attribute.h>
+#include <encoding/payloads/transform_substructure.h>
+#include <encoding/payloads/proposal_substructure.h>
+#include <encoding/payloads/sa_payload.h>
+#include <encoding/payloads/ke_payload.h>
+#include <encoding/payloads/notify_payload.h>
+#include <encoding/payloads/nonce_payload.h>
 
 /*
  * Described in Header 
diff --git a/Source/charon/testcases/ike_sa_test.c b/Source/charon/testcases/ike_sa_test.c
index 60496706a..68c6e84b0 100644
--- a/Source/charon/testcases/ike_sa_test.c
+++ b/Source/charon/testcases/ike_sa_test.c
@@ -23,7 +23,7 @@
 #include "ike_sa_test.h"
 
 #include <types.h>
-#include <message.h>
+#include <encoding/message.h>
 #include <ike_sa.h>
 
 void test_ike_sa(tester_t *tester)
diff --git a/Source/charon/testcases/parser_test.c b/Source/charon/testcases/parser_test.c
index a94ff6486..85705a1f3 100644
--- a/Source/charon/testcases/parser_test.c
+++ b/Source/charon/testcases/parser_test.c
@@ -23,16 +23,16 @@
 
 #include "parser_test.h"
 
-#include <generator.h>
-#include <parser.h>
 #include <utils/allocator.h>
 #include <utils/logger_manager.h>
-#include <payloads/encodings.h>
-#include <payloads/ike_header.h>
-#include <payloads/sa_payload.h>
-#include <payloads/nonce_payload.h>
-#include <payloads/ke_payload.h>
-#include <payloads/notify_payload.h>
+#include <encoding/generator.h>
+#include <encoding/parser.h>
+#include <encoding/payloads/encodings.h>
+#include <encoding/payloads/ike_header.h>
+#include <encoding/payloads/sa_payload.h>
+#include <encoding/payloads/nonce_payload.h>
+#include <encoding/payloads/ke_payload.h>
+#include <encoding/payloads/notify_payload.h>
 
 
 extern logger_manager_t *global_logger_manager;
diff --git a/Source/charon/testcases/receiver_test.c b/Source/charon/testcases/receiver_test.c
index 44ea6f37d..6a0cf0a7e 100644
--- a/Source/charon/testcases/receiver_test.c
+++ b/Source/charon/testcases/receiver_test.c
@@ -32,7 +32,7 @@
 #include <queues/send_queue.h>
 #include <queues/job_queue.h>
 #include <queues/jobs/incoming_packet_job.h>
-#include <payloads/encodings.h>
+#include <encoding/payloads/encodings.h>
 #include <utils/allocator.h>
 
 /**
diff --git a/Source/charon/transforms/crypters/crypter.h b/Source/charon/transforms/crypters/crypter.h
index 91ed54573..97a8ad81d 100644
--- a/Source/charon/transforms/crypters/crypter.h
+++ b/Source/charon/transforms/crypters/crypter.h
@@ -23,7 +23,7 @@
 #ifndef CRYPTER_H_
 #define CRYPTER_H_
 
-#include <payloads/transform_substructure.h>
+#include <encoding/payloads/transform_substructure.h>
 
 
 /**
diff --git a/Source/charon/transforms/diffie_hellman.c b/Source/charon/transforms/diffie_hellman.c
index cd2721bd9..2acd0d960 100644
--- a/Source/charon/transforms/diffie_hellman.c
+++ b/Source/charon/transforms/diffie_hellman.c
@@ -27,7 +27,6 @@
 
 #include "diffie_hellman.h"
 
-#include <payloads/transform_substructure.h>
 #include <utils/allocator.h>
 #include <utils/randomizer.h>
 #include <utils/gmp_helper.h>
diff --git a/Source/charon/transforms/diffie_hellman.h b/Source/charon/transforms/diffie_hellman.h
index ff3921e44..e775cbb15 100644
--- a/Source/charon/transforms/diffie_hellman.h
+++ b/Source/charon/transforms/diffie_hellman.h
@@ -24,7 +24,7 @@
 #define DIFFIE_HELLMAN_H_
 
 #include <types.h>
-#include <payloads/transform_substructure.h>
+#include <encoding/payloads/transform_substructure.h>
 
 /**
  * Object representing a diffie hellman exchange
diff --git a/Source/charon/transforms/prfs/prf.h b/Source/charon/transforms/prfs/prf.h
index 72d543b34..da624a0f0 100644
--- a/Source/charon/transforms/prfs/prf.h
+++ b/Source/charon/transforms/prfs/prf.h
@@ -23,7 +23,7 @@
 #ifndef PRF_H_
 #define PRF_H_
 
-#include <payloads/transform_substructure.h>
+#include <encoding/payloads/transform_substructure.h>
 
 
 /**
diff --git a/Source/charon/transforms/signers/signer.h b/Source/charon/transforms/signers/signer.h
index 3dbc72f88..d179b1317 100644
--- a/Source/charon/transforms/signers/signer.h
+++ b/Source/charon/transforms/signers/signer.h
@@ -23,7 +23,7 @@
 #ifndef SIGNER_H_
 #define SIGNER_H_
 
-#include <payloads/transform_substructure.h>
+#include <encoding/payloads/transform_substructure.h>
 
 
 /**