18 files changed, 32 insertions, 32 deletions
diff --git a/Source/charon/daemon.c b/Source/charon/daemon.c
index b3e9b615d..277d8c6c6 100644
--- a/Source/charon/daemon.c
+++ b/Source/charon/daemon.c
@@ -27,18 +27,18 @@
 #include "daemon.h" 
 
 
-#include "types.h"
-#include "socket.h"
-#include "ike_sa_manager.h"
-#include "sender.h"
-#include "receiver.h"
-#include "scheduler.h"
-#include "thread_pool.h"
-#include "utils/allocator.h"
-#include "utils/logger_manager.h"
-#include "queues/event_queue.h"
-#include "queues/job_queue.h"
-#include "queues/send_queue.h"
+#include <types.h>
+#include <ike_sa_manager.h>
+#include <sender.h>
+#include <receiver.h>
+#include <scheduler.h>
+#include <thread_pool.h>
+#include <network/socket.h>
+#include <utils/allocator.h>
+#include <utils/logger_manager.h>
+#include <queues/event_queue.h>
+#include <queues/job_queue.h>
+#include <queues/send_queue.h>
 
 
 /* function declaration (defined and described after main function) */
diff --git a/Source/charon/globals.h b/Source/charon/globals.h
index 137ac0d92..d3cfb0896 100644
--- a/Source/charon/globals.h
+++ b/Source/charon/globals.h
@@ -23,10 +23,10 @@
 #ifndef GLOBALS_H_
 #define GLOBALS_H_
 
-#include <socket.h>
 #include <ike_sa_manager.h>
 #include <queues/send_queue.h>
 #include <queues/job_queue.h>
+#include <network/socket.h>
 #include <queues/event_queue.h>
 #include <utils/logger_manager.h>
 #include <configuration_manager.h>
diff --git a/Source/charon/message.h b/Source/charon/message.h
index 4850250fd..0385bd7f8 100644
--- a/Source/charon/message.h
+++ b/Source/charon/message.h
@@ -24,8 +24,8 @@
 #define MESSAGE_H_
 
 #include <types.h>
-#include <packet.h>
 #include <ike_sa_id.h>
+#include <network/packet.h>
 #include <payloads/ike_header.h>
 #include <utils/linked_list.h>
 
diff --git a/Source/charon/packet.c b/Source/charon/network/packet.c
index f09b18ae3..f09b18ae3 100644
--- a/Source/charon/packet.c
+++ b/Source/charon/network/packet.c
diff --git a/Source/charon/packet.h b/Source/charon/network/packet.h
index 10488e0aa..10488e0aa 100644
--- a/Source/charon/packet.h
+++ b/Source/charon/network/packet.h
diff --git a/Source/charon/socket.c b/Source/charon/network/socket.c
index fc652b557..fc652b557 100644
--- a/Source/charon/socket.c
+++ b/Source/charon/network/socket.c
diff --git a/Source/charon/socket.h b/Source/charon/network/socket.h
index b69c50cf1..d5fd828ed 100644
--- a/Source/charon/socket.h
+++ b/Source/charon/network/socket.h
@@ -27,7 +27,7 @@
 
 
 #include <types.h>
-#include <packet.h>
+#include <network/packet.h>
 
 
 /**
diff --git a/Source/charon/queues/jobs/incoming_packet_job.h b/Source/charon/queues/jobs/incoming_packet_job.h
index 5e5cb34b5..51842cfae 100644
--- a/Source/charon/queues/jobs/incoming_packet_job.h
+++ b/Source/charon/queues/jobs/incoming_packet_job.h
@@ -24,7 +24,7 @@
 #define INCOMING_PACKET_JOB_H_
 
 #include <types.h>
-#include <packet.h>
+#include <network/packet.h>
 #include <queues/jobs/job.h>
 
 /**
diff --git a/Source/charon/queues/jobs/job.h b/Source/charon/queues/jobs/job.h
index ad8f59a33..59b0f7b65 100644
--- a/Source/charon/queues/jobs/job.h
+++ b/Source/charon/queues/jobs/job.h
@@ -95,10 +95,5 @@ struct job_s{
 	status_t (*destroy) (job_t *job);
 };
 
-#include "initiate_ike_sa_job.h"
-#include "delete_ike_sa_job.h"
-#include "incoming_packet_job.h"
-
-
 
 #endif /*JOB_H_*/
diff --git a/Source/charon/queues/send_queue.h b/Source/charon/queues/send_queue.h
index 7d2592ab1..c1f643c13 100644
--- a/Source/charon/queues/send_queue.h
+++ b/Source/charon/queues/send_queue.h
@@ -24,7 +24,7 @@
 #define SEND_QUEUE_H_
 
 #include <types.h>
-#include <packet.h>
+#include <network/packet.h>
 
 /**
  * @brief Send-Queue
diff --git a/Source/charon/receiver.c b/Source/charon/receiver.c
index 3f77eb5e8..ba7e229b0 100644
--- a/Source/charon/receiver.c
+++ b/Source/charon/receiver.c
@@ -25,9 +25,9 @@
 
 #include "receiver.h"
 
-#include <socket.h>
-#include <packet.h>
 #include <globals.h>
+#include <network/socket.h>
+#include <network/packet.h>
 #include <queues/job_queue.h>
 #include <queues/jobs/job.h>
 #include <utils/allocator.h>
diff --git a/Source/charon/sender.c b/Source/charon/sender.c
index 074d30b65..d2376962f 100644
--- a/Source/charon/sender.c
+++ b/Source/charon/sender.c
@@ -25,9 +25,9 @@
 
 #include "sender.h"
 
-#include <socket.h>
-#include <packet.h>
 #include <globals.h>
+#include <network/socket.h>
+#include <network/packet.h>
 #include <queues/send_queue.h>
 #include <utils/allocator.h>
 #include <utils/logger_manager.h>
diff --git a/Source/charon/testcases/packet_test.c b/Source/charon/testcases/packet_test.c
index aaf2218f5..873b88cb5 100644
--- a/Source/charon/testcases/packet_test.c
+++ b/Source/charon/testcases/packet_test.c
@@ -24,8 +24,8 @@
 
 #include "packet_test.h"
 
-#include <packet.h>
 #include <globals.h>
+#include <network/packet.h>
 #include <utils/allocator.h>
 #include <utils/logger_manager.h>
 
diff --git a/Source/charon/testcases/receiver_test.c b/Source/charon/testcases/receiver_test.c
index e333d3857..44ea6f37d 100644
--- a/Source/charon/testcases/receiver_test.c
+++ b/Source/charon/testcases/receiver_test.c
@@ -27,10 +27,11 @@
 
 #include <globals.h>
 #include <receiver.h>
-#include <packet.h>
-#include <socket.h>
+#include <network/packet.h>
+#include <network/socket.h>
 #include <queues/send_queue.h>
 #include <queues/job_queue.h>
+#include <queues/jobs/incoming_packet_job.h>
 #include <payloads/encodings.h>
 #include <utils/allocator.h>
 
diff --git a/Source/charon/testcases/scheduler_test.c b/Source/charon/testcases/scheduler_test.c
index 76011156f..aeb73b2eb 100644
--- a/Source/charon/testcases/scheduler_test.c
+++ b/Source/charon/testcases/scheduler_test.c
@@ -29,6 +29,7 @@
 #include <scheduler.h>
 #include <queues/event_queue.h>
 #include <queues/job_queue.h>
+#include <queues/jobs/incoming_packet_job.h>
 
 
 /**
diff --git a/Source/charon/testcases/sender_test.c b/Source/charon/testcases/sender_test.c
index c90eb9d7e..a4ed41b0d 100644
--- a/Source/charon/testcases/sender_test.c
+++ b/Source/charon/testcases/sender_test.c
@@ -26,8 +26,8 @@
 
 #include <globals.h>
 #include <sender.h>
-#include <packet.h>
-#include <socket.h>
+#include <network/packet.h>
+#include <network/socket.h>
 #include <queues/send_queue.h>
 #include <queues/job_queue.h>
 #include <utils/allocator.h>
diff --git a/Source/charon/testcases/socket_test.c b/Source/charon/testcases/socket_test.c
index d73be702c..69b2d8ea8 100644
--- a/Source/charon/testcases/socket_test.c
+++ b/Source/charon/testcases/socket_test.c
@@ -25,7 +25,7 @@
 
 #include "socket_test.h"
 
-#include <socket.h>
+#include <network/socket.h>
 #include <utils/allocator.h>
 
 /*
diff --git a/Source/charon/thread_pool.c b/Source/charon/thread_pool.c
index 876f6c7df..037222810 100644
--- a/Source/charon/thread_pool.c
+++ b/Source/charon/thread_pool.c
@@ -29,6 +29,9 @@
  
 #include <globals.h>
 #include <queues/job_queue.h>
+#include <queues/jobs/delete_ike_sa_job.h>
+#include <queues/jobs/incoming_packet_job.h>
+#include <queues/jobs/initiate_ike_sa_job.h>
 #include <utils/allocator.h>
 #include <utils/logger.h>