5 files changed, 17 insertions, 22 deletions
diff --git a/src/libstrongswan/utils/host.h b/src/libstrongswan/utils/host.h
index 38bdc809a..74b75ee97 100644
--- a/src/libstrongswan/utils/host.h
+++ b/src/libstrongswan/utils/host.h
@@ -25,6 +25,9 @@
 #ifndef HOST_H_
 #define HOST_H_
 
+typedef enum host_diff_t host_diff_t;
+typedef struct host_t host_t;
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <sys/types.h>
@@ -35,7 +38,6 @@
 
 #include <types.h>
 
-
 /**
  * printf() specifier to print a host.
  * The specifier option '#' does include the port number, e.g.:
@@ -43,8 +45,6 @@
  */
 #define HOST_PRINTF_SPEC 'H'
 
-typedef enum host_diff_t host_diff_t;
-
 /**
  * Differences between two hosts. They differ in
  * address, port, or both.
@@ -55,8 +55,6 @@ enum host_diff_t {
 	HOST_DIFF_PORT = 2,
 };
 
-typedef struct host_t host_t;
-
 /**
  * @brief Representates a Host
  * 
diff --git a/src/libstrongswan/utils/identification.h b/src/libstrongswan/utils/identification.h
index 0d2bc794e..8d8b59935 100644
--- a/src/libstrongswan/utils/identification.h
+++ b/src/libstrongswan/utils/identification.h
@@ -25,7 +25,10 @@
 #ifndef IDENTIFICATION_H_
 #define IDENTIFICATION_H_
 
-#include "types.h"
+typedef enum id_type_t id_type_t;
+typedef struct identification_t identification_t;
+
+#include <types.h>
 
 #define MAX_WILDCARDS     14
 /**
@@ -33,8 +36,6 @@
  */
 #define IDENTIFICATION_PRINTF_SPEC 'D'
 
-typedef enum id_type_t id_type_t;
-
 /**
  * @brief ID Types in a ID payload.
  *
@@ -120,8 +121,6 @@ enum id_type_t {
  */
 extern enum_name_t *id_type_names;
 
-typedef struct identification_t identification_t;
-
 /**
  * @brief Generic identification, such as used in ID payload.
  * 
diff --git a/src/libstrongswan/utils/iterator.h b/src/libstrongswan/utils/iterator.h
index 668fbb764..51a8d6061 100644
--- a/src/libstrongswan/utils/iterator.h
+++ b/src/libstrongswan/utils/iterator.h
@@ -28,18 +28,18 @@ typedef struct iterator_t iterator_t;
 
 /**
  * @brief Iterator interface, allows iteration over collections.
- * 
+ *
  * iterator_t defines an interface for iterating over collections.
  * It allows searching, deleting, updating and inserting.
- * 
+ *
  * Thanks to JMP for iterator lessons :-)
- * 
+ *
  * @b Constructors:
  * - via linked_list_t.create_iterator, or
  * - any other class which supports the iterator_t interface
- * 
+ *
  * @see linked_list_t
- * 
+ *
  * @ingroup utils 
  */
 struct iterator_t {
diff --git a/src/libstrongswan/utils/linked_list.h b/src/libstrongswan/utils/linked_list.h
index 63c7eb6e3..6a97d4445 100644
--- a/src/libstrongswan/utils/linked_list.h
+++ b/src/libstrongswan/utils/linked_list.h
@@ -24,19 +24,18 @@
 #ifndef LINKED_LIST_H_
 #define LINKED_LIST_H_
 
+typedef struct linked_list_t linked_list_t;
+
 #include <pthread.h>
 
 #include <types.h>
 #include <utils/iterator.h>
 
-
-typedef struct linked_list_t linked_list_t;
-
 /**
  * @brief Class implementing a double linked list.
  *
  * General purpose linked list. This list is not synchronized.
- * 
+ *
  * @b Costructors:
  * - linked_list_create()
  *
diff --git a/src/libstrongswan/utils/randomizer.h b/src/libstrongswan/utils/randomizer.h
index 2387cd5fd..d797633af 100644
--- a/src/libstrongswan/utils/randomizer.h
+++ b/src/libstrongswan/utils/randomizer.h
@@ -24,8 +24,9 @@
 #ifndef RANDOMIZER_H_
 #define RANDOMIZER_H_
 
-#include <types.h>
+typedef struct randomizer_t randomizer_t;
 
+#include <types.h>
 
 #ifndef DEV_RANDOM
 /**
@@ -41,8 +42,6 @@
 # define DEV_URANDOM "/dev/urandom"
 #endif
 
-typedef struct randomizer_t randomizer_t;
-
 /**
  * @brief Class used to get random and pseudo random values.
  *