13 files changed, 54 insertions, 48 deletions
diff --git a/Source/charon/queues/event_queue.c b/Source/charon/queues/event_queue.c
index ab2680c31..20802d3e8 100644
--- a/Source/charon/queues/event_queue.c
+++ b/Source/charon/queues/event_queue.c
@@ -31,15 +31,15 @@
 
 
 
+typedef struct event_t event_t;
+
 /**
  * @brief Represents an event as it is stored in the event queue.
  *
  * A event consists of a event time and an assigned job object.
  *
  */
-typedef struct event_s event_t;
-
-struct event_s{
+struct event_t{
 	/**
 	 * Time to fire the event.
 	 */
@@ -95,14 +95,13 @@ static event_t *event_create(timeval_t time, job_t *job)
 }
 
 
+typedef struct private_event_queue_t private_event_queue_t;
+
 /**
  * @brief Private Variables and Functions of event_queue_t class.
  *
  */
-typedef struct private_event_queue_s private_event_queue_t;
-
-
-struct private_event_queue_s {
+struct private_event_queue_t {
 	/**
 	 * Public part.
 	 */
diff --git a/Source/charon/queues/event_queue.h b/Source/charon/queues/event_queue.h
index 49f6d718f..4f3d543d6 100644
--- a/Source/charon/queues/event_queue.h
+++ b/Source/charon/queues/event_queue.h
@@ -28,15 +28,15 @@
 #include <types.h>
 #include <queues/jobs/job.h>
 
+typedef struct event_queue_t event_queue_t;
+
 /**
  * @brief Event-Queue used to store timed events.
  *
  * Although the event-queue is based on a linked_list_t
  * all access functions are thread-save implemented.
  */
-typedef struct event_queue_s event_queue_t;
-
-struct event_queue_s {
+struct event_queue_t {
 
 	/**
 	 * @brief Returns number of events in queue.
diff --git a/Source/charon/queues/job_queue.c b/Source/charon/queues/job_queue.c
index 9486bf6d4..bd11d0b26 100644
--- a/Source/charon/queues/job_queue.c
+++ b/Source/charon/queues/job_queue.c
@@ -28,14 +28,14 @@
 #include <utils/allocator.h>
 #include <utils/linked_list.h>
 
+
+typedef struct private_job_queue_t private_job_queue_t;
+
 /**
  * @brief Private Variables and Functions of job_queue class
  *
  */
-typedef struct private_job_queue_s private_job_queue_t;
-
-
-struct private_job_queue_s {
+struct private_job_queue_t {
  	job_queue_t public;
 
 	/**
diff --git a/Source/charon/queues/job_queue.h b/Source/charon/queues/job_queue.h
index 3fde9ccce..4c7c12241 100644
--- a/Source/charon/queues/job_queue.h
+++ b/Source/charon/queues/job_queue.h
@@ -26,15 +26,15 @@
 #include <types.h>
 #include <queues/jobs/job.h>
 
+typedef struct job_queue_t job_queue_t;
+
 /**
  * @brief Job-Queue
  *
  * Although the job-queue is based on a linked_list_t
  * all access functions are thread-save implemented
  */
-typedef struct job_queue_s job_queue_t;
-
-struct job_queue_s {
+struct job_queue_t {
 
 	/**
 	 * @brief returns number of jobs in queue
diff --git a/Source/charon/queues/jobs/delete_ike_sa_job.c b/Source/charon/queues/jobs/delete_ike_sa_job.c
index 6d24d81eb..b87c4dc7d 100644
--- a/Source/charon/queues/jobs/delete_ike_sa_job.c
+++ b/Source/charon/queues/jobs/delete_ike_sa_job.c
@@ -24,13 +24,14 @@
 
 #include <utils/allocator.h>
 
+
+typedef struct private_delete_ike_sa_job_t private_delete_ike_sa_job_t;
+
 /**
  * Private data of an delete_ike_sa_job_t Object
  * 
  */
-typedef struct private_delete_ike_sa_job_s private_delete_ike_sa_job_t;
-
-struct private_delete_ike_sa_job_s {
+struct private_delete_ike_sa_job_t {
 	/**
 	 * public delete_ike_sa_job_t interface
 	 */
diff --git a/Source/charon/queues/jobs/delete_ike_sa_job.h b/Source/charon/queues/jobs/delete_ike_sa_job.h
index fe7c03f57..b5674fb59 100644
--- a/Source/charon/queues/jobs/delete_ike_sa_job.h
+++ b/Source/charon/queues/jobs/delete_ike_sa_job.h
@@ -28,13 +28,13 @@
 #include <queues/jobs/job.h>
 
 
+typedef struct delete_ike_sa_job_t delete_ike_sa_job_t;
+
 /**
  * Object representing an DELETE_IKE_SA Job
  * 
  */
-typedef struct delete_ike_sa_job_s delete_ike_sa_job_t;
-
-struct delete_ike_sa_job_s {
+struct delete_ike_sa_job_t {
 	/**
 	 * implements job_t interface
 	 */
diff --git a/Source/charon/queues/jobs/incoming_packet_job.c b/Source/charon/queues/jobs/incoming_packet_job.c
index afd1474e0..9d66bee53 100644
--- a/Source/charon/queues/jobs/incoming_packet_job.c
+++ b/Source/charon/queues/jobs/incoming_packet_job.c
@@ -25,13 +25,14 @@
 
 #include <utils/allocator.h>
 
+
+typedef struct private_incoming_packet_job_t private_incoming_packet_job_t;
+
 /**
  * Private data of an incoming_packet_job_t Object
  * 
  */
-typedef struct private_incoming_packet_job_s private_incoming_packet_job_t;
-
-struct private_incoming_packet_job_s {
+struct private_incoming_packet_job_t {
 	/**
 	 * public incoming_packet_job_t interface
 	 */
diff --git a/Source/charon/queues/jobs/incoming_packet_job.h b/Source/charon/queues/jobs/incoming_packet_job.h
index 51842cfae..757ab12e3 100644
--- a/Source/charon/queues/jobs/incoming_packet_job.h
+++ b/Source/charon/queues/jobs/incoming_packet_job.h
@@ -27,13 +27,14 @@
 #include <network/packet.h>
 #include <queues/jobs/job.h>
 
+
+typedef struct incoming_packet_job_t incoming_packet_job_t;
+
 /**
  * Object representing an INCOMING_PACKET Job
  * 
  */
-typedef struct incoming_packet_job_s incoming_packet_job_t;
-
-struct incoming_packet_job_s {
+struct incoming_packet_job_t {
 	/**
 	 * implements job_t interface
 	 */
diff --git a/Source/charon/queues/jobs/initiate_ike_sa_job.c b/Source/charon/queues/jobs/initiate_ike_sa_job.c
index 59c1bf17e..b58bd71c4 100644
--- a/Source/charon/queues/jobs/initiate_ike_sa_job.c
+++ b/Source/charon/queues/jobs/initiate_ike_sa_job.c
@@ -27,13 +27,14 @@
 
 #include <utils/allocator.h>
 
+
+typedef struct private_initiate_ike_sa_job_t private_initiate_ike_sa_job_t;
+
 /**
  * Private data of an initiate_ike_sa_job_t Object
  * 
  */
-typedef struct private_initiate_ike_sa_job_s private_initiate_ike_sa_job_t;
-
-struct private_initiate_ike_sa_job_s {
+struct private_initiate_ike_sa_job_t {
 	/**
 	 * public initiate_ike_sa_job_t interface
 	 */
diff --git a/Source/charon/queues/jobs/initiate_ike_sa_job.h b/Source/charon/queues/jobs/initiate_ike_sa_job.h
index 4ffb732cd..a5bbc9300 100644
--- a/Source/charon/queues/jobs/initiate_ike_sa_job.h
+++ b/Source/charon/queues/jobs/initiate_ike_sa_job.h
@@ -26,13 +26,13 @@
 #include <types.h>
 #include <queues/jobs/job.h>
 
+typedef struct initiate_ike_sa_job_t initiate_ike_sa_job_t;
+
 /**
  * Object representing an INITIATE_IKE_SA Job
  * 
  */
-typedef struct initiate_ike_sa_job_s initiate_ike_sa_job_t;
-
-struct initiate_ike_sa_job_s {
+struct initiate_ike_sa_job_t {
 	/**
 	 * implements job_t interface
 	 */
diff --git a/Source/charon/queues/jobs/job.h b/Source/charon/queues/jobs/job.h
index 59b0f7b65..57c615f25 100644
--- a/Source/charon/queues/jobs/job.h
+++ b/Source/charon/queues/jobs/job.h
@@ -26,12 +26,13 @@
 #include <types.h>
 #include <definitions.h>
 
+
+typedef enum job_type_t job_type_t;
+
 /**
  * Type of Jobs in Job-Queue
  */
-typedef enum job_type_e job_type_t;
-
-enum job_type_e {
+enum job_type_t {
 	/** 
 	 * Process an incoming IKEv2-Message
 	 * 
@@ -61,14 +62,15 @@ enum job_type_e {
 
 extern mapping_t job_type_m[];
 
+
+typedef struct job_t job_t;
+
 /**
  * @brief Job-Interface as it is stored in the job queue
  * 
  * A job consists of a job-type and one or more assigned values
  */
-typedef struct job_s job_t;
-
-struct job_s{
+struct job_t{
 
 	/**
 	 * @brief get type of job
diff --git a/Source/charon/queues/send_queue.c b/Source/charon/queues/send_queue.c
index 0cffa2d54..5782ce151 100644
--- a/Source/charon/queues/send_queue.c
+++ b/Source/charon/queues/send_queue.c
@@ -27,14 +27,14 @@
 #include <utils/allocator.h>
 #include <utils/linked_list.h>
 
+
+typedef struct private_send_queue_t private_send_queue_t;
+
  /**
  * @brief Private Variables and Functions of send_queue class
  *
  */
-typedef struct private_send_queue_s private_send_queue_t;
-
-
-struct private_send_queue_s {
+struct private_send_queue_t {
 	/**
 	 * Public part of the send_queue_t object
 	 */
diff --git a/Source/charon/queues/send_queue.h b/Source/charon/queues/send_queue.h
index c1f643c13..572c40e62 100644
--- a/Source/charon/queues/send_queue.h
+++ b/Source/charon/queues/send_queue.h
@@ -26,15 +26,16 @@
 #include <types.h>
 #include <network/packet.h>
 
+
+typedef struct send_queue_t send_queue_t;
+
 /**
  * @brief Send-Queue
  *
  * Although the send-queue is based on a linked_list_t
  * all access functions are thread-save implemented
  */
-typedef struct send_queue_s send_queue_t;
-
-struct send_queue_s {
+struct send_queue_t {
 
 	/**
 	 * @brief returns number of packets in queue