diff --git a/configure b/configure
index 489c063..785c4c0 100755
--- a/configure
+++ b/configure
@@ -4867,8 +4867,6 @@ fi
 	done
 
 
-
-
 ac_config_files="$ac_config_files buildsys.mk extra.mk libmowgli-2.pc"
 
 cat >confcache <<\_ACEOF
diff --git a/configure.ac b/configure.ac
index 37df04d..856a702 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,8 +127,6 @@ AC_SUBST(EXAMPLES_BUILD)
 BUILDSYS_INIT
 BUILDSYS_TOUCH_DEPS
 
-AC_SUBST(PACKAGE_NAME)
-
 AC_CONFIG_FILES([buildsys.mk extra.mk libmowgli-2.pc])
 AC_OUTPUT
 
diff --git a/src/libmowgli/base/Makefile b/src/libmowgli/base/Makefile
index 77af69e..3d6b0e7 100644
--- a/src/libmowgli/base/Makefile
+++ b/src/libmowgli/base/Makefile
@@ -23,7 +23,7 @@ INCLUDES = argstack.h		\
 
 include ../../../buildsys.mk
 
-includesubdir = $(PACKAGE)/base
+includesubdir = $(PACKAGE_NAME)/base
 
 CPPFLAGS += -I. -I.. -I../../.. -DMOWGLI_CORE
 
diff --git a/src/libmowgli/concurrent/Makefile b/src/libmowgli/concurrent/Makefile
index 9c30911..4413777 100644
--- a/src/libmowgli/concurrent/Makefile
+++ b/src/libmowgli/concurrent/Makefile
@@ -9,7 +9,7 @@ INCLUDES := ${SRCS:.c=.h}
 
 include ../../../buildsys.mk
 
-includesubdir = $(PACKAGE)/concurrent
+includesubdir = $(PACKAGE_NAME)/concurrent
 
 CPPFLAGS += -I. -I.. -I../../.. -DMOWGLI_CORE
 
diff --git a/src/libmowgli/container/Makefile b/src/libmowgli/container/Makefile
index f0263fa..01122f0 100644
--- a/src/libmowgli/container/Makefile
+++ b/src/libmowgli/container/Makefile
@@ -15,7 +15,7 @@ INCLUDES = list.h	\
 
 include ../../../buildsys.mk
 
-includesubdir = $(PACKAGE)/container
+includesubdir = $(PACKAGE_NAME)/container
 
 CPPFLAGS += -I. -I.. -I../../.. -DMOWGLI_CORE
 
diff --git a/src/libmowgli/core/Makefile b/src/libmowgli/core/Makefile
index 2140401..15337c3 100644
--- a/src/libmowgli/core/Makefile
+++ b/src/libmowgli/core/Makefile
@@ -27,7 +27,7 @@ INCLUDES = bootstrap.h		\
 
 include ../../../buildsys.mk
 
-includesubdir = $(PACKAGE)/core
+includesubdir = $(PACKAGE_NAME)/core
 
 CPPFLAGS += -I. -I.. -I../../.. -DMOWGLI_CORE
 
diff --git a/src/libmowgli/eventloop/Makefile b/src/libmowgli/eventloop/Makefile
index 7dd7bde..9dd0403 100644
--- a/src/libmowgli/eventloop/Makefile
+++ b/src/libmowgli/eventloop/Makefile
@@ -9,7 +9,7 @@ INCLUDES = eventloop.h
 
 include ../../../buildsys.mk
 
-includesubdir = $(PACKAGE)/eventloop
+includesubdir = $(PACKAGE_NAME)/eventloop
 
 CPPFLAGS += -I. -I.. -I../../.. -DMOWGLI_CORE
 
diff --git a/src/libmowgli/ext/Makefile b/src/libmowgli/ext/Makefile
index 020468b..a6edb4e 100644
--- a/src/libmowgli/ext/Makefile
+++ b/src/libmowgli/ext/Makefile
@@ -17,7 +17,7 @@ INCLUDES = confparse.h			\
 
 include ../../../buildsys.mk
 
-includesubdir = $(PACKAGE)/ext
+includesubdir = $(PACKAGE_NAME)/ext
 
 CPPFLAGS += -I. -I.. -I../../.. -DMOWGLI_CORE
 
diff --git a/src/libmowgli/linebuf/Makefile b/src/libmowgli/linebuf/Makefile
index bd2799e..00dc853 100644
--- a/src/libmowgli/linebuf/Makefile
+++ b/src/libmowgli/linebuf/Makefile
@@ -9,7 +9,7 @@ INCLUDES = linebuf.h
 
 include ../../../buildsys.mk
 
-includesubdir = $(PACKAGE)/linebuf
+includesubdir = $(PACKAGE_NAME)/linebuf
 
 CPPFLAGS += -I. -I.. -I../../.. -DMOWGLI_CORE
 
diff --git a/src/libmowgli/module/Makefile b/src/libmowgli/module/Makefile
index e2a5eb9..702ed7c 100644
--- a/src/libmowgli/module/Makefile
+++ b/src/libmowgli/module/Makefile
@@ -9,7 +9,7 @@ INCLUDES = module.h
 
 include ../../../buildsys.mk
 
-includesubdir = $(PACKAGE)/module
+includesubdir = $(PACKAGE_NAME)/module
 
 CPPFLAGS += -I. -I.. -I../../.. -DMOWGLI_CORE
 
diff --git a/src/libmowgli/mowgli.h b/src/libmowgli/mowgli.h
index 97ba638..1e8b19a 100644
--- a/src/libmowgli/mowgli.h
+++ b/src/libmowgli/mowgli.h
@@ -64,7 +64,7 @@ MOWGLI_DECLS_START
 #include "container/queue.h"
 #include "base/hash.h"
 #include "core/heap.h"
-#include "core/init.h"
+#include "core/bootstrap.h"
 #include "base/bitvector.h"
 #include "base/hook.h"
 #include "base/mowgli_signal.h"
diff --git a/src/libmowgli/object/Makefile b/src/libmowgli/object/Makefile
index bc15151..1ac3ff3 100644
--- a/src/libmowgli/object/Makefile
+++ b/src/libmowgli/object/Makefile
@@ -15,7 +15,7 @@ INCLUDES = object.h	\
 
 include ../../../buildsys.mk
 
-includesubdir = $(PACKAGE)/object
+includesubdir = $(PACKAGE_NAME)/object
 
 CPPFLAGS += -I. -I.. -I../../.. -DMOWGLI_CORE
 
diff --git a/src/libmowgli/platform/Makefile b/src/libmowgli/platform/Makefile
index 332be45..6b6d7b9 100644
--- a/src/libmowgli/platform/Makefile
+++ b/src/libmowgli/platform/Makefile
@@ -4,6 +4,6 @@ INCLUDES = constructor.h machine.h
 
 include ../../../buildsys.mk
 
-includesubdir = $(PACKAGE)/platform
+includesubdir = $(PACKAGE_NAME)/platform
 
 include ../../../extra.mk
diff --git a/src/libmowgli/platform/win32/Makefile b/src/libmowgli/platform/win32/Makefile
index 05b9dcb..7a5ca38 100644
--- a/src/libmowgli/platform/win32/Makefile
+++ b/src/libmowgli/platform/win32/Makefile
@@ -9,7 +9,7 @@ INCLUDES = win32_stdinc.h
 
 include ../../../../buildsys.mk
 
-includesubdir = $(PACKAGE)/platform/win32
+includesubdir = $(PACKAGE_NAME)/platform/win32
 
 CPPFLAGS += -I. -I.. -I../.. -I../../../.. -DMOWGLI_CORE
 
diff --git a/src/libmowgli/thread/Makefile b/src/libmowgli/thread/Makefile
index 769deb4..c0e51e4 100644
--- a/src/libmowgli/thread/Makefile
+++ b/src/libmowgli/thread/Makefile
@@ -12,7 +12,7 @@ INCLUDES = thread.h mutex.h
 
 include ../../../buildsys.mk
 
-includesubdir = $(PACKAGE)/thread
+includesubdir = $(PACKAGE_NAME)/thread
 
 CPPFLAGS += -I. -I.. -I../../.. -DMOWGLI_CORE
 
diff --git a/src/libmowgli/vio/Makefile b/src/libmowgli/vio/Makefile
index 8d14393..adbea96 100644
--- a/src/libmowgli/vio/Makefile
+++ b/src/libmowgli/vio/Makefile
@@ -9,7 +9,7 @@ INCLUDES = vio.h
 
 include ../../../buildsys.mk
 
-includesubdir = $(PACKAGE)/vio
+includesubdir = $(PACKAGE_NAME)/vio
 
 CPPFLAGS += -I. -I.. -I../../.. -DMOWGLI_CORE