diff --git a/distrib/sets/lists/minix-base/md.i386 b/distrib/sets/lists/minix-base/md.i386
index 95a9cf8e8..23dc5100d 100644
--- a/distrib/sets/lists/minix-base/md.i386
+++ b/distrib/sets/lists/minix-base/md.i386
@@ -62,7 +62,7 @@
 ./usr/lib/libm387.so.0                                  minix-base
 ./usr/lib/libm387.so.0.1                                minix-base
 ./usr/lib/libm387_pic.a                                 minix-base
-./usr/lib/libacpi.a  	                                minix-base
+./usr/lib/libacpi.a                                     minix-base
 ./usr/lib/libacpi_pic.a                                 minix-base
 ./usr/lib/libvassert.a                                  minix-base
 ./usr/lib/libvboxfs.a                                   minix-base
diff --git a/lib/Makefile b/lib/Makefile
index 3793b12ce..bb090de11 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -22,8 +22,7 @@ SUBDIR+=	libc
 SUBDIR+=	.WAIT
 
 .if defined(__MINIX)
-SUBDIR+=	../minix/lib/libacpi \
-		../minix/lib/libasyn \
+SUBDIR+=	../minix/lib/libasyn \
 		../minix/lib/libaudiodriver \
 		../minix/lib/libbdev \
 		../minix/lib/libblockdriver \
@@ -51,7 +50,8 @@ SUBDIR+=	../minix/lib/liblwip \
 .endif
 
 .if (${MACHINE_ARCH} == "i386")
-SUBDIR+=	../minix/lib/libhgfs \
+SUBDIR+=	../minix/lib/libacpi \
+		../minix/lib/libhgfs \
 		../minix/lib/libvassert \
 		../minix/lib/libvboxfs \
 		../minix/lib/libvirtio
diff --git a/minix/lib/libacpi/acpi.c b/minix/lib/libacpi/acpi.c
index 9aa1cd67e..b4b45ec88 100644
--- a/minix/lib/libacpi/acpi.c
+++ b/minix/lib/libacpi/acpi.c
@@ -10,28 +10,19 @@
 #include <minix/log.h>
 #include <minix/sysutil.h>
 
-#include "acpi.h"
-
 static struct log log =
 { .name = "libacpi", .log_level = LEVEL_TRACE, .log_func = default_log };
 
 static endpoint_t acpi_ep = NONE;
 
 int
-do_init()
+acpi_init(void)
 {
 	int res;
 	res = ds_retrieve_label_endpt("acpi", &acpi_ep);
-	log_info(&log, "resolved acpi to endpoint: %d\n", acpi_ep);
 	return res;
 }
 
-int
-acpi_init()
-{
-	return do_init();
-}
-
 /*===========================================================================*
  *				IRQ handling				     *
  *===========================================================================*/
@@ -41,13 +32,14 @@ acpi_get_irq(unsigned bus, unsigned dev, unsigned pin)
 	int err;
 	message m;
 
-	if(acpi_ep == NONE)
-	{
-		err = do_init();
-		if (OK != err)
-		{
+	if (acpi_ep == NONE) {
+		err = acpi_init();
+		if (OK != err) {
 			panic("libacpi: ds_retrieve_label_endpt failed for 'acpi': %d", err);
 		}
+		else {
+			log_info(&log, "resolved acpi to endpoint: %d\n", acpi_ep);
+		}
 	}
 
 	((struct acpi_get_irq_req *)&m)->hdr.request = ACPI_REQ_GET_IRQ;
@@ -72,11 +64,9 @@ acpi_map_bridge(unsigned int pbnr, unsigned int dev, unsigned int sbnr)
 	int err;
 	message m;
 
-	if(acpi_ep == NONE)
-	{
-		err = do_init();
-		if (OK != err)
-		{
+	if(acpi_ep == NONE) {
+		err = acpi_init();
+		if (OK != err) {
 			panic("libacpi: ds_retrieve_label_endpt failed for 'acpi': %d", err);
 		}
 	}
diff --git a/minix/lib/libacpi/acpi.h b/minix/lib/libacpi/acpi.h
deleted file mode 100644
index 534cf3a32..000000000
--- a/minix/lib/libacpi/acpi.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef LIBACPI_H_
-#define LIBACPI_H_
-
-#include <minix/com.h>
-#include <minix/ipc.h>
-
-int do_init(void);
-
-#endif /* _LIBACPI_H_ */