diff --git a/include/libdivecomputer/Makefile.am b/include/libdivecomputer/Makefile.am
index bbe7971..8e12f2d 100644
--- a/include/libdivecomputer/Makefile.am
+++ b/include/libdivecomputer/Makefile.am
@@ -7,6 +7,11 @@ libdivecomputer_HEADERS = 	\
 	descriptor.h \
 	iterator.h \
 	iostream.h \
+	serial.h \
+	bluetooth.h \
+	irda.h \
+	usbhid.h \
+	custom.h \
 	device.h \
 	parser.h \
 	datetime.h \
diff --git a/src/bluetooth.h b/include/libdivecomputer/bluetooth.h
similarity index 95%
rename from src/bluetooth.h
rename to include/libdivecomputer/bluetooth.h
index 5b443a4..c0370ff 100644
--- a/src/bluetooth.h
+++ b/include/libdivecomputer/bluetooth.h
@@ -22,11 +22,11 @@
 #ifndef DC_BLUETOOTH_H
 #define DC_BLUETOOTH_H
 
-#include <libdivecomputer/common.h>
-#include <libdivecomputer/context.h>
-#include <libdivecomputer/iostream.h>
-#include <libdivecomputer/iterator.h>
-#include <libdivecomputer/descriptor.h>
+#include "common.h"
+#include "context.h"
+#include "iostream.h"
+#include "iterator.h"
+#include "descriptor.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/custom.h b/include/libdivecomputer/custom.h
similarity index 95%
rename from src/custom.h
rename to include/libdivecomputer/custom.h
index 9618dce..4e3f9b0 100644
--- a/src/custom.h
+++ b/include/libdivecomputer/custom.h
@@ -22,9 +22,9 @@
 #ifndef DC_CUSTOM_H
 #define DC_CUSTOM_H
 
-#include <libdivecomputer/common.h>
-#include <libdivecomputer/context.h>
-#include <libdivecomputer/iostream.h>
+#include "common.h"
+#include "context.h"
+#include "iostream.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/irda.h b/include/libdivecomputer/irda.h
similarity index 92%
rename from src/irda.h
rename to include/libdivecomputer/irda.h
index 92e9557..f592ca9 100644
--- a/src/irda.h
+++ b/include/libdivecomputer/irda.h
@@ -22,11 +22,11 @@
 #ifndef DC_IRDA_H
 #define DC_IRDA_H
 
-#include <libdivecomputer/common.h>
-#include <libdivecomputer/context.h>
-#include <libdivecomputer/iostream.h>
-#include <libdivecomputer/iterator.h>
-#include <libdivecomputer/descriptor.h>
+#include "common.h"
+#include "context.h"
+#include "iostream.h"
+#include "iterator.h"
+#include "descriptor.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/serial.h b/include/libdivecomputer/serial.h
similarity index 92%
rename from src/serial.h
rename to include/libdivecomputer/serial.h
index 844c5b2..f1596b3 100644
--- a/src/serial.h
+++ b/include/libdivecomputer/serial.h
@@ -22,11 +22,11 @@
 #ifndef DC_SERIAL_H
 #define DC_SERIAL_H
 
-#include <libdivecomputer/common.h>
-#include <libdivecomputer/context.h>
-#include <libdivecomputer/iostream.h>
-#include <libdivecomputer/iterator.h>
-#include <libdivecomputer/descriptor.h>
+#include "common.h"
+#include "context.h"
+#include "iostream.h"
+#include "iterator.h"
+#include "descriptor.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/usbhid.h b/include/libdivecomputer/usbhid.h
similarity index 93%
rename from src/usbhid.h
rename to include/libdivecomputer/usbhid.h
index 16b302b..70823d1 100644
--- a/src/usbhid.h
+++ b/include/libdivecomputer/usbhid.h
@@ -22,11 +22,11 @@
 #ifndef DC_USBHID_H
 #define DC_USBHID_H
 
-#include <libdivecomputer/common.h>
-#include <libdivecomputer/context.h>
-#include <libdivecomputer/iostream.h>
-#include <libdivecomputer/iterator.h>
-#include <libdivecomputer/descriptor.h>
+#include "common.h"
+#include "context.h"
+#include "iostream.h"
+#include "iterator.h"
+#include "descriptor.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/msvc/libdivecomputer.vcproj b/msvc/libdivecomputer.vcproj
index 1b1cd96..64e2966 100644
--- a/msvc/libdivecomputer.vcproj
+++ b/msvc/libdivecomputer.vcproj
@@ -549,7 +549,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\bluetooth.h"
+				RelativePath="..\include\libdivecomputer\bluetooth.h"
 				>
 			</File>
 			<File
@@ -589,7 +589,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\custom.h"
+				RelativePath="..\include\libdivecomputer\custom.h"
 				>
 			</File>
 			<File
@@ -653,7 +653,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\irda.h"
+				RelativePath="..\include\libdivecomputer\irda.h"
 				>
 			</File>
 			<File
@@ -761,7 +761,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\serial.h"
+				RelativePath="..\include\libdivecomputer\serial.h"
 				>
 			</File>
 			<File
@@ -833,7 +833,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\usbhid.h"
+				RelativePath="..\include\libdivecomputer\usbhid.h"
 				>
 			</File>
 			<File
diff --git a/src/Makefile.am b/src/Makefile.am
index 7ca5302..730553a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -71,20 +71,19 @@ libdivecomputer_la_SOURCES = \
 	checksum.h checksum.c \
 	array.h array.c \
 	buffer.c \
-	cochran_commander.h cochran_commander.c cochran_commander_parser.c
+	cochran_commander.h cochran_commander.c cochran_commander_parser.c \
+	socket.h socket.c \
+	irda.c \
+	usbhid.c \
+	bluetooth.c \
+	custom.c
 
 if OS_WIN32
-libdivecomputer_la_SOURCES += serial.h serial_win32.c
+libdivecomputer_la_SOURCES += serial_win32.c
 else
-libdivecomputer_la_SOURCES += serial.h serial_posix.c
+libdivecomputer_la_SOURCES += serial_posix.c
 endif
 
-libdivecomputer_la_SOURCES += socket.h socket.c
-libdivecomputer_la_SOURCES += irda.h irda.c
-libdivecomputer_la_SOURCES += usbhid.h usbhid.c
-libdivecomputer_la_SOURCES += bluetooth.h bluetooth.c
-libdivecomputer_la_SOURCES += custom.h custom.c
-
 if OS_WIN32
 libdivecomputer_la_SOURCES += libdivecomputer.rc
 endif
diff --git a/src/bluetooth.c b/src/bluetooth.c
index 702782d..b55bf86 100644
--- a/src/bluetooth.c
+++ b/src/bluetooth.c
@@ -46,7 +46,7 @@
 #endif
 #endif
 
-#include "bluetooth.h"
+#include <libdivecomputer/bluetooth.h>
 
 #include "common-private.h"
 #include "context-private.h"
diff --git a/src/custom.c b/src/custom.c
index 68aa881..1e03aa7 100644
--- a/src/custom.c
+++ b/src/custom.c
@@ -21,7 +21,7 @@
 
 #include <stdlib.h> // malloc, free
 
-#include "custom.h"
+#include <libdivecomputer/custom.h>
 
 #include "iostream-private.h"
 #include "common-private.h"
diff --git a/src/irda.c b/src/irda.c
index c8adb0d..a5cf803 100644
--- a/src/irda.c
+++ b/src/irda.c
@@ -42,7 +42,7 @@
 #endif
 #endif
 
-#include "irda.h"
+#include <libdivecomputer/irda.h>
 
 #include "common-private.h"
 #include "context-private.h"
diff --git a/src/libdivecomputer.symbols b/src/libdivecomputer.symbols
index 9573b73..2d7e7de 100644
--- a/src/libdivecomputer.symbols
+++ b/src/libdivecomputer.symbols
@@ -50,6 +50,33 @@ dc_iostream_purge
 dc_iostream_sleep
 dc_iostream_close
 
+dc_serial_device_get_name
+dc_serial_device_free
+dc_serial_iterator_new
+dc_serial_open
+
+dc_bluetooth_addr2str
+dc_bluetooth_str2addr
+dc_bluetooth_device_get_address
+dc_bluetooth_device_get_name
+dc_bluetooth_device_free
+dc_bluetooth_iterator_new
+dc_bluetooth_open
+
+dc_irda_device_get_address
+dc_irda_device_get_name
+dc_irda_device_free
+dc_irda_iterator_new
+dc_irda_open
+
+dc_usbhid_device_get_vid
+dc_usbhid_device_get_pid
+dc_usbhid_device_free
+dc_usbhid_iterator_new
+dc_usbhid_open
+
+dc_custom_open
+
 dc_parser_new
 dc_parser_new2
 dc_parser_get_type
diff --git a/src/serial_posix.c b/src/serial_posix.c
index e9dbff0..ff954ef 100644
--- a/src/serial_posix.c
+++ b/src/serial_posix.c
@@ -52,7 +52,7 @@
 #define NOPTY 1
 #endif
 
-#include "serial.h"
+#include <libdivecomputer/serial.h>
 
 #include "common-private.h"
 #include "context-private.h"
diff --git a/src/serial_win32.c b/src/serial_win32.c
index 067bb72..ff52b41 100644
--- a/src/serial_win32.c
+++ b/src/serial_win32.c
@@ -24,7 +24,7 @@
 #define NOGDI
 #include <windows.h>
 
-#include "serial.h"
+#include <libdivecomputer/serial.h>
 
 #include "common-private.h"
 #include "context-private.h"
diff --git a/src/usbhid.c b/src/usbhid.c
index 1347423..0d3bb8a 100644
--- a/src/usbhid.c
+++ b/src/usbhid.c
@@ -49,7 +49,7 @@
 #include <hidapi/hidapi.h>
 #endif
 
-#include "usbhid.h"
+#include <libdivecomputer/usbhid.h>
 
 #include "common-private.h"
 #include "context-private.h"