utils: Clean up includes

src/libstrongswan/utils/utils.c

@@ -16,25 +16,20 @@
 
 #include "utils.h"
 
-#include <string.h>
-#include <stdio.h>
 #include <unistd.h>
-#include <inttypes.h>
+#include <limits.h>
-#include <stdint.h>
-#include <dirent.h>
-#include <time.h>
 #ifndef WIN32
 # include <signal.h>
 #endif
 
 #include <library.h>
-#include <utils/chunk.h>
 #include <collections/enumerator.h>
-#include <threading/mutex.h>
-#include <threading/condvar.h>
 
 #ifdef WIN32
 
+#include <threading/mutex.h>
+#include <threading/condvar.h>
+
 /**
  * Flag to indicate signaled wait_sigint()
  */

src/libstrongswan/utils/utils.h

@@ -40,6 +40,33 @@
 # include <poll.h>
 #endif
 
+#include "utils/types.h"
+#include "enum.h"
+#include "utils/atomics.h"
+#include "utils/align.h"
+#include "utils/byteorder.h"
+#include "utils/string.h"
+#include "utils/memory.h"
+#include "utils/strerror.h"
+#include "utils/status.h"
+#include "utils/object.h"
+#include "utils/path.h"
+#include "utils/time.h"
+#include "utils/tty.h"
+#ifdef __APPLE__
+# include "compat/apple.h"
+#endif
+
+/**
+ * Initialize utility functions
+ */
+void utils_init();
+
+/**
+ * Deinitialize utility functions
+ */
+void utils_deinit();
+
 /**
  * strongSwan program return codes
  */
@@ -74,33 +101,6 @@
 #define BUILD_ASSERT_ARRAY(a) \
 		BUILD_ASSERT(!__builtin_types_compatible_p(typeof(a), typeof(&(a)[0])))
 
-#include "utils/types.h"
-#include "enum.h"
-#include "utils/atomics.h"
-#include "utils/align.h"
-#include "utils/byteorder.h"
-#include "utils/string.h"
-#include "utils/memory.h"
-#include "utils/strerror.h"
-#include "utils/status.h"
-#include "utils/object.h"
-#include "utils/path.h"
-#include "utils/time.h"
-#include "utils/tty.h"
-#ifdef __APPLE__
-# include "compat/apple.h"
-#endif
-
-/**
- * Initialize utility functions
- */
-void utils_init();
-
-/**
- * Deinitialize utility functions
- */
-void utils_deinit();
-
 /**
  * Debug macro to follow control flow
  */