Separate private and public headers.

The public header files are moved to a new subdirectory, to separate
the definition of the public interface from the actual implementation.
Using an identical directory layout as the final installation has the
advantage that the example code can be build outside the project tree
without any modifications to the #include statements.

Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = src examples
+SUBDIRS = include src examples
 
 ACLOCAL_AMFLAGS = -I m4
 

configure.ac

@@ -87,8 +87,10 @@ AC_SUBST([DC_VERSION_LIBTOOL],[dc_version_lt_current:dc_version_lt_revision:dc_v
 AC_CONFIG_FILES([
    libdivecomputer.pc
    Makefile
+   include/Makefile
+   include/libdivecomputer/Makefile
+   include/libdivecomputer/version.h
    src/Makefile
-   src/version.h
    src/libdivecomputer.rc
    examples/Makefile
 ])

examples/Makefile.am

@@ -1,4 +1,4 @@
-AM_CFLAGS = -I$(top_srcdir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
 LDADD = $(top_builddir)/src/libdivecomputer.la
 
 bin_PROGRAMS = \

examples/common.h

@@ -22,7 +22,7 @@
 #ifndef EXAMPLES_COMMON_H
 #define EXAMPLES_COMMON_H
 
-#include <device.h>
+#include <libdivecomputer/device.h>
 
 #ifdef __cplusplus
 extern "C" {

examples/cressi_edy_test.c

@@ -21,8 +21,8 @@
 
 #include <stdio.h>	// fopen, fwrite, fclose
 
-#include "cressi_edy.h"
+#include <libdivecomputer/cressi_edy.h>
-#include "utils.h"
+#include <libdivecomputer/utils.h>
 
 #include "common.h"
 

examples/hw_frog_test.c

@@ -21,8 +21,8 @@
 
 #include <stdio.h>	// fopen, fwrite, fclose
 
-#include "hw_frog.h"
+#include <libdivecomputer/hw_frog.h>
-#include "utils.h"
+#include <libdivecomputer/utils.h>
 
 #include "common.h"
 

examples/hw_ostc_test.c

@@ -21,8 +21,8 @@
 
 #include <stdio.h>	// fopen, fwrite, fclose
 
-#include "hw_ostc.h"
+#include <libdivecomputer/hw_ostc.h>
-#include "utils.h"
+#include <libdivecomputer/utils.h>
 
 #include "common.h"
 

examples/mares_darwin_test.c

@@ -21,8 +21,8 @@
 
 #include <stdio.h>	// fopen, fwrite, fclose
 
-#include "mares_darwin.h"
+#include <libdivecomputer/mares_darwin.h>
-#include "utils.h"
+#include <libdivecomputer/utils.h>
 
 #include "common.h"
 

examples/mares_iconhd_test.c

@@ -21,8 +21,8 @@
 
 #include <stdio.h>	// fopen, fwrite, fclose
 
-#include "mares_iconhd.h"
+#include <libdivecomputer/mares_iconhd.h>
-#include "utils.h"
+#include <libdivecomputer/utils.h>
 
 #include "common.h"
 

examples/mares_nemo_test.c

@@ -21,8 +21,8 @@
 
 #include <stdio.h>	// fopen, fwrite, fclose
 
-#include "mares_nemo.h"
+#include <libdivecomputer/mares_nemo.h>
-#include "utils.h"
+#include <libdivecomputer/utils.h>
 
 #include "common.h"
 

examples/mares_puck_test.c

@@ -21,8 +21,8 @@
 
 #include <stdio.h>	// fopen, fwrite, fclose
 
-#include "mares_puck.h"
+#include <libdivecomputer/mares_puck.h>
-#include "utils.h"
+#include <libdivecomputer/utils.h>
 
 #include "common.h"
 

examples/oceanic_atom2_test.c

@@ -21,8 +21,8 @@
 
 #include <stdio.h>	// fopen, fwrite, fclose
 
-#include "oceanic_atom2.h"
+#include <libdivecomputer/oceanic_atom2.h>
-#include "utils.h"
+#include <libdivecomputer/utils.h>
 
 #include "common.h"
 

examples/oceanic_veo250_test.c

@@ -21,8 +21,8 @@
 
 #include <stdio.h>	// fopen, fwrite, fclose
 
-#include "oceanic_veo250.h"
+#include <libdivecomputer/oceanic_veo250.h>
-#include "utils.h"
+#include <libdivecomputer/utils.h>
 
 #include "common.h"
 

examples/oceanic_vtpro_test.c

@@ -21,8 +21,8 @@
 
 #include <stdio.h>	// fopen, fwrite, fclose
 
-#include "oceanic_vtpro.h"
+#include <libdivecomputer/oceanic_vtpro.h>
-#include "utils.h"
+#include <libdivecomputer/utils.h>
 
 #include "common.h"
 

examples/reefnet_sensus_test.c

@@ -22,8 +22,8 @@
 #include <stdio.h>	// fopen, fwrite, fclose
 #include <time.h>	// time
 
-#include "reefnet_sensus.h"
+#include <libdivecomputer/reefnet_sensus.h>
-#include "utils.h"
+#include <libdivecomputer/utils.h>
 
 #include "common.h"
 

examples/reefnet_sensuspro_test.c

@@ -22,8 +22,8 @@
 #include <stdio.h>	// fopen, fwrite, fclose
 #include <time.h>	// time
 
-#include "reefnet_sensuspro.h"
+#include <libdivecomputer/reefnet_sensuspro.h>
-#include "utils.h"
+#include <libdivecomputer/utils.h>
 
 #include "common.h"
 

examples/reefnet_sensusultra_test.c

@@ -22,8 +22,8 @@
 #include <stdio.h>	// fopen, fwrite, fclose
 #include <time.h>	// time
 
-#include "reefnet_sensusultra.h"
+#include <libdivecomputer/reefnet_sensusultra.h>
-#include "utils.h"
+#include <libdivecomputer/utils.h>
 
 #include "common.h"
 

examples/suunto_d9_test.c

@@ -21,8 +21,8 @@
 
 #include <stdio.h>	// fopen, fwrite, fclose
 
-#include "suunto_d9.h"
+#include <libdivecomputer/suunto_d9.h>
-#include "utils.h"
+#include <libdivecomputer/utils.h>
 
 #include "common.h"
 

examples/suunto_eon_test.c

@@ -21,8 +21,8 @@
 
 #include <stdio.h>	// fopen, fwrite, fclose
 
-#include "suunto_eon.h"
+#include <libdivecomputer/suunto_eon.h>
-#include "utils.h"
+#include <libdivecomputer/utils.h>
 
 #include "common.h"
 

examples/suunto_solution_test.c

@@ -1,7 +1,7 @@
 #include <stdio.h>	// fopen, fwrite, fclose
 
-#include "suunto.h"
+#include <libdivecomputer/suunto.h>
-#include "utils.h"
+#include <libdivecomputer/utils.h>
 
 #include "common.h"
 

examples/suunto_vyper2_test.c

@@ -21,8 +21,8 @@
 
 #include <stdio.h>	// fopen, fwrite, fclose
 
-#include "suunto_vyper2.h"
+#include <libdivecomputer/suunto_vyper2.h>
-#include "utils.h"
+#include <libdivecomputer/utils.h>
 
 #include "common.h"
 

examples/suunto_vyper_test.c

@@ -22,8 +22,8 @@
 #include <stdio.h>	// fopen, fwrite, fclose
 #include <stdlib.h>	// atoi
 
-#include "suunto_vyper.h"
+#include <libdivecomputer/suunto_vyper.h>
-#include "utils.h"
+#include <libdivecomputer/utils.h>
 
 #include "common.h"
 

examples/universal.c

@@ -34,16 +34,16 @@
 #define DC_TICKS_FORMAT "%lld"
 #endif
 
-#include <suunto.h>
+#include <libdivecomputer/suunto.h>
-#include <reefnet.h>
+#include <libdivecomputer/reefnet.h>
-#include <uwatec.h>
+#include <libdivecomputer/uwatec.h>
-#include <oceanic.h>
+#include <libdivecomputer/oceanic.h>
-#include <mares.h>
+#include <libdivecomputer/mares.h>
-#include <hw.h>
+#include <libdivecomputer/hw.h>
-#include <cressi.h>
+#include <libdivecomputer/cressi.h>
-#include <zeagle.h>
+#include <libdivecomputer/zeagle.h>
-#include <atomics.h>
+#include <libdivecomputer/atomics.h>
-#include <utils.h>
+#include <libdivecomputer/utils.h>
 
 #include "common.h"
 

examples/uwatec_aladin_test.c

@@ -1,7 +1,7 @@
 #include <stdio.h>	// fopen, fwrite, fclose
 
-#include "uwatec_aladin.h"
+#include <libdivecomputer/uwatec_aladin.h>
-#include "utils.h"
+#include <libdivecomputer/utils.h>
 
 #include "common.h"
 

examples/uwatec_memomouse_test.c

@@ -21,8 +21,8 @@
 
 #include <stdio.h>	// fopen, fwrite, fclose
 
-#include "uwatec_memomouse.h"
+#include <libdivecomputer/uwatec_memomouse.h>
-#include "utils.h"
+#include <libdivecomputer/utils.h>
 
 #include "common.h"
 

examples/uwatec_smart_test.c

@@ -23,8 +23,8 @@
 #include <stdlib.h>	// malloc, free
 #include <string.h>	// memset
 
-#include "uwatec_smart.h"
+#include <libdivecomputer/uwatec_smart.h>
-#include "utils.h"
+#include <libdivecomputer/utils.h>
 
 #include "common.h"
 

examples/zeagle_n2ition3_test.c

@@ -21,8 +21,8 @@
 
 #include <stdio.h>	// fopen, fwrite, fclose
 
-#include "zeagle_n2ition3.h"
+#include <libdivecomputer/zeagle_n2ition3.h>
-#include "utils.h"
+#include <libdivecomputer/utils.h>
 
 #include "common.h"
 

include/Makefile.am

@@ -0,0 +1 @@
+SUBDIRS = libdivecomputer

include/libdivecomputer/Makefile.am

@@ -0,0 +1,41 @@
+libdivecomputerdir = $(includedir)/libdivecomputer
+libdivecomputer_HEADERS = 	\
+	version.h \
+	utils.h \
+	buffer.h \
+	device.h \
+	parser.h \
+	datetime.h \
+	units.h \
+	suunto.h \
+	suunto_solution.h \
+	suunto_eon.h \
+	suunto_vyper.h \
+	suunto_vyper2.h  \
+	suunto_d9.h \
+	reefnet.h \
+	reefnet_sensus.h \
+	reefnet_sensuspro.h \
+	reefnet_sensusultra.h \
+	uwatec.h \
+	uwatec_aladin.h \
+	uwatec_memomouse.h \
+	uwatec_smart.h \
+	oceanic.h \
+	oceanic_atom2.h \
+	oceanic_veo250.h \
+	oceanic_vtpro.h \
+	mares.h \
+	mares_nemo.h \
+	mares_puck.h \
+	mares_darwin.h \
+	mares_iconhd.h \
+	hw.h \
+	hw_ostc.h \
+	hw_frog.h \
+	cressi.h \
+	cressi_edy.h \
+	zeagle.h \
+	zeagle_n2ition3.h \
+	atomics.h \
+	atomics_cobalt.h

libdivecomputer.pc.in

@@ -8,4 +8,4 @@ Description: A library for communication with various dive computers.
 Version: @VERSION@
 Requires.private: @DEPENDENCIES@
 Libs: -L${libdir} -ldivecomputer
-Cflags: -I${includedir}/libdivecomputer
+Cflags: -I${includedir}

src/Makefile.am

@@ -1,53 +1,4 @@
-#
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
-# Public header files.
-#
-
-libdivecomputerdir = $(includedir)/libdivecomputer
-libdivecomputer_HEADERS = 	\
-	version.h \
-	utils.h \
-	buffer.h \
-	device.h \
-	parser.h \
-	datetime.h \
-	units.h \
-	suunto.h \
-	suunto_solution.h \
-	suunto_eon.h \
-	suunto_vyper.h \
-	suunto_vyper2.h  \
-	suunto_d9.h \
-	reefnet.h \
-	reefnet_sensus.h \
-	reefnet_sensuspro.h \
-	reefnet_sensusultra.h \
-	uwatec.h \
-	uwatec_aladin.h \
-	uwatec_memomouse.h \
-	uwatec_smart.h \
-	oceanic.h \
-	oceanic_atom2.h \
-	oceanic_veo250.h \
-	oceanic_vtpro.h \
-	mares.h \
-	mares_nemo.h \
-	mares_puck.h \
-	mares_darwin.h \
-	mares_iconhd.h \
-	hw.h \
-	hw_ostc.h \
-	hw_frog.h \
-	cressi.h \
-	cressi_edy.h \
-	zeagle.h \
-	zeagle_n2ition3.h \
-	atomics.h \
-	atomics_cobalt.h
-
-#
-# Source files.
-#
-
 AM_CFLAGS = $(LIBUSB_CFLAGS)
 
 lib_LTLIBRARIES = libdivecomputer.la
@@ -60,50 +11,41 @@ libdivecomputer_la_LDFLAGS = \
 
 libdivecomputer_la_SOURCES = \
 	version.c \
-	device.h device-private.h device.c \
+	device-private.h device.c \
-	parser.h parser-private.h parser.c \
+	parser-private.h parser.c \
-	datetime.h datetime.c \
+	datetime.c \
-	suunto.h \
 	suunto_common.h suunto_common.c \
 	suunto_common2.h suunto_common2.c \
-	suunto_solution.h suunto_solution.c suunto_solution_parser.c \
+	suunto_solution.c suunto_solution_parser.c \
-	suunto_eon.h suunto_eon.c suunto_eon_parser.c \
+	suunto_eon.c suunto_eon_parser.c \
-	suunto_vyper.h suunto_vyper.c suunto_vyper_parser.c \
+	suunto_vyper.c suunto_vyper_parser.c \
-	suunto_vyper2.h suunto_vyper2.c \
+	suunto_vyper2.c \
-	suunto_d9.h suunto_d9.c suunto_d9_parser.c \
+	suunto_d9.c suunto_d9_parser.c \
-	reefnet.h \
+	reefnet_sensus.c reefnet_sensus_parser.c \
-	reefnet_sensus.h reefnet_sensus.c reefnet_sensus_parser.c \
+	reefnet_sensuspro.c reefnet_sensuspro_parser.c \
-	reefnet_sensuspro.h reefnet_sensuspro.c reefnet_sensuspro_parser.c \
+	reefnet_sensusultra.c reefnet_sensusultra_parser.c \
-	reefnet_sensusultra.h reefnet_sensusultra.c reefnet_sensusultra_parser.c \
+	uwatec_aladin.c \
-	uwatec.h \
+	uwatec_memomouse.c uwatec_memomouse_parser.c \
-	uwatec_aladin.h uwatec_aladin.c \
+	uwatec_smart.c uwatec_smart_parser.c \
-	uwatec_memomouse.h uwatec_memomouse.c uwatec_memomouse_parser.c \
-	uwatec_smart.h uwatec_smart.c uwatec_smart_parser.c \
-	oceanic.h \
 	oceanic_common.h oceanic_common.c \
-	oceanic_atom2.h oceanic_atom2.c oceanic_atom2_parser.c \
+	oceanic_atom2.c oceanic_atom2_parser.c \
-	oceanic_veo250.h oceanic_veo250.c oceanic_veo250_parser.c \
+	oceanic_veo250.c oceanic_veo250_parser.c \
-	oceanic_vtpro.h oceanic_vtpro.c oceanic_vtpro_parser.c \
+	oceanic_vtpro.c oceanic_vtpro_parser.c \
-	mares.h \
 	mares_common.h mares_common.c \
-	mares_nemo.h mares_nemo.c mares_nemo_parser.c \
+	mares_nemo.c mares_nemo_parser.c \
-	mares_puck.h mares_puck.c \
+	mares_puck.c \
-	mares_darwin.h mares_darwin.c mares_darwin_parser.c \
+	mares_darwin.c mares_darwin_parser.c \
-	mares_iconhd.h mares_iconhd.c mares_iconhd_parser.c \
+	mares_iconhd.c mares_iconhd_parser.c \
-	hw.h \
+	hw_ostc.c hw_ostc_parser.c \
-	hw_ostc.h hw_ostc.c hw_ostc_parser.c \
+	hw_frog.c \
-	hw_frog.h hw_frog.c \
+	cressi_edy.c cressi_edy_parser.c \
-	cressi.h \
+	zeagle_n2ition3.c \
-	cressi_edy.h cressi_edy.c cressi_edy_parser.c \
+	atomics_cobalt.c atomics_cobalt_parser.c \
-	zeagle.h \
-	zeagle_n2ition3.h zeagle_n2ition3.c \
-	atomics.h \
-	atomics_cobalt.h atomics_cobalt.c atomics_cobalt_parser.c \
 	ringbuffer.h ringbuffer.c \
 	checksum.h checksum.c \
 	array.h array.c \
-	buffer.h buffer.c \
+	buffer.c \
-	utils.h utils.c
+	utils.c
 
 if OS_WIN32
 libdivecomputer_la_SOURCES += serial.h serial_win32.c

src/atomics_cobalt.c

@@ -30,10 +30,11 @@
 #include <libusb-1.0/libusb.h>
 #endif
 
+#include <libdivecomputer/atomics_cobalt.h>
+#include <libdivecomputer/utils.h>
+
 #include "device-private.h"
-#include "atomics_cobalt.h"
 #include "checksum.h"
-#include "utils.h"
 #include "array.h"
 
 #define VID 0x0471

src/atomics_cobalt_parser.c

@@ -21,11 +21,12 @@
 
 #include <stdlib.h>
 
-#include "atomics_cobalt.h"
+#include <libdivecomputer/atomics_cobalt.h>
+#include <libdivecomputer/units.h>
+#include <libdivecomputer/utils.h>
+
 #include "parser-private.h"
-#include "utils.h"
 #include "array.h"
-#include "units.h"
 
 #define SZ_HEADER       228
 #define SZ_GASMIX       18

src/buffer.c

@@ -22,7 +22,7 @@
 #include <stdlib.h> // malloc, realloc, free
 #include <string.h> // memcpy, memmove
 
-#include "buffer.h"
+#include <libdivecomputer/buffer.h>
 
 struct dc_buffer_t {
 	unsigned char *data;

src/cressi_edy.c

@@ -23,10 +23,11 @@
 #include <stdlib.h> // malloc, free
 #include <assert.h> // assert
 
+#include <libdivecomputer/cressi_edy.h>
+#include <libdivecomputer/utils.h>
+
 #include "device-private.h"
-#include "cressi_edy.h"
 #include "serial.h"
-#include "utils.h"
 #include "checksum.h"
 #include "array.h"
 #include "ringbuffer.h"

src/cressi_edy_parser.c

@@ -21,9 +21,10 @@
 
 #include <stdlib.h>
 
-#include "cressi_edy.h"
+#include <libdivecomputer/cressi_edy.h>
+#include <libdivecomputer/utils.h>
+
 #include "parser-private.h"
-#include "utils.h"
 #include "array.h"
 
 typedef struct cressi_edy_parser_t cressi_edy_parser_t;

src/datetime.c

@@ -25,7 +25,7 @@
 
 #include <time.h>
 
-#include "datetime.h"
+#include <libdivecomputer/datetime.h>
 
 static struct tm *
 dc_localtime_r (const time_t *t, struct tm *tm)

src/device-private.h

@@ -24,7 +24,7 @@
 
 #include <limits.h>
 
-#include "device.h"
+#include <libdivecomputer/device.h>
 
 #ifdef __cplusplus
 extern "C" {

src/hw_frog.c

@@ -22,12 +22,13 @@
 #include <string.h> // memcmp, memcpy
 #include <stdlib.h> // malloc, free
 
+#include <libdivecomputer/hw_frog.h>
+#include <libdivecomputer/utils.h>
+
 #include "device-private.h"
-#include "hw_frog.h"
 #include "serial.h"
 #include "checksum.h"
 #include "ringbuffer.h"
-#include "utils.h"
 #include "array.h"
 
 #define EXITCODE(rc) \

src/hw_ostc.c

@@ -22,11 +22,12 @@
 #include <string.h> // memcmp, memcpy
 #include <stdlib.h> // malloc, free
 
+#include <libdivecomputer/hw_ostc.h>
+#include <libdivecomputer/utils.h>
+
 #include "device-private.h"
-#include "hw_ostc.h"
 #include "serial.h"
 #include "checksum.h"
-#include "utils.h"
 #include "array.h"
 
 #define EXITCODE(rc) \

src/hw_ostc_parser.c

@@ -21,10 +21,11 @@
 
 #include <stdlib.h>
 
-#include "hw_ostc.h"
+#include <libdivecomputer/hw_ostc.h>
+#include <libdivecomputer/utils.h>
+
 #include "parser-private.h"
 #include "array.h"
-#include "utils.h"
 
 #define NINFO 6
 

src/irda.c

@@ -37,8 +37,9 @@
 	#include <sys/ioctl.h>		// ioctl
 #endif
 
+#include <libdivecomputer/utils.h>
+
 #include "irda.h"
-#include "utils.h"
 #include "array.h"
 
 #ifdef _WIN32

src/mares_common.c

@@ -23,9 +23,10 @@
 #include <string.h> // memcpy, memcmp
 #include <assert.h> // assert
 
+#include <libdivecomputer/utils.h>
+
 #include "mares_common.h"
 #include "checksum.h"
-#include "utils.h"
 #include "array.h"
 
 #define EXITCODE(rc) \

src/mares_darwin.c

@@ -23,11 +23,12 @@
 #include <string.h>
 #include <assert.h>
 
+#include <libdivecomputer/mares_darwin.h>
+#include <libdivecomputer/units.h>
+#include <libdivecomputer/utils.h>
+
 #include "device-private.h"
 #include "mares_common.h"
-#include "mares_darwin.h"
-#include "units.h"
-#include "utils.h"
 #include "array.h"
 
 #define DARWIN    0

src/mares_darwin_parser.c

@@ -22,10 +22,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "mares_darwin.h"
+#include <libdivecomputer/mares_darwin.h>
+#include <libdivecomputer/units.h>
+#include <libdivecomputer/utils.h>
+
 #include "parser-private.h"
-#include "units.h"
-#include "utils.h"
 #include "array.h"
 
 #define DARWIN    0

src/mares_iconhd.c

@@ -22,11 +22,12 @@
 #include <string.h> // memcpy, memcmp
 #include <stdlib.h> // malloc, free
 
+#include <libdivecomputer/mares_iconhd.h>
+#include <libdivecomputer/utils.h>
+
 #include "device-private.h"
-#include "mares_iconhd.h"
 #include "serial.h"
 #include "array.h"
-#include "utils.h"
 
 #define EXITCODE(rc) \
 ( \

src/mares_iconhd_parser.c

@@ -21,9 +21,10 @@
 
 #include <stdlib.h>
 
-#include "mares_iconhd.h"
+#include <libdivecomputer/mares_iconhd.h>
+#include <libdivecomputer/utils.h>
+
 #include "parser-private.h"
-#include "utils.h"
 #include "array.h"
 
 #define ICONHD    0x14

src/mares_nemo.c

@@ -22,11 +22,12 @@
 #include <string.h> // memcpy, memcmp
 #include <stdlib.h> // malloc, free
 
+#include <libdivecomputer/mares_nemo.h>
+#include <libdivecomputer/utils.h>
+
 #include "device-private.h"
 #include "mares_common.h"
-#include "mares_nemo.h"
 #include "serial.h"
-#include "utils.h"
 #include "checksum.h"
 #include "array.h"
 

src/mares_nemo_parser.c

@@ -22,10 +22,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "mares_nemo.h"
+#include <libdivecomputer/mares_nemo.h>
+#include <libdivecomputer/units.h>
+#include <libdivecomputer/utils.h>
+
 #include "parser-private.h"
-#include "units.h"
-#include "utils.h"
 #include "array.h"
 
 #define NEMO        0

src/mares_puck.c

@@ -23,11 +23,12 @@
 #include <stdlib.h> // malloc, free
 #include <assert.h> // assert
 
+#include <libdivecomputer/mares_puck.h>
+#include <libdivecomputer/utils.h>
+
 #include "device-private.h"
 #include "mares_common.h"
-#include "mares_puck.h"
 #include "serial.h"
-#include "utils.h"
 #include "checksum.h"
 #include "array.h"
 

src/oceanic_atom2.c

@@ -22,11 +22,12 @@
 #include <string.h> // memcpy
 #include <stdlib.h> // malloc, free
 
+#include <libdivecomputer/oceanic_atom2.h>
+#include <libdivecomputer/utils.h>
+
 #include "device-private.h"
 #include "oceanic_common.h"
-#include "oceanic_atom2.h"
 #include "serial.h"
-#include "utils.h"
 #include "array.h"
 #include "ringbuffer.h"
 #include "checksum.h"

src/oceanic_atom2_parser.c

@@ -21,12 +21,13 @@
 
 #include <stdlib.h>
 
-#include "oceanic_atom2.h"
+#include <libdivecomputer/oceanic_atom2.h>
+#include <libdivecomputer/units.h>
+#include <libdivecomputer/utils.h>
+
 #include "oceanic_common.h"
 #include "parser-private.h"
 #include "array.h"
-#include "units.h"
-#include "utils.h"
 
 #define ATOM1       0x4250
 #define EPIC        0x4257

src/oceanic_common.c

@@ -23,11 +23,12 @@
 #include <stdlib.h> // malloc, free
 #include <assert.h> // assert
 
+#include <libdivecomputer/utils.h>
+
 #include "oceanic_common.h"
 #include "device-private.h"
 #include "ringbuffer.h"
 #include "array.h"
-#include "utils.h"
 
 #define RB_LOGBOOK_DISTANCE(a,b,l)	ringbuffer_distance (a, b, 0, l->rb_logbook_begin, l->rb_logbook_end)
 #define RB_LOGBOOK_INCR(a,b,l)		ringbuffer_increment (a, b, l->rb_logbook_begin, l->rb_logbook_end)

src/oceanic_veo250.c

@@ -22,11 +22,12 @@
 #include <string.h> // memcpy
 #include <stdlib.h> // malloc, free
 
+#include <libdivecomputer/oceanic_veo250.h>
+#include <libdivecomputer/utils.h>
+
 #include "device-private.h"
 #include "oceanic_common.h"
-#include "oceanic_veo250.h"
 #include "serial.h"
-#include "utils.h"
 #include "ringbuffer.h"
 #include "checksum.h"
 

src/oceanic_veo250_parser.c

@@ -21,12 +21,13 @@
 
 #include <stdlib.h>
 
-#include "oceanic_veo250.h"
+#include <libdivecomputer/oceanic_veo250.h>
+#include <libdivecomputer/units.h>
+#include <libdivecomputer/utils.h>
+
 #include "oceanic_common.h"
 #include "parser-private.h"
 #include "array.h"
-#include "units.h"
-#include "utils.h"
 
 typedef struct oceanic_veo250_parser_t oceanic_veo250_parser_t;
 

src/oceanic_vtpro.c

@@ -22,11 +22,12 @@
 #include <string.h> // memcpy
 #include <stdlib.h> // malloc, free
 
+#include <libdivecomputer/oceanic_vtpro.h>
+#include <libdivecomputer/utils.h>
+
 #include "device-private.h"
 #include "oceanic_common.h"
-#include "oceanic_vtpro.h"
 #include "serial.h"
-#include "utils.h"
 #include "ringbuffer.h"
 #include "checksum.h"
 

src/oceanic_vtpro_parser.c

@@ -21,12 +21,13 @@
 
 #include <stdlib.h>
 
-#include "oceanic_vtpro.h"
+#include <libdivecomputer/oceanic_vtpro.h>
+#include <libdivecomputer/units.h>
+#include <libdivecomputer/utils.h>
+
 #include "oceanic_common.h"
 #include "parser-private.h"
 #include "array.h"
-#include "units.h"
-#include "utils.h"
 
 typedef struct oceanic_vtpro_parser_t oceanic_vtpro_parser_t;
 

src/parser-private.h

@@ -22,7 +22,7 @@
 #ifndef PARSER_PRIVATE_H
 #define PARSER_PRIVATE_H
 
-#include "parser.h"
+#include <libdivecomputer/parser.h>
 
 #ifdef __cplusplus
 extern "C" {

src/reefnet_sensus.c

@@ -22,11 +22,12 @@
 #include <string.h> // memcmp, memcpy
 #include <stdlib.h> // malloc, free
 
+#include <libdivecomputer/reefnet_sensus.h>
+#include <libdivecomputer/utils.h>
+
 #include "device-private.h"
-#include "reefnet_sensus.h"
 #include "serial.h"
 #include "checksum.h"
-#include "utils.h"
 #include "array.h"
 
 #define EXITCODE(rc) \

src/reefnet_sensus_parser.c

@@ -21,10 +21,11 @@
 
 #include <stdlib.h>	// malloc, free
 
-#include "reefnet_sensus.h"
+#include <libdivecomputer/reefnet_sensus.h>
+#include <libdivecomputer/units.h>
+#include <libdivecomputer/utils.h>
+
 #include "parser-private.h"
-#include "units.h"
-#include "utils.h"
 #include "array.h"
 
 #define SAMPLE_DEPTH_ADJUST	13

src/reefnet_sensuspro.c

@@ -22,11 +22,12 @@
 #include <string.h> // memcmp, memcpy
 #include <stdlib.h> // malloc, free
 
+#include <libdivecomputer/reefnet_sensuspro.h>
+#include <libdivecomputer/utils.h>
+
 #include "device-private.h"
-#include "reefnet_sensuspro.h"
 #include "serial.h"
 #include "checksum.h"
-#include "utils.h"
 #include "array.h"
 
 #define EXITCODE(rc) \