diff --git a/corosync/Makefile b/corosync/Makefile
index c9922f93..43a82d1c 100644
--- a/corosync/Makefile
+++ b/corosync/Makefile
@@ -181,6 +181,7 @@ install: all
 	    install -m 644 $(srcdir)include/$$aHeader $(DESTDIR)$(INCLUDEDIR);	\
 	done
 
+        install -m 644 $(srcdir)include/hdb.h $(DESTDIR)$(INCLUDEDIR)
 	install -m 644 $(srcdir)exec/coropoll.h $(DESTDIR)$(INCLUDEDIR_TOTEM)
 	install -m 644 $(srcdir)exec/totempg.h $(DESTDIR)$(INCLUDEDIR_TOTEM)
 	install -m 644 $(srcdir)exec/totem.h $(DESTDIR)$(INCLUDEDIR_TOTEM)
diff --git a/openais/services/ckpt.c b/openais/services/ckpt.c
index 3ca723e0..aa70a623 100644
--- a/openais/services/ckpt.c
+++ b/openais/services/ckpt.c
@@ -51,11 +51,11 @@
 #include <corosync/mar_gen.h>
 #include <corosync/hdb.h>
 #include <corosync/engine/swab.h>
-#include <corosync/engine/list.h>
 #include <corosync/engine/coroapi.h>
+#include <corosync/list.h>
 #include <corosync/engine/logsys.h>
-#include <corosync/saAis.h>
 #include <corosync/lcr/lcr_comp.h>
+#include "../include/saAis.h"
 #include "../include/saEvt.h"
 #include "../include/ipc_ckpt.h"
 #include "../include/mar_ckpt.h"
diff --git a/openais/services/clm.c b/openais/services/clm.c
index e5573a0e..2c2f3c39 100644
--- a/openais/services/clm.c
+++ b/openais/services/clm.c
@@ -60,11 +60,11 @@
 #include <corosync/ipc_gen.h>
 #include <corosync/mar_gen.h>
 #include <corosync/engine/swab.h>
-#include <corosync/engine/list.h>
 #include <corosync/engine/coroapi.h>
+#include <corosync/list.h>
 #include <corosync/engine/logsys.h>
-#include <corosync/saAis.h>
 #include <corosync/lcr/lcr_comp.h>
+#include "../include/saAis.h"
 #include "../include/saClm.h"
 #include "../include/ipc_clm.h"
 #include "../include/mar_clm.h"
diff --git a/openais/services/evt.c b/openais/services/evt.c
index b334caa5..ffac3b75 100644
--- a/openais/services/evt.c
+++ b/openais/services/evt.c
@@ -53,11 +53,11 @@
 #include <corosync/mar_gen.h>
 #include <corosync/hdb.h>
 #include <corosync/engine/swab.h>
-#include <corosync/engine/list.h>
 #include <corosync/engine/coroapi.h>
 #include <corosync/engine/logsys.h>
-#include <corosync/saAis.h>
 #include <corosync/lcr/lcr_comp.h>
+#include <corosync/list.h>
+#include "../include/saAis.h"
 #include "../include/saEvt.h"
 #include "../include/ipc_evt.h"
 
diff --git a/openais/services/lck.c b/openais/services/lck.c
index b8d1b5fa..d4035a0d 100644
--- a/openais/services/lck.c
+++ b/openais/services/lck.c
@@ -50,12 +50,12 @@
 
 #include <corosync/ipc_gen.h>
 #include <corosync/mar_gen.h>
+#include <corosync/list.h>
+#include <corosync/lcr/lcr_comp.h>
 #include <corosync/engine/swab.h>
-#include <corosync/engine/list.h>
 #include <corosync/engine/coroapi.h>
 #include <corosync/engine/logsys.h>
-#include <corosync/saAis.h>
-#include <corosync/lcr/lcr_comp.h>
+#include "../include/saAis.h"
 #include "../include/saAis.h"
 #include "../include/saLck.h"
 #include "../include/ipc_lck.h"
diff --git a/openais/services/msg.c b/openais/services/msg.c
index 20b9fa2b..a199e6a8 100644
--- a/openais/services/msg.c
+++ b/openais/services/msg.c
@@ -50,11 +50,11 @@
 #include <corosync/ipc_gen.h>
 #include <corosync/mar_gen.h>
 #include <corosync/engine/swab.h>
-#include <corosync/engine/list.h>
+#include <corosync/list.h>
 #include <corosync/engine/coroapi.h>
 #include <corosync/engine/logsys.h>
-#include <corosync/saAis.h>
 #include <corosync/lcr/lcr_comp.h>
+#include "../include/saAis.h"
 #include "../include/saMsg.h"
 #include "../include/ipc_msg.h"