20 files changed, 15 insertions, 13 deletions
diff --git a/libddekit/Makefile b/libddekit/Makefile
index 3dbaeeee..4f6e8aaa 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 = experimentalUser.o
 OBJS = $(sort $(SRCS:.c=.o) $(MIGSTUBS))
@@ -43,8 +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"