10 files changed, 13 insertions, 14 deletions
diff --git a/src/libstrongswan/Android.mk b/src/libstrongswan/Android.mk
index 7308e3fee..3d01b2ada 100644
--- a/src/libstrongswan/Android.mk
+++ b/src/libstrongswan/Android.mk
@@ -3,7 +3,7 @@ include $(CLEAR_VARS)
 
 # copy-n-paste from Makefile.am
 LOCAL_SRC_FILES := \
-library.c debug.c enum.c settings.c \
+library.c debug.c settings.c \
 asn1/asn1.c asn1/asn1_parser.c asn1/oid.c bio/bio_reader.c bio/bio_writer.c \
 collections/blocking_queue.c collections/enumerator.c collections/hashtable.c \
 collections/linked_list.c \
@@ -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/identification.c utils/lexparser.c \
+utils.c utils/chunk.c utils/enum.c utils/identification.c utils/lexparser.c \
 utils/optionsfrom.c utils/capabilities.c utils/backtrace.c utils/printf_hook.c
 
 # adding the plugin source files
diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am
index 07d04b03e..153f6c9d4 100644
--- a/src/libstrongswan/Makefile.am
+++ b/src/libstrongswan/Makefile.am
@@ -1,7 +1,7 @@
 ipseclib_LTLIBRARIES = libstrongswan.la
 
 libstrongswan_la_SOURCES = \
-library.c debug.c enum.c settings.c \
+library.c debug.c settings.c \
 asn1/asn1.c asn1/asn1_parser.c asn1/oid.c bio/bio_reader.c bio/bio_writer.c \
 collections/blocking_queue.c collections/enumerator.c collections/hashtable.c \
 collections/linked_list.c \
@@ -28,13 +28,13 @@ 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/identification.c utils/lexparser.c \
+utils.c utils/chunk.c utils/enum.c utils/identification.c utils/lexparser.c \
 utils/optionsfrom.c utils/capabilities.c utils/backtrace.c utils/printf_hook.c
 
 if USE_DEV_HEADERS
 strongswan_includedir = ${dev_headers}
 nobase_strongswan_include_HEADERS = \
-library.h debug.h enum.h settings.h \
+library.h debug.h settings.h \
 asn1/asn1.h asn1/asn1_parser.h asn1/oid.h bio/bio_reader.h bio/bio_writer.h \
 collections/blocking_queue.h collections/enumerator.h collections/hashtable.h \
 collections/linked_list.h \
@@ -68,7 +68,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/identification.h utils/lexparser.h \
+utils.h utils/chunk.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/integrity_checker.h
 endif
diff --git a/src/libstrongswan/crypto/transform.h b/src/libstrongswan/crypto/transform.h
index 311df068f..4a98f81e9 100644
--- a/src/libstrongswan/crypto/transform.h
+++ b/src/libstrongswan/crypto/transform.h
@@ -23,7 +23,7 @@
 
 typedef enum transform_type_t transform_type_t;
 
-#include <enum.h>
+#include <utils/enum.h>
 
 /**
  * Type of a transform, as in IKEv2 RFC 3.3.2.
diff --git a/src/libstrongswan/debug.h b/src/libstrongswan/debug.h
index ff4b4a1e9..337dfd92f 100644
--- a/src/libstrongswan/debug.h
+++ b/src/libstrongswan/debug.h
@@ -26,7 +26,7 @@ typedef enum level_t level_t;
 
 #include <stdio.h>
 
-#include "enum.h"
+#include "utils/enum.h"
 
 /**
  * Debug message group.
diff --git a/src/libstrongswan/plugins/pgp/pgp_builder.c b/src/libstrongswan/plugins/pgp/pgp_builder.c
index 361157742..f358dc764 100644
--- a/src/libstrongswan/plugins/pgp/pgp_builder.c
+++ b/src/libstrongswan/plugins/pgp/pgp_builder.c
@@ -17,7 +17,7 @@
 #include "pgp_builder.h"
 #include "pgp_utils.h"
 
-#include <enum.h>
+#include <utils/enum.h>
 #include <debug.h>
 #include <credentials/keys/private_key.h>
 
diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_library.h b/src/libstrongswan/plugins/pkcs11/pkcs11_library.h
index f225b9b8d..abd99ed5f 100644
--- a/src/libstrongswan/plugins/pkcs11/pkcs11_library.h
+++ b/src/libstrongswan/plugins/pkcs11/pkcs11_library.h
@@ -29,7 +29,7 @@ typedef struct pkcs11_library_t pkcs11_library_t;
 
 #include "pkcs11.h"
 
-#include <enum.h>
+#include <utils/enum.h>
 #include <utils/chunk.h>
 #include <collections/enumerator.h>
 
diff --git a/src/libstrongswan/utils.c b/src/libstrongswan/utils.c
index db55b7673..4e13a4c51 100644
--- a/src/libstrongswan/utils.c
+++ b/src/libstrongswan/utils.c
@@ -27,7 +27,6 @@
 #include <time.h>
 #include <pthread.h>
 
-#include "enum.h"
 #include "debug.h"
 #include "collections/enumerator.h"
 
diff --git a/src/libstrongswan/utils.h b/src/libstrongswan/utils.h
index 4e2065f63..1da71af7b 100644
--- a/src/libstrongswan/utils.h
+++ b/src/libstrongswan/utils.h
@@ -29,7 +29,7 @@
 #include <arpa/inet.h>
 #include <string.h>
 
-#include "enum.h"
+#include "utils/enum.h"
 
 /**
  * strongSwan program return codes
diff --git a/src/libstrongswan/enum.c b/src/libstrongswan/utils/enum.c
index 9b3c4d566..9b3c4d566 100644
--- a/src/libstrongswan/enum.c
+++ b/src/libstrongswan/utils/enum.c
diff --git a/src/libstrongswan/enum.h b/src/libstrongswan/utils/enum.h
index 0ed606813..df8dbf8c1 100644
--- a/src/libstrongswan/enum.h
+++ b/src/libstrongswan/utils/enum.h
@@ -16,13 +16,13 @@
 
 /**
  * @defgroup enum enum
- * @{ @ingroup libstrongswan
+ * @{ @ingroup utils
  */
 
 #ifndef ENUM_H_
 #define ENUM_H_
 
-#include "utils/printf_hook.h"
+#include "printf_hook.h"
 
 typedef struct enum_name_t enum_name_t;