43 files changed, 138 insertions, 153 deletions
diff --git a/dde_e100/Makeconf.local b/dde_e100/Makeconf.local
index 074df6e0..fb8e6ae6 100644
--- a/dde_e100/Makeconf.local
+++ b/dde_e100/Makeconf.local
@@ -2,31 +2,12 @@ SYSTEMS = x86-l4v2
 ARCH = x86
 SYSTEM = x86-l4v2
 
-BUILDDIR       ?= 
+BUILDDIR       ?= ..
 
-libmachdev_path := ../libmachdev/libmachdev.a
-has_libmachdev := $(wildcard $(libmachdev_path))
-ifeq ($(strip $(has_libmachdev)),)
-  libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a
-endif
-
-libddekit_path := ../libddekit/libddekit.a
-has_libddekit := $(wildcard $(libddekit_path))
-ifeq ($(strip $(has_libddekit)),)
-  libddekit_path := $(BUILDDIR)/libddekit/libddekit.a
-endif
-
-libslab_path := ../libhurd-slab/libhurd-slab.a
-has_libslab := $(wildcard $(libslab_path))
-ifeq ($(strip $(has_libslab)),)
-  libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a
-endif
-
-libbpf_path := ../libbpf/libbpf.a
-has_libbpf := $(wildcard $(libbpf_path))
-ifeq ($(strip $(has_libbpf)),)
-  libbpf_path := $(BUILDDIR)/libbpf/libbpf.a
-endif
+libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a
+libddekit_path := $(BUILDDIR)/libddekit/libddekit.a
+libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a
+libbpf_path := $(BUILDDIR)/libbpf/libbpf.a
 
 DDEKITLIBDIR = $(PKGDIR)/../libddekit/
 DDEKITINCDIR = $(PKGDIR)/../libddekit/include
diff --git a/dde_e100/Makefile b/dde_e100/Makefile
index f5b2294a..db23a0ce 100644
--- a/dde_e100/Makefile
+++ b/dde_e100/Makefile
@@ -8,7 +8,7 @@ TARGET         = dde_e100
 SRC_C          = main.c e100.c
 
 LIBS          += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path)
-CFLAGS        += -g -I$(PKGDIR)/include -I../libmachdev
+CFLAGS        += -g -I$(PKGDIR)/include -I$(BUILDDIR)/include
 
 # DDE configuration
 include $(L4DIR)/Makeconf
diff --git a/dde_e100/main.c b/dde_e100/main.c
index 63ab182f..98f4452a 100644
--- a/dde_e100/main.c
+++ b/dde_e100/main.c
@@ -6,7 +6,7 @@
 #include <linux/init.h>  // initcall()
 #include <linux/delay.h> // msleep()
 
-#include <machdev.h>
+#include <hurd/machdev.h>
 
 int using_std = 1;
 
diff --git a/dde_e1000/Makeconf.local b/dde_e1000/Makeconf.local
index 44f70ab8..fb8e6ae6 100644
--- a/dde_e1000/Makeconf.local
+++ b/dde_e1000/Makeconf.local
@@ -2,31 +2,12 @@ SYSTEMS = x86-l4v2
 ARCH = x86
 SYSTEM = x86-l4v2
 
-BUILDDIR       ?=
+BUILDDIR       ?= ..
 
-libmachdev_path := ../libmachdev/libmachdev.a
-has_libmachdev := $(wildcard $(libmachdev_path))
-ifeq ($(strip $(has_libmachdev)),)
-  libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a
-endif
-
-libddekit_path := ../libddekit/libddekit.a
-has_libddekit := $(wildcard $(libddekit_path))
-ifeq ($(strip $(has_libddekit)),)
-  libddekit_path := $(BUILDDIR)/libddekit/libddekit.a
-endif
-
-libslab_path := ../libhurd-slab/libhurd-slab.a
-has_libslab := $(wildcard $(libslab_path))
-ifeq ($(strip $(has_libslab)),)
-  libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a
-endif
-
-libbpf_path := ../libbpf/libbpf.a
-has_libbpf := $(wildcard $(libbpf_path))
-ifeq ($(strip $(has_libbpf)),)
-  libbpf_path := $(BUILDDIR)/libbpf/libbpf.a
-endif
+libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a
+libddekit_path := $(BUILDDIR)/libddekit/libddekit.a
+libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a
+libbpf_path := $(BUILDDIR)/libbpf/libbpf.a
 
 DDEKITLIBDIR = $(PKGDIR)/../libddekit/
 DDEKITINCDIR = $(PKGDIR)/../libddekit/include
diff --git a/dde_e1000/Makefile b/dde_e1000/Makefile
index 137a69ef..376efe94 100644
--- a/dde_e1000/Makefile
+++ b/dde_e1000/Makefile
@@ -8,7 +8,7 @@ TARGET         = dde_e1000
 SRC_C          = main.c e1000_ethtool.c e1000_hw.c e1000_main.c e1000_param.c
 
 LIBS          += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path)
-CFLAGS        += -g -I$(PKGDIR)/include -I../libmachdev
+CFLAGS        += -g -I$(PKGDIR)/include -I$(BUILDDIR)/include
 
 # DDE configuration
 include $(L4DIR)/Makeconf
diff --git a/dde_e1000/main.c b/dde_e1000/main.c
index 63ab182f..98f4452a 100644
--- a/dde_e1000/main.c
+++ b/dde_e1000/main.c
@@ -6,7 +6,7 @@
 #include <linux/init.h>  // initcall()
 #include <linux/delay.h> // msleep()
 
-#include <machdev.h>
+#include <hurd/machdev.h>
 
 int using_std = 1;
 
diff --git a/dde_ne2k_pci/Makeconf.local b/dde_ne2k_pci/Makeconf.local
index 44f70ab8..fb8e6ae6 100644
--- a/dde_ne2k_pci/Makeconf.local
+++ b/dde_ne2k_pci/Makeconf.local
@@ -2,31 +2,12 @@ SYSTEMS = x86-l4v2
 ARCH = x86
 SYSTEM = x86-l4v2
 
-BUILDDIR       ?=
+BUILDDIR       ?= ..
 
-libmachdev_path := ../libmachdev/libmachdev.a
-has_libmachdev := $(wildcard $(libmachdev_path))
-ifeq ($(strip $(has_libmachdev)),)
-  libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a
-endif
-
-libddekit_path := ../libddekit/libddekit.a
-has_libddekit := $(wildcard $(libddekit_path))
-ifeq ($(strip $(has_libddekit)),)
-  libddekit_path := $(BUILDDIR)/libddekit/libddekit.a
-endif
-
-libslab_path := ../libhurd-slab/libhurd-slab.a
-has_libslab := $(wildcard $(libslab_path))
-ifeq ($(strip $(has_libslab)),)
-  libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a
-endif
-
-libbpf_path := ../libbpf/libbpf.a
-has_libbpf := $(wildcard $(libbpf_path))
-ifeq ($(strip $(has_libbpf)),)
-  libbpf_path := $(BUILDDIR)/libbpf/libbpf.a
-endif
+libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a
+libddekit_path := $(BUILDDIR)/libddekit/libddekit.a
+libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a
+libbpf_path := $(BUILDDIR)/libbpf/libbpf.a
 
 DDEKITLIBDIR = $(PKGDIR)/../libddekit/
 DDEKITINCDIR = $(PKGDIR)/../libddekit/include
diff --git a/dde_ne2k_pci/Makefile b/dde_ne2k_pci/Makefile
index 44e805e0..f414a3f3 100644
--- a/dde_ne2k_pci/Makefile
+++ b/dde_ne2k_pci/Makefile
@@ -10,7 +10,7 @@ TARGET         = dde_ne2k_pci
 SRC_C          = main.c ne2k-pci.c 8390.c
 
 LIBS          += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path)
-CFLAGS        += -g -I$(PKGDIR)/include -I../libmachdev
+CFLAGS        += -g -I$(PKGDIR)/include -I$(BUILDDIR)/include
 
 # DDE configuration
 include $(L4DIR)/Makeconf
diff --git a/dde_ne2k_pci/main.c b/dde_ne2k_pci/main.c
index 63ab182f..98f4452a 100644
--- a/dde_ne2k_pci/main.c
+++ b/dde_ne2k_pci/main.c
@@ -6,7 +6,7 @@
 #include <linux/init.h>  // initcall()
 #include <linux/delay.h> // msleep()
 
-#include <machdev.h>
+#include <hurd/machdev.h>
 
 int using_std = 1;
 
diff --git a/dde_pcnet32/Makeconf.local b/dde_pcnet32/Makeconf.local
index 44f70ab8..fb8e6ae6 100644
--- a/dde_pcnet32/Makeconf.local
+++ b/dde_pcnet32/Makeconf.local
@@ -2,31 +2,12 @@ SYSTEMS = x86-l4v2
 ARCH = x86
 SYSTEM = x86-l4v2
 
-BUILDDIR       ?=
+BUILDDIR       ?= ..
 
-libmachdev_path := ../libmachdev/libmachdev.a
-has_libmachdev := $(wildcard $(libmachdev_path))
-ifeq ($(strip $(has_libmachdev)),)
-  libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a
-endif
-
-libddekit_path := ../libddekit/libddekit.a
-has_libddekit := $(wildcard $(libddekit_path))
-ifeq ($(strip $(has_libddekit)),)
-  libddekit_path := $(BUILDDIR)/libddekit/libddekit.a
-endif
-
-libslab_path := ../libhurd-slab/libhurd-slab.a
-has_libslab := $(wildcard $(libslab_path))
-ifeq ($(strip $(has_libslab)),)
-  libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a
-endif
-
-libbpf_path := ../libbpf/libbpf.a
-has_libbpf := $(wildcard $(libbpf_path))
-ifeq ($(strip $(has_libbpf)),)
-  libbpf_path := $(BUILDDIR)/libbpf/libbpf.a
-endif
+libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a
+libddekit_path := $(BUILDDIR)/libddekit/libddekit.a
+libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a
+libbpf_path := $(BUILDDIR)/libbpf/libbpf.a
 
 DDEKITLIBDIR = $(PKGDIR)/../libddekit/
 DDEKITINCDIR = $(PKGDIR)/../libddekit/include
diff --git a/dde_pcnet32/Makefile b/dde_pcnet32/Makefile
index 5b45cc14..18cd336c 100644
--- a/dde_pcnet32/Makefile
+++ b/dde_pcnet32/Makefile
@@ -8,7 +8,7 @@ TARGET         = dde_pcnet32
 SRC_C          = main.c pcnet32.c
 
 LIBS          += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path)
-CFLAGS        += -g -I$(PKGDIR)/include -I../libmachdev
+CFLAGS        += -g -I$(PKGDIR)/include -I$(BUILDDIR)/include
 
 # DDE configuration
 include $(L4DIR)/Makeconf
diff --git a/dde_pcnet32/main.c b/dde_pcnet32/main.c
index 63ab182f..98f4452a 100644
--- a/dde_pcnet32/main.c
+++ b/dde_pcnet32/main.c
@@ -6,7 +6,7 @@
 #include <linux/init.h>  // initcall()
 #include <linux/delay.h> // msleep()
 
-#include <machdev.h>
+#include <hurd/machdev.h>
 
 int using_std = 1;
 
diff --git a/dde_rtl8139/Makeconf.local b/dde_rtl8139/Makeconf.local
index 44f70ab8..fb8e6ae6 100644
--- a/dde_rtl8139/Makeconf.local
+++ b/dde_rtl8139/Makeconf.local
@@ -2,31 +2,12 @@ SYSTEMS = x86-l4v2
 ARCH = x86
 SYSTEM = x86-l4v2
 
-BUILDDIR       ?=
+BUILDDIR       ?= ..
 
-libmachdev_path := ../libmachdev/libmachdev.a
-has_libmachdev := $(wildcard $(libmachdev_path))
-ifeq ($(strip $(has_libmachdev)),)
-  libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a
-endif
-
-libddekit_path := ../libddekit/libddekit.a
-has_libddekit := $(wildcard $(libddekit_path))
-ifeq ($(strip $(has_libddekit)),)
-  libddekit_path := $(BUILDDIR)/libddekit/libddekit.a
-endif
-
-libslab_path := ../libhurd-slab/libhurd-slab.a
-has_libslab := $(wildcard $(libslab_path))
-ifeq ($(strip $(has_libslab)),)
-  libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a
-endif
-
-libbpf_path := ../libbpf/libbpf.a
-has_libbpf := $(wildcard $(libbpf_path))
-ifeq ($(strip $(has_libbpf)),)
-  libbpf_path := $(BUILDDIR)/libbpf/libbpf.a
-endif
+libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a
+libddekit_path := $(BUILDDIR)/libddekit/libddekit.a
+libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a
+libbpf_path := $(BUILDDIR)/libbpf/libbpf.a
 
 DDEKITLIBDIR = $(PKGDIR)/../libddekit/
 DDEKITINCDIR = $(PKGDIR)/../libddekit/include
diff --git a/dde_rtl8139/Makefile b/dde_rtl8139/Makefile
index 16d3b764..f2c49547 100644
--- a/dde_rtl8139/Makefile
+++ b/dde_rtl8139/Makefile
@@ -10,7 +10,7 @@ TARGET         = dde_rtl8139
 SRC_C          = main.c 8139cp.c
 
 LIBS          += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path)
-CFLAGS        += -g -I$(PKGDIR)/include -I../libmachdev
+CFLAGS        += -g -I$(PKGDIR)/include -I$(BUILDDIR)/include
 
 # DDE configuration
 include $(L4DIR)/Makeconf
diff --git a/dde_rtl8139/main.c b/dde_rtl8139/main.c
index 63ab182f..98f4452a 100644
--- a/dde_rtl8139/main.c
+++ b/dde_rtl8139/main.c
@@ -6,7 +6,7 @@
 #include <linux/init.h>  // initcall()
 #include <linux/delay.h> // msleep()
 
-#include <machdev.h>
+#include <hurd/machdev.h>
 
 int using_std = 1;
 
diff --git a/devnode/devnode.c b/devnode/devnode.c
index 299de3c3..50011aa4 100644
--- a/devnode/devnode.c
+++ b/devnode/devnode.c
@@ -255,7 +255,7 @@ trivfs_append_args (struct trivfs_control *fsys, char **argz, size_t *argz_len)
   if (master_file)
     ADD_OPT ("--master-device=%s", master_file);
 
-  ADD_OPT (device_name);
+  ADD_OPT ("%s", device_name);
 
 #undef ADD_OPT
   return err;
diff --git a/libbpf/Makefile b/libbpf/Makefile
index 5ce87573..1000429d 100644
--- a/libbpf/Makefile
+++ b/libbpf/Makefile
@@ -21,7 +21,7 @@ makemode := library
 libname = libbpf
 SRCS= bpf_impl.c queue.c
 LCLHDRS = bpf_impl.h queue.h
-installhdrs = 
+installhdrs = bpf_impl.h
 
 MIGSTUBS = 
 OBJS = $(sort $(SRCS:.c=.o) $(MIGSTUBS))
diff --git a/libdde_linux26/Makeconf b/libdde_linux26/Makeconf
index 4ee54c66..00c59092 100644
--- a/libdde_linux26/Makeconf
+++ b/libdde_linux26/Makeconf
@@ -39,7 +39,7 @@ ifeq ($(ARCH), x86)
 MY_DDE_INCDIR += $(OBJ_BASE)/include/linux-headers/asm/mach-default
 endif
 
-PRIVATE_INCDIR += $(MY_DDE_INCDIR) $(MY_LINUX26_INCDIR) $(PKGDIR)/../libddekit/include
+PRIVATE_INCDIR += $(MY_DDE_INCDIR) $(MY_LINUX26_INCDIR) $(PKGDIR)/../libddekit
 
 DEFINES += -D__KERNEL__ -DDDE_LINUX $(KBUILD_DEFINES)
 CPPFLAGS += $(KBUILD_CPPFLAGS)
diff --git a/libdde_linux26/include/linux/firmware.h b/libdde_linux26/include/linux/firmware.h
new file mode 100644
index 00000000..06e7a1ce
--- /dev/null
+++ b/libdde_linux26/include/linux/firmware.h
@@ -0,0 +1,75 @@
+#ifndef _LINUX_FIRMWARE_H
+#define _LINUX_FIRMWARE_H
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/compiler.h>
+
+#define FIRMWARE_NAME_MAX 30 
+#define FW_ACTION_NOHOTPLUG 0
+#define FW_ACTION_HOTPLUG 1
+
+struct firmware {
+	size_t size;
+	const u8 *data;
+};
+
+struct device;
+
+struct builtin_fw {
+	char *name;
+	void *data;
+	unsigned long size;
+};
+
+/* We have to play tricks here much like stringify() to get the
+   __COUNTER__ macro to be expanded as we want it */
+#define __fw_concat1(x, y) x##y
+#define __fw_concat(x, y) __fw_concat1(x, y)
+
+#define DECLARE_BUILTIN_FIRMWARE(name, blob)				     \
+	DECLARE_BUILTIN_FIRMWARE_SIZE(name, &(blob), sizeof(blob))
+
+#define DECLARE_BUILTIN_FIRMWARE_SIZE(name, blob, size)			     \
+	static const struct builtin_fw __fw_concat(__builtin_fw,__COUNTER__) \
+	__used __section(.builtin_fw) = { name, blob, size }
+
+#if defined(CONFIG_FW_LOADER) || (defined(CONFIG_FW_LOADER_MODULE) && defined(MODULE))
+int request_firmware(const struct firmware **fw, const char *name,
+		     struct device *device);
+int request_firmware_nowait(
+	struct module *module, int uevent,
+	const char *name, struct device *device, void *context,
+	void (*cont)(const struct firmware *fw, void *context));
+
+void release_firmware(const struct firmware *fw);
+#else
+#ifdef DDE_LINUX
+#include <ddekit/printf.h>
+#endif
+static inline int request_firmware(const struct firmware **fw,
+				   const char *name,
+				   struct device *device)
+{
+#ifdef DDE_LINUX
+	ddekit_printf("firmware %s requested, but not implemented\n", name);
+#endif
+	return -EINVAL;
+}
+static inline int request_firmware_nowait(
+	struct module *module, int uevent,
+	const char *name, struct device *device, void *context,
+	void (*cont)(const struct firmware *fw, void *context))
+{
+#ifdef DDE_LINUX
+	ddekit_printf("firmware %s requested, but not implemented\n", name);
+#endif
+	return -EINVAL;
+}
+
+static inline void release_firmware(const struct firmware *fw)
+{
+}
+#endif
+
+#endif
diff --git a/libdde_linux26/mk/prog.mk b/libdde_linux26/mk/prog.mk
index d54c38e9..c1d5d9a8 100644
--- a/libdde_linux26/mk/prog.mk
+++ b/libdde_linux26/mk/prog.mk
@@ -56,7 +56,6 @@ TARGET_STANDARD := $(TARGET) $(TARGET_$(OSYSTEM))
 TARGET_PROFILE := $(addsuffix .pr,$(filter $(BUILD_PROFILE),$(TARGET)))
 TARGET	+= $(TARGET_$(OSYSTEM)) $(TARGET_PROFILE)
 
-CFLAGS += $(DDEKITINCDIR)
 # define some variables different for lib.mk and prog.mk
 ifeq ($(MODE),loader)
 LDFLAGS += --dynamic-linker libld-l4.s.so
diff --git a/libddekit/Makefile b/libddekit/Makefile
index a163a0c0..29000cd9 100644
--- a/libddekit/Makefile
+++ b/libddekit/Makefile
@@ -22,17 +22,20 @@ libname = libddekit
 SRCS= condvar.c init.c interrupt.c lock.c malloc.c memory.c 	\
       pci.c pgtab.c printf.c resources.c list.c panic.c \
       thread.c timer.c initcall.c
-LCLHDRS = include/ddekit/condvar.h include/ddekit/lock.h	\
-	  include/ddekit/semaphore.h include/ddekit/debug.h	\
-	  include/ddekit/inline.h include/ddekit/panic.h	\
-	  include/ddekit/thread.h include/ddekit/types.h	\
-	  include/ddekit/pgtab.h include/ddekit/printf.h	\
-	  include/ddekit/pci.h include/ddekit/assert.h		\
-	  include/ddekit/interrupt.h include/ddekit/resources.h	\
-	  include/ddekit/memory.h include/ddekit/timer.h	\
-	  include/dde.h		\
+installhdrs = ddekit/condvar.h ddekit/lock.h	\
+	  ddekit/semaphore.h ddekit/debug.h	\
+	  ddekit/inline.h ddekit/panic.h	\
+	  ddekit/thread.h ddekit/types.h	\
+	  ddekit/pgtab.h ddekit/printf.h	\
+	  ddekit/pci.h ddekit/assert.h		\
+	  ddekit/interrupt.h ddekit/resources.h	\
+	  ddekit/memory.h ddekit/timer.h	\
+	  ddekit/initcall.h
+
+installhdrsubdir = .
+LCLHDRS = $(installhdrs)	\
+	  dde.h		\
 	  config.h list.h util.h
-installhdrs = 
 
 MIGSTUBS = deviceUser.o machUser.o
 OBJS = $(sort $(SRCS:.c=.o) $(MIGSTUBS))
@@ -43,5 +46,7 @@ MIGCOMSFLAGS = -prefix dde_
 
 include ../Makeconf
 
-LDFLAGS += -lpciaccess
-CFLAGS += -I$(srcdir)/include
+LIBS += -lpciaccess
+
+$(libname).so.$(hurd-version):
+	echo "INPUT ( $(libname).a )" > $@
diff --git a/libddekit/include/dde.h b/libddekit/dde.h
index 12f8a81a..12f8a81a 100644
--- a/libddekit/include/dde.h
+++ b/libddekit/dde.h
diff --git a/libddekit/include/ddekit/assert.h b/libddekit/ddekit/assert.h
index 5d593662..5d593662 100644
--- a/libddekit/include/ddekit/assert.h
+++ b/libddekit/ddekit/assert.h
diff --git a/libddekit/include/ddekit/condvar.h b/libddekit/ddekit/condvar.h
index 129a718d..129a718d 100644
--- a/libddekit/include/ddekit/condvar.h
+++ b/libddekit/ddekit/condvar.h
diff --git a/libddekit/include/ddekit/debug.h b/libddekit/ddekit/debug.h
index 79a8e7b5..79a8e7b5 100644
--- a/libddekit/include/ddekit/debug.h
+++ b/libddekit/ddekit/debug.h
diff --git a/libddekit/include/ddekit/initcall.h b/libddekit/ddekit/initcall.h
index 6befa31c..6befa31c 100644
--- a/libddekit/include/ddekit/initcall.h
+++ b/libddekit/ddekit/initcall.h
diff --git a/libddekit/include/ddekit/inline.h b/libddekit/ddekit/inline.h
index e59a5c68..e59a5c68 100644
--- a/libddekit/include/ddekit/inline.h
+++ b/libddekit/ddekit/inline.h
diff --git a/libddekit/include/ddekit/interrupt.h b/libddekit/ddekit/interrupt.h
index 3f789210..3f789210 100644
--- a/libddekit/include/ddekit/interrupt.h
+++ b/libddekit/ddekit/interrupt.h
diff --git a/libddekit/include/ddekit/lock.h b/libddekit/ddekit/lock.h
index dd398b38..dd398b38 100644
--- a/libddekit/include/ddekit/lock.h
+++ b/libddekit/ddekit/lock.h
diff --git a/libddekit/include/ddekit/memory.h b/libddekit/ddekit/memory.h
index 051a4d9e..051a4d9e 100644
--- a/libddekit/include/ddekit/memory.h
+++ b/libddekit/ddekit/memory.h
diff --git a/libddekit/include/ddekit/panic.h b/libddekit/ddekit/panic.h
index 1468675f..1468675f 100644
--- a/libddekit/include/ddekit/panic.h
+++ b/libddekit/ddekit/panic.h
diff --git a/libddekit/include/ddekit/pci.h b/libddekit/ddekit/pci.h
index 5a5fd29b..5a5fd29b 100644
--- a/libddekit/include/ddekit/pci.h
+++ b/libddekit/ddekit/pci.h
diff --git a/libddekit/include/ddekit/pgtab.h b/libddekit/ddekit/pgtab.h
index 8964b713..8964b713 100644
--- a/libddekit/include/ddekit/pgtab.h
+++ b/libddekit/ddekit/pgtab.h
diff --git a/libddekit/include/ddekit/printf.h b/libddekit/ddekit/printf.h
index 6dafa18d..6dafa18d 100644
--- a/libddekit/include/ddekit/printf.h
+++ b/libddekit/ddekit/printf.h
diff --git a/libddekit/include/ddekit/resources.h b/libddekit/ddekit/resources.h
index 657295a0..657295a0 100644
--- a/libddekit/include/ddekit/resources.h
+++ b/libddekit/ddekit/resources.h
diff --git a/libddekit/include/ddekit/semaphore.h b/libddekit/ddekit/semaphore.h
index c959919d..c959919d 100644
--- a/libddekit/include/ddekit/semaphore.h
+++ b/libddekit/ddekit/semaphore.h
diff --git a/libddekit/include/ddekit/thread.h b/libddekit/ddekit/thread.h
index 8ed52013..8ed52013 100644
--- a/libddekit/include/ddekit/thread.h
+++ b/libddekit/ddekit/thread.h
diff --git a/libddekit/include/ddekit/timer.h b/libddekit/ddekit/timer.h
index 387f2078..387f2078 100644
--- a/libddekit/include/ddekit/timer.h
+++ b/libddekit/ddekit/timer.h
diff --git a/libddekit/include/ddekit/types.h b/libddekit/ddekit/types.h
index 83d92c65..83d92c65 100644
--- a/libddekit/include/ddekit/types.h
+++ b/libddekit/ddekit/types.h
diff --git a/libddekit/memory.c b/libddekit/memory.c
index b4723b96..34b283b3 100644
--- a/libddekit/memory.c
+++ b/libddekit/memory.c
@@ -18,7 +18,7 @@
 #include <sys/mman.h>
 
 #include "mach_U.h"
-#include "libhurd-slab/slab.h"
+#include <hurd/slab.h>
 
 #include "util.h"
 #include "ddekit/memory.h"
diff --git a/libhurd-slab/Makefile b/libhurd-slab/Makefile
index 4682a934..f109f59b 100644
--- a/libhurd-slab/Makefile
+++ b/libhurd-slab/Makefile
@@ -21,7 +21,7 @@ makemode := library
 libname = libhurd-slab
 SRCS= slab.c
 LCLHDRS = slab.h
-installhdrs = 
+installhdrs = slab.h
 
 MIGSTUBS = 
 OBJS = $(sort $(SRCS:.c=.o) $(MIGSTUBS))
diff --git a/libmachdev/Makefile b/libmachdev/Makefile
index 224dfddb..ad090cae 100644
--- a/libmachdev/Makefile
+++ b/libmachdev/Makefile
@@ -24,13 +24,14 @@ SRCS = deviceUser.c machUser.c net.c ds_routines.c queue.c trivfs_server.c \
 LCLHDRS = dev_hdr.h device_emul.h ds_routines.h vm_param.h \
 	  util.h queue.h io_req.h if_ether.h machdev.h linux-errno.h \
 	  errno-base.h
-installhdrs = 
-HURDLIBS = ports threads trivfs
+installhdrs = machdev.h
+HURDLIBS = ports threads trivfs ddekit bpf
 OBJS = $(SRCS:.c=.o) $(MIGSTUBS)
 
 include ../Makeconf
 
-CFLAGS += -I$(top_srcdir)/libddekit/include -I$(top_srcdir)/libbpf
-
 ourdevice.defs: device.defs
 	$(CPP) $(CPPFLAGS) -x c $< | sed -e '/out[ 	]*device[ 	]*:[ 	]*device_t/s/device_t/mach_port_send_t/' > $@
+
+$(libname).so.$(hurd-version):
+	echo "INPUT ( $(libname).a )" > $@
diff --git a/libmachdev/if_hdr.h b/libmachdev/if_hdr.h
index 74d0fa8a..32497206 100644
--- a/libmachdev/if_hdr.h
+++ b/libmachdev/if_hdr.h
@@ -62,7 +62,7 @@
 
 #include <queue.h>
 #include <cthreads.h>
-#include <bpf_impl.h>
+#include <hurd/bpf_impl.h>
 
 #if 0
 /*