5 files changed, 5 insertions, 53 deletions
diff --git a/libddekit/include/Makefile b/libddekit/include/Makefile
deleted file mode 100644
index 8d31023f..00000000
--- a/libddekit/include/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-PKGDIR	?= ..
-L4DIR	?= $(PKGDIR)/../..
-
-# All haeder files found in this directory tree will be automatically
-# installed in a way that they can be included with
-# #include <l4/pkgname/yourfile.h> later.
-# No need to list them in this Makefile.
-
-include $(L4DIR)/mk/include.mk
diff --git a/libddekit/include/ddekit/assert.h b/libddekit/include/ddekit/assert.h
index 5d572b49..5d593662 100644
--- a/libddekit/include/ddekit/assert.h
+++ b/libddekit/include/ddekit/assert.h
@@ -1,8 +1,8 @@
 #ifndef _ddekit_assert_h
 #define _ddekit_assert_h
 
-#include <l4/dde/ddekit/printf.h>
-#include <l4/dde/ddekit/panic.h>
+#include "ddekit/printf.h"
+#include "ddekit/panic.h"
 
 /** \file ddekit/assert.h */
 
diff --git a/libddekit/include/ddekit/condvar.h b/libddekit/include/ddekit/condvar.h
index ba87358d..129a718d 100644
--- a/libddekit/include/ddekit/condvar.h
+++ b/libddekit/include/ddekit/condvar.h
@@ -2,6 +2,7 @@
 #define _ddekit_condvar_h
 
 /** \file ddekit/condvar.h */
+#include "ddekit/lock.h"
 
 struct ddekit_condvar;
 typedef struct ddekit_condvar ddekit_condvar_t;
diff --git a/libddekit/include/ddekit/initcall.h b/libddekit/include/ddekit/initcall.h
deleted file mode 100644
index b503cc6a..00000000
--- a/libddekit/include/ddekit/initcall.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _ddekit_initcall_h
-#define _ddekit_initcall_h
-
-// from l4/sys/compiler.h
-#if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ >= 4
-#define L4_STICKY(x)    __attribute__((used)) x
-#else
-#define L4_STICKY(x)    __attribute__((unused)) x
-#endif
-
-#define l4str(s) #s
-
-// from dde_linux/ARCH-x86/ctor.h
-typedef void (*l4ddekit_initcall_t)(void);
-
-#define __l4ddekit_initcall(p) \
-	__attribute__ ((__section__ (".l4dde_ctors." #p)))
-
-/** Define a function to be a DDEKit initcall. 
- *
- *  Define a function to be a DDEKit initcall. This function will then be placed
- *  in a separate linker section of the binary (called .l4dde_ctors). The L4Env
- *  construction mechanism will execute all constructors in this section during
- *  application startup.
- *
- *  This is the right place to place Linux' module_init functions & Co.
- *
- *  \param fn    function
- */
-#define DDEKIT_INITCALL(fn)	DDEKIT_CTOR(fn, 1)
-
-#define DDEKIT_CTOR(fn, prio) \
-	static l4ddekit_initcall_t \
-	L4_STICKY(__l4ddekit_initcall_##fn) \
-	__l4ddekit_initcall(prio) = (void *)fn
-
-/**
- * Runs all registered initcalls.
- */
-void ddekit_do_initcalls(void);
-
-#endif
diff --git a/libddekit/include/ddekit/thread.h b/libddekit/include/ddekit/thread.h
index 6e505818..8ed52013 100644
--- a/libddekit/include/ddekit/thread.h
+++ b/libddekit/include/ddekit/thread.h
@@ -3,6 +3,8 @@
 
 /** \defgroup DDEKit_threads */
 
+#include "ddekit/lock.h"
+
 struct ddekit_thread;
 typedef struct ddekit_thread ddekit_thread_t;