8 files changed, 24 insertions, 23 deletions
diff --git a/Source/charon/threads/receiver.c b/Source/charon/threads/receiver.c
index ba7e229b0..b042c402d 100644
--- a/Source/charon/threads/receiver.c
+++ b/Source/charon/threads/receiver.c
@@ -33,12 +33,12 @@
 #include <utils/allocator.h>
 #include <utils/logger_manager.h>
 
+typedef struct private_receiver_t private_receiver_t;
+
 /**
  * Private data of a receiver object
  */
-typedef struct private_receiver_s private_receiver_t;
-
-struct private_receiver_s {
+struct private_receiver_t {
 	/**
 	 * Public part of a receiver object
 	 */
diff --git a/Source/charon/threads/receiver.h b/Source/charon/threads/receiver.h
index 49f71be40..2f330adbf 100644
--- a/Source/charon/threads/receiver.h
+++ b/Source/charon/threads/receiver.h
@@ -25,12 +25,12 @@
 
 #include <types.h>
 
+typedef struct receiver_t receiver_t;
+
 /**
  * @brief A Receiver object which receives packets on the socket and adds them to the job-queue
  */
-typedef struct receiver_s receiver_t;
-
-struct receiver_s {
+struct receiver_t {
 
 	/**
 	 * @brief Destroys a receiver object
diff --git a/Source/charon/threads/scheduler.c b/Source/charon/threads/scheduler.c
index d7f0694e7..789e39aa6 100644
--- a/Source/charon/threads/scheduler.c
+++ b/Source/charon/threads/scheduler.c
@@ -34,9 +34,9 @@
 /**
  * Private data of a scheduler object
  */
-typedef struct private_scheduler_s private_scheduler_t;
+typedef struct private_scheduler_t private_scheduler_t;
 
-struct private_scheduler_s {
+struct private_scheduler_t {
 	/**
 	 * Public part of a scheduler object
 	 */
diff --git a/Source/charon/threads/scheduler.h b/Source/charon/threads/scheduler.h
index 8aa8fbbef..1bd9e62cd 100644
--- a/Source/charon/threads/scheduler.h
+++ b/Source/charon/threads/scheduler.h
@@ -25,15 +25,15 @@
 
 #include <types.h>
 
+typedef struct scheduler_t scheduler_t;
+
 /**
  * @brief The scheduler, looks for timed events in event-queue and adds them
  * to the job-queue.
  * 
  * Starts a thread which does the work, since event-queue is blocking
  */
-typedef struct scheduler_s scheduler_t;
-
-struct scheduler_s { 	
+struct scheduler_t { 	
 
 	/**
 	 * @brief Destroys a scheduler object
diff --git a/Source/charon/threads/sender.c b/Source/charon/threads/sender.c
index d2376962f..94ebda37c 100644
--- a/Source/charon/threads/sender.c
+++ b/Source/charon/threads/sender.c
@@ -32,12 +32,12 @@
 #include <utils/allocator.h>
 #include <utils/logger_manager.h>
 
+typedef struct private_sender_t private_sender_t;
+
 /**
  * Private data of a sender object
  */
-typedef struct private_sender_s private_sender_t;
-
-struct private_sender_s {
+struct private_sender_t {
 	/**
 	 * Public part of a sender object
 	 */
diff --git a/Source/charon/threads/sender.h b/Source/charon/threads/sender.h
index 386e429ee..c57213ce3 100644
--- a/Source/charon/threads/sender.h
+++ b/Source/charon/threads/sender.h
@@ -25,12 +25,12 @@
 
 #include <types.h>
 
+typedef struct sender_t sender_t;
+
 /**
  * @brief A Sender object which sends packets on the socket
  */
-typedef struct sender_s sender_t;
-
-struct sender_s {
+struct sender_t {
 
 	/**
 	 * @brief Destroys a sender object
diff --git a/Source/charon/threads/thread_pool.c b/Source/charon/threads/thread_pool.c
index 037222810..7cf802bda 100644
--- a/Source/charon/threads/thread_pool.c
+++ b/Source/charon/threads/thread_pool.c
@@ -35,12 +35,12 @@
 #include <utils/allocator.h>
 #include <utils/logger.h>
 
+typedef struct private_thread_pool_t private_thread_pool_t;
+
 /**
  * @brief structure with private members for thread_pool_t
  */
-typedef struct private_thread_pool_s private_thread_pool_t;
-
-struct private_thread_pool_s {
+struct private_thread_pool_t {
 	/**
 	 * inclusion of public members
 	 */
diff --git a/Source/charon/threads/thread_pool.h b/Source/charon/threads/thread_pool.h
index 54022e4b4..609fb04d2 100644
--- a/Source/charon/threads/thread_pool.h
+++ b/Source/charon/threads/thread_pool.h
@@ -27,15 +27,16 @@
 
 #include <types.h>
 
+
+typedef struct thread_pool_t thread_pool_t;
+
 /**
  * @brief A thread_pool contains a pool of threads processing the job queue.
  * 
  * Current implementation uses as many threads as specified in constructor.
  * A more improved version would dynamically increase thread count if necessary...
  */
-typedef struct thread_pool_s thread_pool_t;
-
-struct thread_pool_s {
+struct thread_pool_t {
 	/**
 	 * @brief return currently instanciated threads
 	 *