10 files changed, 13 insertions, 13 deletions
diff --git a/src/libimcv/imcv.c b/src/libimcv/imcv.c
index f9de41fa7..e1b828d10 100644
--- a/src/libimcv/imcv.c
+++ b/src/libimcv/imcv.c
@@ -16,8 +16,8 @@
 #include "ietf/ietf_attr.h"
 #include "ita/ita_attr.h"
 
-#include <utils.h>
 #include <utils/debug.h>
+#include <utils/utils.h>
 #include <pen/pen.h>
 
 #include <syslog.h>
diff --git a/src/libstrongswan/Android.mk b/src/libstrongswan/Android.mk
index 47470c357..c7c5d4bcc 100644
--- a/src/libstrongswan/Android.mk
+++ b/src/libstrongswan/Android.mk
@@ -30,7 +30,7 @@ pen/pen.c plugins/plugin_loader.c plugins/plugin_feature.c processing/jobs/job.c
 processing/jobs/callback_job.c processing/processor.c processing/scheduler.c \
 selectors/traffic_selector.c threading/thread.c threading/thread_value.c \
 threading/mutex.c threading/semaphore.c threading/rwlock.c threading/spinlock.c \
-utils.c utils/chunk.c utils/debug.c utils/enum.c utils/identification.c \
+utils/utils.c utils/chunk.c utils/debug.c utils/enum.c utils/identification.c \
 utils/lexparser.c utils/optionsfrom.c utils/capabilities.c utils/backtrace.c \
 utils/printf_hook.c utils/settings.c
 
diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am
index 2aed071eb..56e28d7bc 100644
--- a/src/libstrongswan/Makefile.am
+++ b/src/libstrongswan/Makefile.am
@@ -28,7 +28,7 @@ pen/pen.c plugins/plugin_loader.c plugins/plugin_feature.c processing/jobs/job.c
 processing/jobs/callback_job.c processing/processor.c processing/scheduler.c \
 selectors/traffic_selector.c threading/thread.c threading/thread_value.c \
 threading/mutex.c threading/semaphore.c threading/rwlock.c threading/spinlock.c \
-utils.c utils/chunk.c utils/debug.c utils/enum.c utils/identification.c \
+utils/utils.c utils/chunk.c utils/debug.c utils/enum.c utils/identification.c \
 utils/lexparser.c utils/optionsfrom.c utils/capabilities.c utils/backtrace.c \
 utils/printf_hook.c utils/settings.c
 
@@ -69,7 +69,7 @@ processing/scheduler.h selectors/traffic_selector.h \
 threading/thread.h threading/thread_value.h \
 threading/mutex.h threading/condvar.h threading/spinlock.h threading/semaphore.h \
 threading/rwlock.h threading/rwlock_condvar.h threading/lock_profiler.h \
-utils.h utils/chunk.h utils/debug.h utils/enum.h utils/identification.h \
+utils/utils.h utils/chunk.h utils/debug.h utils/enum.h utils/identification.h \
 utils/lexparser.h utils/optionsfrom.h utils/capabilities.h utils/backtrace.h \
 utils/leak_detective.h utils/printf_hook.h utils/settings.h utils/integrity_checker.h
 endif
diff --git a/src/libstrongswan/collections/enumerator.h b/src/libstrongswan/collections/enumerator.h
index 900c97385..299373a3e 100644
--- a/src/libstrongswan/collections/enumerator.h
+++ b/src/libstrongswan/collections/enumerator.h
@@ -23,7 +23,7 @@
 
 typedef struct enumerator_t enumerator_t;
 
-#include "../utils.h"
+#include <utils/utils.h>
 
 /**
  * Enumerator interface, allows enumeration over collections.
diff --git a/src/libstrongswan/library.h b/src/libstrongswan/library.h
index e547c7eec..43c6b33d3 100644
--- a/src/libstrongswan/library.h
+++ b/src/libstrongswan/library.h
@@ -80,9 +80,9 @@
 # error config.h not included, pass "-include [...]/config.h" to gcc
 #endif
 
-/* make sure we include printf_hook.h first */
+/* make sure we include printf_hook.h and utils.h first */
 #include "utils/printf_hook.h"
-#include "utils.h"
+#include "utils/utils.h"
 #include "networking/host_resolver.h"
 #include "processing/processor.h"
 #include "processing/scheduler.h"
diff --git a/src/libstrongswan/utils/chunk.h b/src/libstrongswan/utils/chunk.h
index 865c1b82f..67848eec1 100644
--- a/src/libstrongswan/utils/chunk.h
+++ b/src/libstrongswan/utils/chunk.h
@@ -42,7 +42,7 @@ struct chunk_t {
 	size_t len;
 };
 
-#include "../utils.h"
+#include "utils.h"
 
 /**
  * A { NULL, 0 }-chunk handy for initialization.
diff --git a/src/libstrongswan/utils/integrity_checker.h b/src/libstrongswan/utils/integrity_checker.h
index f999b9a29..afaa114b3 100644
--- a/src/libstrongswan/utils/integrity_checker.h
+++ b/src/libstrongswan/utils/integrity_checker.h
@@ -21,7 +21,7 @@
 #ifndef INTEGRITY_CHECKER_H_
 #define INTEGRITY_CHECKER_H_
 
-#include "../utils.h"
+#include "utils.h"
 
 typedef struct integrity_checker_t integrity_checker_t;
 typedef struct integrity_checksum_t integrity_checksum_t;
diff --git a/src/libstrongswan/utils/settings.h b/src/libstrongswan/utils/settings.h
index ae4e719e8..a861325f5 100644
--- a/src/libstrongswan/utils/settings.h
+++ b/src/libstrongswan/utils/settings.h
@@ -24,7 +24,7 @@
 
 typedef struct settings_t settings_t;
 
-#include "../utils.h"
+#include "utils.h"
 #include "collections/enumerator.h"
 
 /**
diff --git a/src/libstrongswan/utils.c b/src/libstrongswan/utils/utils.c
index bf0224c5f..bf0224c5f 100644
--- a/src/libstrongswan/utils.c
+++ b/src/libstrongswan/utils/utils.c
diff --git a/src/libstrongswan/utils.h b/src/libstrongswan/utils/utils.h
index 1da71af7b..7b1beb93a 100644
--- a/src/libstrongswan/utils.h
+++ b/src/libstrongswan/utils/utils.h
@@ -15,8 +15,8 @@
  */
 
 /**
- * @defgroup utils utils
- * @{ @ingroup libstrongswan
+ * @defgroup utils_i utils
+ * @{ @ingroup utils
  */
 
 #ifndef UTILS_H_
@@ -29,7 +29,7 @@
 #include <arpa/inet.h>
 #include <string.h>
 
-#include "utils/enum.h"
+#include "enum.h"
 
 /**
  * strongSwan program return codes