trivial: Build the private sensor code into the .so itself

38 files changed, 40 insertions, 449 deletions

diff --git a/configure.ac b/configure.ac
index 3bdcfcd..80f457e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -461,10 +461,6 @@ lib/colorhug/Makefile
 lib/colorhug/colorhug.pc
 lib/colorhug/ch-version.h
 lib/compat/Makefile
-lib/dtp94/Makefile
-lib/huey/Makefile
-lib/munki/Makefile
-lib/ospark/Makefile
 ])
 AC_OUTPUT
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 295cea4..bc803e2 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -8,11 +8,7 @@ endif
 
 if HAVE_GUSB
 SUBDIRS +=						\
-	colorhug					\
-	dtp94						\
-	huey						\
-	ospark						\
-	munki
+	colorhug
 endif
 
 -include $(top_srcdir)/git.mk
diff --git a/lib/README.md b/lib/README.md
index db5788a..e78f035 100644
--- a/lib/README.md
+++ b/lib/README.md
@@ -29,32 +29,3 @@ This library is used by the daemon, and also ships a pkg-config file and
 headers which makes it suitable for other programs to us.
 
 This library is is versioned and has the same ABI guarantees of libcolord.
-
-dtp94
------
-This module installs the `libcolorhug.so` shared library and used to interface
-with the DTP94 colorimeter sensor.
-
-This library is used by the daemon only and is currently unsuitable for other
-programs to use. This library is is unversioned and **does not** have the same
-ABI and API guarantees of libcolord.
-
-huey
-----
-This module installs the `libcolorhug.so` shared library and used to interface
-with the Huey colorimeter sensor.
-
-This library is used by the daemon only and is currently unsuitable for other
-programs to use. This library is is unversioned and **does not** have the same
-ABI and API guarantees of libcolord.
-
-munki
------
-This module installs the `libcolorhug.so` shared library and used to interface
-with the ColorMunki photospectrometer sensor.
-
-This library is used by the daemon only and is currently unsuitable for othe
-programs to use. This library is is unversioned and **does not** have the same
-ABI and API guarantees of libcolord.
-
-The library is incomplete and requires a lot more work before it it useful.
diff --git a/lib/dtp94/Makefile.am b/lib/dtp94/Makefile.am
deleted file mode 100644
index 1c0f4e6..0000000
--- a/lib/dtp94/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-AM_CPPFLAGS = \
-	$(GLIB_CFLAGS)						\
-	$(GUSB_CFLAGS)						\
-	-I$(top_srcdir)/lib					\
-	-I$(top_srcdir)/lib/colord				\
-	-I$(top_builddir)/lib					\
-	-DCD_COMPILATION					\
-	-DDTP94_COMPILATION					\
-	-DG_USB_API_IS_SUBJECT_TO_CHANGE			\
-	-DG_LOG_DOMAIN=\"libdtp94\"
-
-COLORD_LIBS =							\
-	$(top_builddir)/lib/colord/libcolordprivate.la
-
-privlibdir=$(libdir)/colord-sensors
-privlib_LTLIBRARIES =						\
-	libdtp94-private.la
-
-libdtp94_private_la_SOURCES =					\
-	dtp94.h							\
-	dtp94-device.c						\
-	dtp94-device.h						\
-	dtp94-enum.c						\
-	dtp94-enum.h
-
-libdtp94_private_la_LIBADD =					\
-	$(GUSB_LIBS)						\
-	$(COLORD_LIBS)						\
-	$(GLIB_LIBS)
-
-libdtp94_private_la_LDFLAGS =					\
-	-export-dynamic						\
-	-no-undefined						\
-	-avoid-version                                          \
-	-export-symbols-regex '^dtp94_.*'
-
-libdtp94_private_la_CFLAGS =					\
-	$(WARN_CFLAGS)
-
-CLEANFILES = $(BUILT_SOURCES)
-
-clean-local:
-	rm -f *~
-
--include $(top_srcdir)/git.mk
diff --git a/lib/dtp94/dtp94.h b/lib/dtp94/dtp94.h
deleted file mode 100644
index fcf82d7..0000000
--- a/lib/dtp94/dtp94.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2013 Richard Hughes <richard@hughsie.com>
- *
- * Licensed under the GNU General Public License Version 2
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-/**
- * SECTION:dtp94
- * @short_description: Userspace library for DTP94
- *
- * This library allows you to control the DTP94 colorimwter.
- */
-
-#ifndef __DTP94_H__
-#define __DTP94_H__
-
-#define __DTP94_H_INSIDE__
-
-#include <dtp94/dtp94-device.h>
-#include <dtp94/dtp94-enum.h>
-
-#undef __DTP94_H_INSIDE__
-
-#endif /* __DTP94_H__ */
-
diff --git a/lib/huey/Makefile.am b/lib/huey/Makefile.am
deleted file mode 100644
index a8b2aec..0000000
--- a/lib/huey/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-AM_CPPFLAGS = \
-	$(GLIB_CFLAGS)						\
-	$(GUSB_CFLAGS)						\
-	-I$(top_srcdir)/lib					\
-	-I$(top_srcdir)/lib/colord				\
-	-I$(top_builddir)/lib					\
-	-DCD_COMPILATION					\
-	-DHUEY_COMPILATION					\
-	-DG_USB_API_IS_SUBJECT_TO_CHANGE			\
-	-DG_LOG_DOMAIN=\"libhuey\"
-
-COLORD_LIBS =							\
-	$(top_builddir)/lib/colord/libcolordprivate.la
-
-privlibdir=$(libdir)/colord-sensors
-privlib_LTLIBRARIES =						\
-	libhuey-private.la
-
-libhuey_private_la_SOURCES =					\
-	huey.h							\
-	huey-ctx.c						\
-	huey-ctx.h						\
-	huey-device.c						\
-	huey-device.h						\
-	huey-enum.c						\
-	huey-enum.h
-
-libhuey_private_la_LIBADD =					\
-	$(GUSB_LIBS)						\
-	$(COLORD_LIBS)						\
-	$(GLIB_LIBS)
-
-libhuey_private_la_LDFLAGS =					\
-	-export-dynamic						\
-	-no-undefined						\
-	-avoid-version                                          \
-	-export-symbols-regex '^huey_.*'
-
-libhuey_private_la_CFLAGS =					\
-	$(WARN_CFLAGS)
-
-CLEANFILES = $(BUILT_SOURCES)
-
-clean-local:
-	rm -f *~
-
--include $(top_srcdir)/git.mk
diff --git a/lib/huey/huey.h b/lib/huey/huey.h
deleted file mode 100644
index 573cb90..0000000
--- a/lib/huey/huey.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2013 Richard Hughes <richard@hughsie.com>
- *
- * Licensed under the GNU General Public License Version 2
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-/**
- * SECTION:huey
- * @short_description: Userspace library for the Huey
- *
- * This library allows you to control the Huey colorimwter.
- */
-
-#ifndef __HUEY_H__
-#define __HUEY_H__
-
-#define __HUEY_H_INSIDE__
-
-#include <huey/huey-ctx.h>
-#include <huey/huey-device.h>
-#include <huey/huey-enum.h>
-
-#undef __HUEY_H_INSIDE__
-
-#endif /* __HUEY_H__ */
-
diff --git a/lib/munki/Makefile.am b/lib/munki/Makefile.am
deleted file mode 100644
index 235cb0c..0000000
--- a/lib/munki/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-AM_CPPFLAGS = \
-	$(GLIB_CFLAGS)						\
-	$(GUSB_CFLAGS)						\
-	-I$(top_srcdir)/lib					\
-	-I$(top_srcdir)/lib/colord				\
-	-I$(top_builddir)/lib					\
-	-DCD_COMPILATION					\
-	-DMUNKI_COMPILATION					\
-	-DG_USB_API_IS_SUBJECT_TO_CHANGE			\
-	-DG_LOG_DOMAIN=\"libmunki\"
-
-COLORD_LIBS =							\
-	$(top_builddir)/lib/colord/libcolordprivate.la
-
-privlibdir=$(libdir)/colord-sensors
-privlib_LTLIBRARIES =						\
-	libmunki-private.la
-
-libmunki_private_la_SOURCES =					\
-	munki.h							\
-	munki-enum.c						\
-	munki-enum.h
-
-libmunki_private_la_LIBADD =					\
-	$(GUSB_LIBS)						\
-	$(COLORD_LIBS)						\
-	$(GLIB_LIBS)
-
-libmunki_private_la_LDFLAGS =					\
-	-export-dynamic						\
-	-no-undefined						\
-	-avoid-version                                          \
-	-export-symbols-regex '^munki_.*'
-
-libmunki_private_la_CFLAGS =					\
-	$(WARN_CFLAGS)
-
-CLEANFILES = $(BUILT_SOURCES)
-
-clean-local:
-	rm -f *~
-
--include $(top_srcdir)/git.mk
diff --git a/lib/munki/munki.h b/lib/munki/munki.h
deleted file mode 100644
index 842beec..0000000
--- a/lib/munki/munki.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2013 Richard Hughes <richard@hughsie.com>
- *
- * Licensed under the GNU General Public License Version 2
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-/**
- * SECTION:munki
- * @short_description: Userspace library for the ColorMunki Photo
- *
- * This library allows you to control the ColorMunki Photospectrometer.
- */
-
-#ifndef __MUNKI_H__
-#define __MUNKI_H__
-
-#define __MUNKI_H_INSIDE__
-
-#include <munki/munki-enum.h>
-
-#undef __MUNKI_H_INSIDE__
-
-#endif /* __MUNKI_H__ */
-
diff --git a/lib/ospark/Makefile.am b/lib/ospark/Makefile.am
deleted file mode 100644
index 3cf58d5..0000000
--- a/lib/ospark/Makefile.am
+++ /dev/null
@@ -1,69 +0,0 @@
-AM_CPPFLAGS = \
-	$(GLIB_CFLAGS)						\
-	$(GUSB_CFLAGS)						\
-	-I$(top_srcdir)/lib					\
-	-I$(top_srcdir)/lib/colord				\
-	-I$(top_builddir)/lib					\
-	-DCD_COMPILATION					\
-	-DOSPARK_COMPILATION					\
-	-DG_USB_API_IS_SUBJECT_TO_CHANGE			\
-	-DG_LOG_DOMAIN=\"libospark\"
-
-COLORD_LIBS =							\
-	$(top_builddir)/lib/colord/libcolordprivate.la
-
-privlibdir=$(libdir)/colord-sensors
-privlib_LTLIBRARIES =						\
-	libospark-private.la
-
-libospark_private_la_SOURCES =					\
-	ospark.h						\
-	osp-device.c						\
-	osp-device.h						\
-	osp-enum.c						\
-	osp-enum.h
-
-libospark_private_la_LIBADD =					\
-	$(GUSB_LIBS)						\
-	$(COLORD_LIBS)						\
-	$(GLIB_LIBS)
-
-libospark_private_la_LDFLAGS =					\
-	-export-dynamic						\
-	-no-undefined						\
-	-avoid-version						\
-	-export-symbols-regex '^osp_.*'
-
-libospark_private_la_CFLAGS =					\
-	$(WARN_CFLAGS)
-
-TESTS_ENVIRONMENT =						\
-	libtool --mode=execute valgrind				\
-	--quiet							\
-	--leak-check=full					\
-	--show-possibly-lost=no
-
-check_PROGRAMS =						\
-	osp-self-test
-
-osp_self_test_SOURCES =						\
-	osp-self-test.c
-
-osp_self_test_LDADD =						\
-	$(top_builddir)/lib/colord/libcolordprivate.la		\
-	$(GLIB_LIBS)						\
-	$(SELFTEST_LIBS)					\
-	$(LCMS_LIBS)						\
-	$(privlib_LTLIBRARIES)					\
-	$(GUSB_LIBS)
-
-osp_self_test_CFLAGS = -DEGG_TEST $(AM_CFLAGS) $(WARN_CFLAGS)
-
-TESTS = osp-self-test
-
-CLEANFILES = *.log *.trs $(BUILT_SOURCES)
-
-clean-local:
-	rm -f *~
-
--include $(top_srcdir)/git.mk
diff --git a/lib/ospark/ospark.h b/lib/ospark/ospark.h
deleted file mode 100644
index efaf2bf..0000000
--- a/lib/ospark/ospark.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2013 Richard Hughes <richard@hughsie.com>
- *
- * Licensed under the GNU General Public License Version 2
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-/**
- * SECTION:ospark
- * @short_description: Userspace library for the OceanOptics Spark device
- *
- * This library allows you to control the OceanOptics Spark spectro.
- */
-
-#ifndef __OSPARK_H__
-#define __OSPARK_H__
-
-#define __OSPARK_H_INSIDE__
-
-#include <ospark/osp-device.h>
-#include <ospark/osp-enum.h>
-
-#undef __OSPARK_H_INSIDE__
-
-#endif /* __OSPARK_H__ */
-
diff --git a/src/sensors/Makefile.am b/src/sensors/Makefile.am
index d369259..58a49ff 100644
--- a/src/sensors/Makefile.am
+++ b/src/sensors/Makefile.am
@@ -11,6 +11,7 @@ AM_CPPFLAGS =						\
 	$(GLIB_CFLAGS)					\
 	$(GUSB_CFLAGS)					\
 	$(GUDEV_CFLAGS)					\
+	$(POLKIT_CFLAGS)				\
 	-I$(top_srcdir)/src				\
 	-I$(top_srcdir)/lib				\
 	-I$(top_builddir)/lib				\
@@ -33,13 +34,13 @@ noinst_PROGRAMS =					\
 	cd-parse-beagle
 
 cd_parse_beagle_SOURCES =				\
+	huey/huey-enum.c				\
+	munki/munki-enum.c				\
 	cd-parse-beagle.c
 
 cd_parse_beagle_LDADD =					\
 	$(COLORD_PRIVATE_LIBS)				\
-	$(GLIB_LIBS)					\
-	$(top_builddir)/lib/huey/libhuey-private.la	\
-	$(top_builddir)/lib/munki/libmunki-private.la
+	$(GLIB_LIBS)
 
 cd_parse_beagle_CFLAGS =				\
 	$(WARN_CFLAGS)
diff --git a/src/sensors/cd-parse-beagle.c b/src/sensors/cd-parse-beagle.c
index 31bda23..36a1974 100644
--- a/src/sensors/cd-parse-beagle.c
+++ b/src/sensors/cd-parse-beagle.c
@@ -25,8 +25,9 @@
 #include <sys/types.h>
 #include <stdlib.h>
 #include <glib.h>
-#include <huey/huey.h>
-#include <munki/munki.h>
+
+#include "huey/huey-enum.h"
+#include "munki/munki-enum.h"
 
 #include "cd-sensor.h"
 
diff --git a/src/sensors/dtp94/Makefile.am b/src/sensors/dtp94/Makefile.am
index 6df053b..0b688ab 100644
--- a/src/sensors/dtp94/Makefile.am
+++ b/src/sensors/dtp94/Makefile.am
@@ -18,11 +18,14 @@ plugin_LTLIBRARIES =					\
 	libcolord_sensor_dtp94.la
 
 libcolord_sensor_dtp94_la_SOURCES =			\
+	dtp94-device.c					\
+	dtp94-device.h					\
+	dtp94-enum.c					\
+	dtp94-enum.h					\
 	cd-sensor-dtp94.c
 libcolord_sensor_dtp94_la_LIBADD =			\
 	$(GLIB_LIBS)					\
-	$(GUSB_LIBS)					\
-	$(top_builddir)/lib/dtp94/libdtp94-private.la
+	$(GUSB_LIBS)
 libcolord_sensor_dtp94_la_LDFLAGS = -module -avoid-version
 libcolord_sensor_dtp94_la_CFLAGS = $(WARN_CFLAGS)
 endif
diff --git a/src/sensors/dtp94/cd-sensor-dtp94.c b/src/sensors/dtp94/cd-sensor-dtp94.c
index cbd744b..82be057 100644
--- a/src/sensors/dtp94/cd-sensor-dtp94.c
+++ b/src/sensors/dtp94/cd-sensor-dtp94.c
@@ -28,7 +28,8 @@
 
 #include "../src/cd-sensor.h"
 
-#include <dtp94/dtp94.h>
+#include "dtp94-enum.h"
+#include "dtp94-device.h"
 
 typedef struct
 {
diff --git a/lib/dtp94/dtp94-device.c b/src/sensors/dtp94/dtp94-device.c
index 65ee254..65ee254 100644
--- a/lib/dtp94/dtp94-device.c
+++ b/src/sensors/dtp94/dtp94-device.c
diff --git a/lib/dtp94/dtp94-device.h b/src/sensors/dtp94/dtp94-device.h
index 609dc66..2b29b6b 100644
--- a/lib/dtp94/dtp94-device.h
+++ b/src/sensors/dtp94/dtp94-device.h
@@ -19,10 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#if !defined (__DTP94_H_INSIDE__) && !defined (DTP94_COMPILATION)
-#error "Only <dtp94.h> can be included directly."
-#endif
-
 #ifndef __DTP94_DEVICE_H
 #define __DTP94_DEVICE_H
 
diff --git a/lib/dtp94/dtp94-enum.c b/src/sensors/dtp94/dtp94-enum.c
index 4d2000e..4d2000e 100644
--- a/lib/dtp94/dtp94-enum.c
+++ b/src/sensors/dtp94/dtp94-enum.c
diff --git a/lib/dtp94/dtp94-enum.h b/src/sensors/dtp94/dtp94-enum.h
index 9d832a3..9c5f949 100644
--- a/lib/dtp94/dtp94-enum.h
+++ b/src/sensors/dtp94/dtp94-enum.h
@@ -19,10 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#if !defined (__DTP94_H_INSIDE__) && !defined (DTP94_COMPILATION)
-#error "Only <dtp94.h> can be included directly."
-#endif
-
 #ifndef __DTP94_ENUM_H
 #define __DTP94_ENUM_H
 
diff --git a/src/sensors/huey/Makefile.am b/src/sensors/huey/Makefile.am
index a927f53..1d1cb9e 100644
--- a/src/sensors/huey/Makefile.am
+++ b/src/sensors/huey/Makefile.am
@@ -18,11 +18,16 @@ plugin_LTLIBRARIES =					\
 	libcolord_sensor_huey.la
 
 libcolord_sensor_huey_la_SOURCES =			\
+	huey-ctx.c					\
+	huey-ctx.h					\
+	huey-device.c					\
+	huey-device.h					\
+	huey-enum.c					\
+	huey-enum.h					\
 	cd-sensor-huey.c
 libcolord_sensor_huey_la_LIBADD =			\
 	$(GLIB_LIBS)					\
-	$(GUSB_LIBS)					\
-	$(top_builddir)/lib/huey/libhuey-private.la
+	$(GUSB_LIBS)
 libcolord_sensor_huey_la_LDFLAGS = -module -avoid-version
 libcolord_sensor_huey_la_CFLAGS = $(WARN_CFLAGS)
 endif
diff --git a/src/sensors/huey/cd-sensor-huey.c b/src/sensors/huey/cd-sensor-huey.c
index 967c17e..9a8ff87 100644
--- a/src/sensors/huey/cd-sensor-huey.c
+++ b/src/sensors/huey/cd-sensor-huey.c
@@ -25,10 +25,13 @@
 #include <glib-object.h>
 #include <gusb.h>
 #include <colord-private.h>
-#include <huey/huey.h>
 
 #include "../src/cd-sensor.h"
 
+#include "huey-ctx.h"
+#include "huey-device.h"
+#include "huey-enum.h"
+
 typedef struct
 {
 	GUsbDevice			*device;
diff --git a/lib/huey/huey-ctx.c b/src/sensors/huey/huey-ctx.c
index 42feb41..42feb41 100644
--- a/lib/huey/huey-ctx.c
+++ b/src/sensors/huey/huey-ctx.c
diff --git a/lib/huey/huey-ctx.h b/src/sensors/huey/huey-ctx.h
index f86a7f5..cf32e4d 100644
--- a/lib/huey/huey-ctx.h
+++ b/src/sensors/huey/huey-ctx.h
@@ -19,10 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#if !defined (__HUEY_H_INSIDE__) && !defined (HUEY_COMPILATION)
-#error "Only <huey.h> can be included directly."
-#endif
-
 #ifndef __HUEY_CTX_H
 #define __HUEY_CTX_H
 
diff --git a/lib/huey/huey-device.c b/src/sensors/huey/huey-device.c
index a070158..a070158 100644
--- a/lib/huey/huey-device.c
+++ b/src/sensors/huey/huey-device.c
diff --git a/lib/huey/huey-device.h b/src/sensors/huey/huey-device.h
index e809c11..c488132 100644
--- a/lib/huey/huey-device.h
+++ b/src/sensors/huey/huey-device.h
@@ -19,10 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#if !defined (__HUEY_H_INSIDE__) && !defined (HUEY_COMPILATION)
-#error "Only <huey.h> can be included directly."
-#endif
-
 #ifndef __HUEY_DEVICE_H
 #define __HUEY_DEVICE_H
 
diff --git a/lib/huey/huey-enum.c b/src/sensors/huey/huey-enum.c
index 385aaa9..385aaa9 100644
--- a/lib/huey/huey-enum.c
+++ b/src/sensors/huey/huey-enum.c
diff --git a/lib/huey/huey-enum.h b/src/sensors/huey/huey-enum.h
index 9758c53..7317558 100644
--- a/lib/huey/huey-enum.h
+++ b/src/sensors/huey/huey-enum.h
@@ -19,10 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#if !defined (__HUEY_H_INSIDE__) && !defined (HUEY_COMPILATION)
-#error "Only <huey.h> can be included directly."
-#endif
-
 #ifndef __HUEY_ENUM_H
 #define __HUEY_ENUM_H
 
diff --git a/src/sensors/munki/Makefile.am b/src/sensors/munki/Makefile.am
index c820af7..008cac1 100644
--- a/src/sensors/munki/Makefile.am
+++ b/src/sensors/munki/Makefile.am
@@ -1,5 +1,8 @@
 if FALSE
-libcolord_sensor_munki_la_SOURCES = cd-sensor-munki.c
+libcolord_sensor_munki_la_SOURCES =			\
+	munki-enum.c					\
+	munki-enum.h					\
+	cd-sensor-munki.c
 libcolord_sensor_munki_la_LIBADD = $(GLIB_LIBS)
 libcolord_sensor_munki_la_LDFLAGS = -module -avoid-version
 libcolord_sensor_munki_la_CFLAGS = $(WARN_CFLAGS)
diff --git a/src/sensors/munki/cd-sensor-munki.c b/src/sensors/munki/cd-sensor-munki.c
index b5f7ef0..52ce132 100644
--- a/src/sensors/munki/cd-sensor-munki.c
+++ b/src/sensors/munki/cd-sensor-munki.c
@@ -29,6 +29,8 @@
 #include "cd-buffer.h"
 #include "cd-sensor.h"
 
+#include "munki-enum.h"
+
 typedef struct
 {
 	gboolean			 done_startup;
diff --git a/lib/munki/munki-enum.c b/src/sensors/munki/munki-enum.c
index e3ae53e..e3ae53e 100644
--- a/lib/munki/munki-enum.c
+++ b/src/sensors/munki/munki-enum.c
diff --git a/lib/munki/munki-enum.h b/src/sensors/munki/munki-enum.h
index e1acea5..d43c15c 100644
--- a/lib/munki/munki-enum.h
+++ b/src/sensors/munki/munki-enum.h
@@ -19,10 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#if !defined (__MUNKI_H_INSIDE__) && !defined (MUNKI_COMPILATION)
-#error "Only <munki.h> can be included directly."
-#endif
-
 #ifndef __MUNKI_ENUM_H
 #define __MUNKI_ENUM_H
 
diff --git a/src/sensors/spark/Makefile.am b/src/sensors/spark/Makefile.am
index 8962815..cb65f0e 100644
--- a/src/sensors/spark/Makefile.am
+++ b/src/sensors/spark/Makefile.am
@@ -18,11 +18,14 @@ plugin_LTLIBRARIES =					\
 	libcolord_sensor_spark.la
 
 libcolord_sensor_spark_la_SOURCES =			\
+	osp-device.c					\
+	osp-device.h					\
+	osp-enum.c					\
+	osp-enum.h					\
 	cd-sensor-spark.c
 libcolord_sensor_spark_la_LIBADD =			\
 	$(GLIB_LIBS)					\
-	$(GUSB_LIBS)					\
-	$(top_builddir)/lib/ospark/libospark-private.la
+	$(GUSB_LIBS)
 libcolord_sensor_spark_la_LDFLAGS = -module -avoid-version
 libcolord_sensor_spark_la_CFLAGS = $(WARN_CFLAGS)
 endif
diff --git a/src/sensors/spark/cd-sensor-spark.c b/src/sensors/spark/cd-sensor-spark.c
index 62ecf07..fcddf7a 100644
--- a/src/sensors/spark/cd-sensor-spark.c
+++ b/src/sensors/spark/cd-sensor-spark.c
@@ -24,10 +24,12 @@
 
 #include <glib-object.h>
 #include <colord-private.h>
-#include <ospark/ospark.h>
 
 #include "../src/cd-sensor.h"
 
+#include "osp-device.h"
+#include "osp-enum.h"
+
 typedef struct
 {
 	GUsbDevice			*device;
diff --git a/lib/ospark/osp-device.c b/src/sensors/spark/osp-device.c
index 84fcdb2..84fcdb2 100644
--- a/lib/ospark/osp-device.c
+++ b/src/sensors/spark/osp-device.c
diff --git a/lib/ospark/osp-device.h b/src/sensors/spark/osp-device.h
index 1616f39..617e9dd 100644
--- a/lib/ospark/osp-device.h
+++ b/src/sensors/spark/osp-device.h
@@ -19,10 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#if !defined (__OSPARK_H_INSIDE__) && !defined (OSPARK_COMPILATION)
-#error "Only <ospark.h> can be included directly."
-#endif
-
 #ifndef __OSP_DEVICE_H
 #define __OSP_DEVICE_H
 
diff --git a/lib/ospark/osp-enum.c b/src/sensors/spark/osp-enum.c
index 9c92b80..9c92b80 100644
--- a/lib/ospark/osp-enum.c
+++ b/src/sensors/spark/osp-enum.c
diff --git a/lib/ospark/osp-enum.h b/src/sensors/spark/osp-enum.h
index 87fc0ff..8772000 100644
--- a/lib/ospark/osp-enum.h
+++ b/src/sensors/spark/osp-enum.h
@@ -19,10 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#if !defined (__OSPARK_H_INSIDE__) && !defined (OSPARK_COMPILATION)
-#error "Only <ospark.h> can be included directly."
-#endif
-
 #ifndef OSP_ENUM_H
 #define OSP_ENUM_H
 
diff --git a/lib/ospark/osp-self-test.c b/src/sensors/spark/osp-self-test.c
index 0c48464..0c48464 100644
--- a/lib/ospark/osp-self-test.c
+++ b/src/sensors/spark/osp-self-test.c