diff --git a/Makefile b/Makefile
index d135ac7c..32f5aa59 100644
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,7 @@ SBINDIR=/usr/sbin
 INCLUDEDIR=/usr/include/openais
 INCLUDEDIR_TOTEM=/usr/include/openais/totem
 INCLUDEDIR_LCR=/usr/include/openais/lcr
+INCLUDEDIR_SERVICE=/usr/include/openais/service
 MANDIR=/usr/share/man
 ETCDIR=/etc/ais
 LCRSODIR=/usr/libexec/lcrso
@@ -63,6 +64,7 @@ install:
 	mkdir -p $(DESTDIR)$(INCLUDEDIR)
 	mkdir -p $(DESTDIR)$(INCLUDEDIR_TOTEM)
 	mkdir -p $(DESTDIR)$(INCLUDEDIR_LCR)
+	mkdir -p $(DESTDIR)$(INCLUDEDIR_SERVICE)
 	mkdir -p $(DESTDIR)$(LIBDIR)
 	mkdir -p $(DESTDIR)$(LCRSODIR)
 	mkdir -p $(DESTDIR)$(ETCDIR)
@@ -159,11 +161,17 @@ endif
 	install -m 644 include/cpg.h $(DESTDIR)$(INCLUDEDIR)
 	install -m 644 include/evs.h $(DESTDIR)$(INCLUDEDIR)
 	install -m 644 exec/aispoll.h $(DESTDIR)$(INCLUDEDIR_TOTEM)
+	install -m 644 exec/totempg.h $(DESTDIR)$(INCLUDEDIR_TOTEM)
 	install -m 644 exec/totem.h $(DESTDIR)$(INCLUDEDIR_TOTEM)
 	install -m 644 exec/totemip.h $(DESTDIR)$(INCLUDEDIR_TOTEM)
 	install -m 644 lcr/lcr_ckpt.h $(DESTDIR)$(INCLUDEDIR_LCR)
 	install -m 644 lcr/lcr_comp.h $(DESTDIR)$(INCLUDEDIR_LCR)
 	install -m 644 lcr/lcr_ifact.h $(DESTDIR)$(INCLUDEDIR_LCR)
+	install -m 644 exec/service.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
+	install -m 644 exec/objdb.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
+	install -m 644 exec/print.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
+	install -m 644 exec/config.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
+	install -m 644 exec/swab.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
 	install -m 644 man/*.3 $(DESTDIR)$(MANDIR)/man3
 	install -m 644 man/*.5 $(DESTDIR)$(MANDIR)/man5
 	install -m 644 man/*.8 $(DESTDIR)$(MANDIR)/man8
diff --git a/exec/main.h b/exec/main.h
index 288c2713..b43d14c3 100644
--- a/exec/main.h
+++ b/exec/main.h
@@ -34,13 +34,10 @@
 
 #define TRUE 1
 #define FALSE 0
-#include <sys/un.h>
 #include "../include/saAis.h"
 #include "../include/saClm.h"
-#include "../include/queue.h"
 #include "../include/ipc_gen.h"
-#include "mainconfig.h"
-#include "poll.h"
+#include "totempg.h"
 
 #ifndef AIS_EXEC_H_DEFINED
 #define AIS_EXEC_H_DEFINED
diff --git a/exec/mainconfig.h b/exec/mainconfig.h
index 22716a98..13d24a86 100644
--- a/exec/mainconfig.h
+++ b/exec/mainconfig.h
@@ -31,12 +31,14 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+/*
 #include <netinet/in.h>
 #include "../include/saAis.h"
 #include "../include/list.h"
 #include "aispoll.h"
 #include "totemsrp.h"
 #include "totempg.h"
+*/
 #include "objdb.h"
 
 #ifndef MAINCONFIG_H_DEFINED
diff --git a/exec/print.c b/exec/print.c
index 154318a6..8732155d 100644
--- a/exec/print.c
+++ b/exec/print.c
@@ -57,6 +57,7 @@
 #include "print.h"
 #include "totemip.h"
 #include "../include/saAis.h"
+#include "mainconfig.h"
 
 static unsigned int logmode = LOG_MODE_BUFFER | LOG_MODE_STDERR | LOG_MODE_SYSLOG;
 static char *logfile = 0;
diff --git a/exec/print.h b/exec/print.h
index 5ac56f99..7be9ae01 100644
--- a/exec/print.h
+++ b/exec/print.h
@@ -41,7 +41,6 @@
 
 #include <stdarg.h>
 #include <syslog.h>
-#include "mainconfig.h"
 
 #define LOG_MODE_DEBUG		1
 #define LOG_MODE_TIMESTAMP	2
@@ -111,7 +110,10 @@ static inline int mkpri (int level, int id)
 	return _mkpri (level, id);
 }
 
-int log_setup (char **error_string, struct main_config *config);
+#ifndef main_config
+struct main_config;
+#endif
+extern int log_setup (char **error_string, struct main_config *config);
 
 extern int _log_init (const char *ident);
 static inline void log_init (const char *ident)
diff --git a/exec/service.h b/exec/service.h
index aca37d69..9404ecc0 100644
--- a/exec/service.h
+++ b/exec/service.h
@@ -34,9 +34,13 @@
 #ifndef OPENAIS_SERVICE_H_DEFINED
 #define OPENAIS_SERVICE_H_DEFINED
 
-//#include <netinet/in.h>
+#ifdef OPENAIS_EXTERNAL_SERVICE
+#include <openais/totem/totem.h>
+#include <openais/service/objdb.h>
+#else
 #include "totem.h"
 #include "objdb.h"
+#endif
 
 #define SERVICE_ID_MAKE(a,b) ( ((a)<<16) | (b) )
 
diff --git a/exec/totempg.h b/exec/totempg.h
index 27b712f6..52005e0a 100644
--- a/exec/totempg.h
+++ b/exec/totempg.h
@@ -37,7 +37,6 @@
 
 #include <netinet/in.h>
 #include "aispoll.h"
-#include "totemsrp.h"
 #include "totem.h"
 
 typedef unsigned int totempg_groups_handle;