1 files changed, 52 insertions, 36 deletions
diff --git a/src/libmowgli/mowgli.h b/src/libmowgli/mowgli.h
index fe494b2..6a64f0d 100644
--- a/src/libmowgli/mowgli.h
+++ b/src/libmowgli/mowgli.h
@@ -33,47 +33,63 @@
 #endif
 
 #ifdef MOWGLI_CORE
-# include "win32_support.h"
-# include "mowgli_config.h"
+# include "platform/autoconf.h"
 #endif
 
-#include "mowgli_stdinc.h"
+#include "core/stdinc.h"
 
 MOWGLI_DECLS_START
 
-#include "mowgli_logger.h"
-#include "mowgli_assert.h"
-#include "mowgli_exception.h"
-#include "mowgli_iterator.h"
-
-#include "mowgli_alloc.h"
-#include "mowgli_spinlock.h"
-#include "mowgli_list.h"
-#include "mowgli_object_class.h"
-#include "mowgli_object.h"
-#include "mowgli_allocation_policy.h"
-#include "mowgli_dictionary.h"
-#include "mowgli_patricia.h"
-#include "mowgli_mempool.h"
-#include "mowgli_module.h"
-#include "mowgli_queue.h"
-#include "mowgli_hash.h"
-#include "mowgli_heap.h"
-#include "mowgli_init.h"
-#include "mowgli_bitvector.h"
-#include "mowgli_hook.h"
-#include "mowgli_signal.h"
-#include "mowgli_error_backtrace.h"
-#include "mowgli_random.h"
-#include "mowgli_ioevent.h"
-#include "mowgli_argstack.h"
-#include "mowgli_object_messaging.h"
-#include "mowgli_object_metadata.h"
-#include "mowgli_global_storage.h"
-#include "mowgli_string.h"
-#include "mowgli_allocator.h"
-#include "mowgli_formatter.h"
-#include "mowgli_index.h"
+#include "platform/constructor.h"
+#include "platform/machine.h"
+
+#include "core/logger.h"
+#include "core/assert.h"
+#include "core/exception.h"
+#include "core/iterator.h"
+
+#include "container/list.h"
+#include "object/class.h"
+#include "object/object.h"
+
+#include "core/allocation_policy.h"
+#include "core/alloc.h"
+
+#include "container/dictionary.h"
+
+#include "thread/thread.h"
+#include "thread/mutex.h"
+
+#include "base/memslice.h"
+#include "container/patricia.h"
+#include "module/module.h"
+#include "container/queue.h"
+#include "base/hash.h"
+#include "core/heap.h"
+#include "core/bootstrap.h"
+#include "base/bitvector.h"
+#include "base/hook.h"
+#include "base/mowgli_signal.h"
+#include "ext/proctitle.h"
+#include "ext/error_backtrace.h"
+#include "base/random.h"
+#include "base/argstack.h"
+#include "object/message.h"
+#include "object/metadata.h"
+#include "ext/global_storage.h"
+#include "core/process.h"
+#include "eventloop/eventloop.h"
+#include "vio/vio.h"
+#include "core/mowgli_string.h"
+#include "core/allocator.h"
+#include "base/formatter.h"
+#include "container/index.h"
+
+#include "ext/confparse.h"
+#include "ext/program_opts.h"
+
+#include "linebuf/linebuf.h"
+#include "dns/dns.h"
 
 MOWGLI_DECLS_END