diff --git a/alpaca.c b/alpaca.c
index f9994ad..93551ba 100644
--- a/alpaca.c
+++ b/alpaca.c
@@ -42,7 +42,6 @@
 #include <unistd.h>
 
 #include "cdba-server.h"
-#include "alpaca.h"
 #include "device.h"
 
 struct alpaca {
diff --git a/alpaca.h b/alpaca.h
deleted file mode 100644
index 930d35c..0000000
--- a/alpaca.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef __ALPACA_H__
-#define __ALPACA_H__
-
-#include "device.h"
-
-struct alpaca;
-
-void *alpaca_open(struct device *dev);
-int alpaca_power(struct device *dev, bool on);
-void alpaca_usb(struct device *dev, bool on);
-void alpaca_key(struct device *dev, int key, bool on);
-
-#endif
diff --git a/cdb_assist.c b/cdb_assist.c
index aab4b0a..6b508b7 100644
--- a/cdb_assist.c
+++ b/cdb_assist.c
@@ -42,7 +42,6 @@
 #include <unistd.h>
 
 #include "cdba-server.h"
-#include "cdb_assist.h"
 #include "device.h"
 
 struct cdb_assist {
@@ -90,6 +89,8 @@ enum {
 	STATE_num_num_m,
 };
 
+static void cdb_set_voltage(struct cdb_assist *cdb, unsigned mV);
+
 static void cdb_parser_bool(struct cdb_assist *cdb, const char *key, bool set)
 {
 	static const char *sz_keys[] = { "vbat", "btn1", "btn2", "btn3", "vbus" };
@@ -361,7 +362,7 @@ void cdb_assist_print_status(struct device *dev)
 	cdba_send_buf(MSG_STATUS_UPDATE, n, buf);
 }
 
-void cdb_set_voltage(struct cdb_assist *cdb, unsigned mV)
+static void cdb_set_voltage(struct cdb_assist *cdb, unsigned mV)
 {
 	char buf[20];
 	int n;
diff --git a/cdb_assist.h b/cdb_assist.h
deleted file mode 100644
index babcd65..0000000
--- a/cdb_assist.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef __CDB_ASSIST_H__
-#define __CDB_ASSIST_H__
-
-#include <stdbool.h>
-
-#include "device.h"
-
-struct cdb_assist;
-
-void *cdb_assist_open(struct device *dev);
-void cdb_assist_close(struct device *dev);
-
-int cdb_assist_power(struct device *dev, bool on);
-void cdb_assist_usb(struct device *dev, bool on);
-void cdb_assist_key(struct device *dev, int key, bool asserted);
-void cdb_gpio(struct cdb_assist *cdb, int gpio, bool on);
-int cdb_target_write(struct device *dev, const void *buf, size_t len);
-void cdb_send_break(struct device *dev);
-unsigned int cdb_vref(struct cdb_assist *cdb);
-void cdb_assist_print_status(struct device *dev);
-void cdb_set_voltage(struct cdb_assist *cdb, unsigned mV);
-
-#endif
diff --git a/conmux.c b/conmux.c
index da7073a..66a1463 100644
--- a/conmux.c
+++ b/conmux.c
@@ -41,7 +41,6 @@
 #include <unistd.h>
 
 #include "cdba-server.h"
-#include "conmux.h"
 #include "device.h"
 
 extern int h_errno;
diff --git a/conmux.h b/conmux.h
deleted file mode 100644
index b23fa13..0000000
--- a/conmux.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __CONMUX_H__
-#define __CONMUX_H__
-
-#include "device.h"
-
-struct conmux;
-
-void *conmux_open(struct device *dev);
-int conmux_power(struct device *dev, bool on);
-int conmux_write(struct device *dev, const void *buf, size_t len);
-
-#endif
diff --git a/console.h b/console.h
deleted file mode 100644
index 62258a2..0000000
--- a/console.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __CONSOLE_H__
-#define __CONSOLE_H__
-
-#include "device.h"
-
-void console_open(struct device *device);
-int console_write(struct device *device, const void *buf, size_t len);
-void console_send_break(struct device *device);
-
-#endif
diff --git a/ftdi-gpio.c b/ftdi-gpio.c
index 24b9be5..3195a57 100644
--- a/ftdi-gpio.c
+++ b/ftdi-gpio.c
@@ -41,7 +41,7 @@
 #include <unistd.h>
 
 #include "cdba-server.h"
-#include "ftdi-gpio.h"
+#include "device.h"
 
 #include <ftdi.h>
 
diff --git a/ftdi-gpio.h b/ftdi-gpio.h
deleted file mode 100644
index a705d28..0000000
--- a/ftdi-gpio.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef __FTDI_GPIO_H__
-#define __FTDI_GPIO_H__
-
-#include "device.h"
-
-struct ftdi_gpio;
-
-void *ftdi_gpio_open(struct device *dev);
-int ftdi_gpio_power(struct device *dev, bool on);
-void ftdi_gpio_usb(struct device *dev, bool on);
-void ftdi_gpio_key(struct device *dev, int key, bool on);
-
-#endif
diff --git a/qcomlt_dbg.c b/qcomlt_dbg.c
index 6095f5c..2b1ad82 100644
--- a/qcomlt_dbg.c
+++ b/qcomlt_dbg.c
@@ -43,7 +43,6 @@
 #include <unistd.h>
 
 #include "cdba-server.h"
-#include "qcomlt_dbg.h"
 #include "device.h"
 
 struct qcomlt_dbg {
diff --git a/qcomlt_dbg.h b/qcomlt_dbg.h
deleted file mode 100644
index 1fc976e..0000000
--- a/qcomlt_dbg.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef __QCOMLT_DBG_H__
-#define __QCOMLT_DBG_H__
-
-#include "device.h"
-
-void *qcomlt_dbg_open(struct device *dev);
-int qcomlt_dbg_power(struct device *dev, bool on);
-void qcomlt_dbg_usb(struct device *dev, bool on);
-void qcomlt_dbg_key(struct device *dev, int key, bool asserted);
-
-#endif