diff --git a/Makefile.am b/Makefile.am
index 3e238898..c0a22865 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,10 @@
 
 ACLOCAL_AMFLAGS = -I autostuff
 
-AM_CPPFLAGS = -I$(srcdir)/src -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
+local_includes = -Iinclude -I$(srcdir)/include -I$(srcdir)/src
+local_includes += -Ibindings/cxx/include -I${srcdir}/bindings/cxx/include -Ibindings/cxx
+
+AM_CPPFLAGS = $(local_includes) -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
 
 lib_LTLIBRARIES = libsigrok.la
 
@@ -585,7 +588,7 @@ $(JDOC): bindings/swig/doc.py $(CPPXMLDOC)
 $(JCXX): $(JSWG) $(JDOC) bindings/swig/classes.i $(library_include_HEADERS)
 	$(AM_V_at)make java-clean
 	$(AM_V_GEN)swig -c++ -java -package org.sigrok.core.classes \
-		-I$(srcdir)/include -I$(srcdir)/bindings/cxx/include -I$(srcdir) -I$(JCLS) -Ibindings/cxx/include -outdir $(JCLS) -o $@ $<
+		$(local_includes) -I$(JCLS) -I. -I$(srcdir) -outdir $(JCLS) -o $@ $<
 
 $(JJAR): $(JCXX)
 	$(AM_V_GEN)$(JAVAC) -sourcepath $(JDIR) -d $(JDIR) $(JSRC)
diff --git a/configure.ac b/configure.ac
index ff9c9395..45ee40cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -456,8 +456,8 @@ esac
 
 AC_SUBST(SR_PKGLIBS)
 
-CFLAGS="$CFLAGS -Iinclude/libsigrok -I${srcdir}/include/libsigrok $LIB_CFLAGS"
-CXXFLAGS="$CXXFLAGS -Iinclude/libsigrok -I${srcdir}/include -Ibindings/cxx -Ibindings/cxx/include/libsigrokcxx -I${srcdir}/bindings/cxx/include $LIB_CFLAGS"
+CFLAGS="$CFLAGS $LIB_CFLAGS"
+CXXFLAGS="$CXXFLAGS $LIB_CFLAGS"
 
 # Find Java compiler and JNI includes for Java bindings.
 AC_CHECK_PROG([HAVE_JAVAC], [javac], [yes], [no])
diff --git a/include/libsigrok/libsigrok.h b/include/libsigrok/libsigrok.h
index 085ac061..0e35957f 100644
--- a/include/libsigrok/libsigrok.h
+++ b/include/libsigrok/libsigrok.h
@@ -1099,8 +1099,8 @@ struct sr_serial_port {
 	char *description;
 };
 
-#include "proto.h"
-#include "version.h"
+#include <libsigrok/proto.h>
+#include <libsigrok/version.h>
 
 #ifdef __cplusplus
 }
diff --git a/src/analog.c b/src/analog.c
index 10c4c1c7..a0a48de9 100644
--- a/src/analog.c
+++ b/src/analog.c
@@ -21,7 +21,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <ctype.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
diff --git a/src/backend.c b/src/backend.c
index 4889358a..baf1f8d9 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -20,7 +20,7 @@
 
 #include <glib.h>
 #include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
diff --git a/src/device.c b/src/device.c
index 01f41348..fe3e2316 100644
--- a/src/device.c
+++ b/src/device.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <glib.h>
 #include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
diff --git a/src/dmm/bm25x.c b/src/dmm/bm25x.c
index 67c2d04f..1e231a90 100644
--- a/src/dmm/bm25x.c
+++ b/src/dmm/bm25x.c
@@ -24,7 +24,7 @@
  */
 
 #include <math.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "brymen-bm25x"
diff --git a/src/dmm/es519xx.c b/src/dmm/es519xx.c
index 075587ce..2385a220 100644
--- a/src/dmm/es519xx.c
+++ b/src/dmm/es519xx.c
@@ -29,7 +29,7 @@
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "es519xx"
diff --git a/src/dmm/fs9721.c b/src/dmm/fs9721.c
index aa7746ef..6bc151a7 100644
--- a/src/dmm/fs9721.c
+++ b/src/dmm/fs9721.c
@@ -35,7 +35,7 @@
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "fs9721"
diff --git a/src/dmm/fs9922.c b/src/dmm/fs9922.c
index caaa51c7..698e1184 100644
--- a/src/dmm/fs9922.c
+++ b/src/dmm/fs9922.c
@@ -26,7 +26,7 @@
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "fs9922"
diff --git a/src/dmm/m2110.c b/src/dmm/m2110.c
index 5863cef1..8f094a5c 100644
--- a/src/dmm/m2110.c
+++ b/src/dmm/m2110.c
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "m2110"
diff --git a/src/dmm/metex14.c b/src/dmm/metex14.c
index e2d14ec3..90278ffd 100644
--- a/src/dmm/metex14.c
+++ b/src/dmm/metex14.c
@@ -35,7 +35,7 @@
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "metex14"
diff --git a/src/dmm/rs9lcd.c b/src/dmm/rs9lcd.c
index 539c2335..44080604 100644
--- a/src/dmm/rs9lcd.c
+++ b/src/dmm/rs9lcd.c
@@ -32,7 +32,7 @@
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "rs9lcd"
diff --git a/src/dmm/ut372.c b/src/dmm/ut372.c
index 2de3da34..d2fd8bc9 100644
--- a/src/dmm/ut372.c
+++ b/src/dmm/ut372.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <math.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "ut372"
diff --git a/src/dmm/ut71x.c b/src/dmm/ut71x.c
index ce23dccd..d519ecc4 100644
--- a/src/dmm/ut71x.c
+++ b/src/dmm/ut71x.c
@@ -28,7 +28,7 @@
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "ut71x"
diff --git a/src/dmm/vc870.c b/src/dmm/vc870.c
index 0c1de785..8b7f191f 100644
--- a/src/dmm/vc870.c
+++ b/src/dmm/vc870.c
@@ -22,7 +22,7 @@
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "vc870"
diff --git a/src/drivers.c b/src/drivers.c
index d37d5529..15e10842 100644
--- a/src/drivers.c
+++ b/src/drivers.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
diff --git a/src/error.c b/src/error.c
index 0d43abf1..0280449e 100644
--- a/src/error.c
+++ b/src/error.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 
 /**
  * @file
diff --git a/src/ezusb.c b/src/ezusb.c
index 9f40d3b7..465dab03 100644
--- a/src/ezusb.c
+++ b/src/ezusb.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "ezusb"
diff --git a/src/fallback.c b/src/fallback.c
index d66c4b8d..67767699 100644
--- a/src/fallback.c
+++ b/src/fallback.c
@@ -19,7 +19,7 @@
 
 #include <glib.h>
 #include "config.h"
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 
 #ifndef HAVE_LIBSERIALPORT
 
diff --git a/src/hardware/agilent-dmm/api.c b/src/hardware/agilent-dmm/api.c
index cefea4f2..273c7f06 100644
--- a/src/hardware/agilent-dmm/api.c
+++ b/src/hardware/agilent-dmm/api.c
@@ -22,7 +22,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "agilent-dmm.h"
 
diff --git a/src/hardware/agilent-dmm/sched.c b/src/hardware/agilent-dmm/sched.c
index 1fe962f5..2db3b748 100644
--- a/src/hardware/agilent-dmm/sched.c
+++ b/src/hardware/agilent-dmm/sched.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "agilent-dmm.h"
 
diff --git a/src/hardware/appa-55ii/protocol.h b/src/hardware/appa-55ii/protocol.h
index fa3c2476..4e8b1292 100644
--- a/src/hardware/appa-55ii/protocol.h
+++ b/src/hardware/appa-55ii/protocol.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "appa-55ii"
diff --git a/src/hardware/asix-sigma/asix-sigma.c b/src/hardware/asix-sigma/asix-sigma.c
index 0a2ec990..eaade4bf 100644
--- a/src/hardware/asix-sigma/asix-sigma.c
+++ b/src/hardware/asix-sigma/asix-sigma.c
@@ -28,7 +28,7 @@
 #include <ftdi.h>
 #include <string.h>
 #include <unistd.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "asix-sigma.h"
 
diff --git a/src/hardware/atten-pps3xxx/protocol.h b/src/hardware/atten-pps3xxx/protocol.h
index 01983d3b..633c0a20 100644
--- a/src/hardware/atten-pps3xxx/protocol.h
+++ b/src/hardware/atten-pps3xxx/protocol.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "atten-pps3xxx"
diff --git a/src/hardware/baylibre-acme/gpio.c b/src/hardware/baylibre-acme/gpio.c
index fb5d298c..bb6c54d5 100644
--- a/src/hardware/baylibre-acme/gpio.c
+++ b/src/hardware/baylibre-acme/gpio.c
@@ -23,7 +23,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "gpio.h"
 
diff --git a/src/hardware/baylibre-acme/protocol.h b/src/hardware/baylibre-acme/protocol.h
index a3f4452c..9410e114 100644
--- a/src/hardware/baylibre-acme/protocol.h
+++ b/src/hardware/baylibre-acme/protocol.h
@@ -23,7 +23,7 @@
 #include <stdint.h>
 #include <glib.h>
 #include <unistd.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "baylibre-acme"
diff --git a/src/hardware/beaglelogic/protocol.h b/src/hardware/beaglelogic/protocol.h
index 90fad482..75e74725 100644
--- a/src/hardware/beaglelogic/protocol.h
+++ b/src/hardware/beaglelogic/protocol.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "beaglelogic"
diff --git a/src/hardware/brymen-bm86x/protocol.h b/src/hardware/brymen-bm86x/protocol.h
index 57af1552..6e33e8bd 100644
--- a/src/hardware/brymen-bm86x/protocol.h
+++ b/src/hardware/brymen-bm86x/protocol.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "brymen-bm86x"
diff --git a/src/hardware/brymen-dmm/protocol.h b/src/hardware/brymen-dmm/protocol.h
index 7c9aaae6..3a695b44 100644
--- a/src/hardware/brymen-dmm/protocol.h
+++ b/src/hardware/brymen-dmm/protocol.h
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "brymen-dmm"
diff --git a/src/hardware/cem-dt-885x/protocol.h b/src/hardware/cem-dt-885x/protocol.h
index 1f0e191b..69afacae 100644
--- a/src/hardware/cem-dt-885x/protocol.h
+++ b/src/hardware/cem-dt-885x/protocol.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "cem-dt-885x"
diff --git a/src/hardware/center-3xx/protocol.h b/src/hardware/center-3xx/protocol.h
index c920f32a..8ff5d2cc 100644
--- a/src/hardware/center-3xx/protocol.h
+++ b/src/hardware/center-3xx/protocol.h
@@ -26,7 +26,7 @@
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "center-3xx"
diff --git a/src/hardware/chronovu-la/protocol.h b/src/hardware/chronovu-la/protocol.h
index c74feaa2..be7e64a6 100644
--- a/src/hardware/chronovu-la/protocol.h
+++ b/src/hardware/chronovu-la/protocol.h
@@ -25,7 +25,7 @@
 #include <ftdi.h>
 #include <stdint.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "la8/la16"
diff --git a/src/hardware/colead-slm/api.c b/src/hardware/colead-slm/api.c
index fe697277..0e2c9198 100644
--- a/src/hardware/colead-slm/api.c
+++ b/src/hardware/colead-slm/api.c
@@ -22,7 +22,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
diff --git a/src/hardware/colead-slm/protocol.c b/src/hardware/colead-slm/protocol.c
index 9a7c9fd0..f29d1bb9 100644
--- a/src/hardware/colead-slm/protocol.c
+++ b/src/hardware/colead-slm/protocol.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <glib.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
diff --git a/src/hardware/colead-slm/protocol.h b/src/hardware/colead-slm/protocol.h
index 8942ac85..4cc49974 100644
--- a/src/hardware/colead-slm/protocol.h
+++ b/src/hardware/colead-slm/protocol.h
@@ -21,7 +21,7 @@
 #define LIBSIGROK_HARDWARE_COLEAD_SLM_PROTOCOL_H
 
 #include <stdint.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "colead-slm"
diff --git a/src/hardware/conrad-digi-35-cpu/protocol.h b/src/hardware/conrad-digi-35-cpu/protocol.h
index 1c3885a4..340cc23b 100644
--- a/src/hardware/conrad-digi-35-cpu/protocol.h
+++ b/src/hardware/conrad-digi-35-cpu/protocol.h
@@ -29,7 +29,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "conrad-digi-35-cpu"
diff --git a/src/hardware/demo/demo.c b/src/hardware/demo/demo.c
index 920c1e4d..bdf4185d 100644
--- a/src/hardware/demo/demo.c
+++ b/src/hardware/demo/demo.c
@@ -30,7 +30,7 @@
 #include <fcntl.h>
 #define pipe(fds) _pipe(fds, 4096, _O_BINARY)
 #endif
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "demo"
diff --git a/src/hardware/deree-de5000/api.c b/src/hardware/deree-de5000/api.c
index 33e38881..fdf0bc3e 100644
--- a/src/hardware/deree-de5000/api.c
+++ b/src/hardware/deree-de5000/api.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 static void std_dev_attach(struct sr_dev_driver *di, struct sr_dev_inst *sdi)
diff --git a/src/hardware/fluke-dmm/api.c b/src/hardware/fluke-dmm/api.c
index 9c6c8a94..47f598f2 100644
--- a/src/hardware/fluke-dmm/api.c
+++ b/src/hardware/fluke-dmm/api.c
@@ -22,7 +22,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "fluke-dmm.h"
 
diff --git a/src/hardware/fluke-dmm/fluke.c b/src/hardware/fluke-dmm/fluke.c
index 159a4f9f..7604afa9 100644
--- a/src/hardware/fluke-dmm/fluke.c
+++ b/src/hardware/fluke-dmm/fluke.c
@@ -21,7 +21,7 @@
 #include <math.h>
 #include <string.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "fluke-dmm.h"
 
diff --git a/src/hardware/fx2lafw/protocol.h b/src/hardware/fx2lafw/protocol.h
index 6d723115..35a52fba 100644
--- a/src/hardware/fx2lafw/protocol.h
+++ b/src/hardware/fx2lafw/protocol.h
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <libusb.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "fx2lafw"
diff --git a/src/hardware/gmc-mh-1x-2x/protocol.h b/src/hardware/gmc-mh-1x-2x/protocol.h
index b19cd431..b4869ad1 100644
--- a/src/hardware/gmc-mh-1x-2x/protocol.h
+++ b/src/hardware/gmc-mh-1x-2x/protocol.h
@@ -27,7 +27,7 @@
 
 #include <stdint.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "gmc-mh-1x-2x"
diff --git a/src/hardware/hameg-hmo/protocol.h b/src/hardware/hameg-hmo/protocol.h
index 8235b1e7..3747d62b 100644
--- a/src/hardware/hameg-hmo/protocol.h
+++ b/src/hardware/hameg-hmo/protocol.h
@@ -23,7 +23,7 @@
 #include <glib.h>
 #include <stdint.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "hameg-hmo"
diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c
index 160dbb4d..ba4918d5 100644
--- a/src/hardware/hantek-dso/api.c
+++ b/src/hardware/hantek-dso/api.c
@@ -29,7 +29,7 @@
 #include <inttypes.h>
 #include <glib.h>
 #include <libusb.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "dso.h"
 
diff --git a/src/hardware/hantek-dso/dso.c b/src/hardware/hantek-dso/dso.c
index 195201fe..27ef63c1 100644
--- a/src/hardware/hantek-dso/dso.c
+++ b/src/hardware/hantek-dso/dso.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <glib.h>
 #include <libusb.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "dso.h"
 
diff --git a/src/hardware/ikalogic-scanalogic2/protocol.h b/src/hardware/ikalogic-scanalogic2/protocol.h
index cd794821..66a5cecf 100644
--- a/src/hardware/ikalogic-scanalogic2/protocol.h
+++ b/src/hardware/ikalogic-scanalogic2/protocol.h
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <stdint.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "ikalogic-scanalogic2"
diff --git a/src/hardware/ikalogic-scanaplus/protocol.h b/src/hardware/ikalogic-scanaplus/protocol.h
index deb76b15..cdd684d0 100644
--- a/src/hardware/ikalogic-scanaplus/protocol.h
+++ b/src/hardware/ikalogic-scanaplus/protocol.h
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <glib.h>
 #include <ftdi.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "ikalogic-scanaplus"
diff --git a/src/hardware/kecheng-kc-330b/protocol.h b/src/hardware/kecheng-kc-330b/protocol.h
index ff3ce8b9..a718bdba 100644
--- a/src/hardware/kecheng-kc-330b/protocol.h
+++ b/src/hardware/kecheng-kc-330b/protocol.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "kecheng-kc-330b"
diff --git a/src/hardware/lascar-el-usb/api.c b/src/hardware/lascar-el-usb/api.c
index 40a41649..682366d0 100644
--- a/src/hardware/lascar-el-usb/api.c
+++ b/src/hardware/lascar-el-usb/api.c
@@ -19,7 +19,7 @@
 
 #include <glib.h>
 #include <libusb.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
diff --git a/src/hardware/lascar-el-usb/protocol.c b/src/hardware/lascar-el-usb/protocol.c
index 3dad7943..ba60fe3b 100644
--- a/src/hardware/lascar-el-usb/protocol.c
+++ b/src/hardware/lascar-el-usb/protocol.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
diff --git a/src/hardware/lascar-el-usb/protocol.h b/src/hardware/lascar-el-usb/protocol.h
index a0f7f4fd..08197fb2 100644
--- a/src/hardware/lascar-el-usb/protocol.h
+++ b/src/hardware/lascar-el-usb/protocol.h
@@ -21,7 +21,7 @@
 #define LIBSIGROK_HARDWARE_LASCAR_EL_USB_PROTOCOL_H
 
 #include <stdint.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "lascar-el-usb"
diff --git a/src/hardware/link-mso19/protocol.h b/src/hardware/link-mso19/protocol.h
index 337814bf..e32f39e9 100644
--- a/src/hardware/link-mso19/protocol.h
+++ b/src/hardware/link-mso19/protocol.h
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <glib.h>
 #include <libudev.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "link-mso19"
diff --git a/src/hardware/manson-hcs-3xxx/protocol.h b/src/hardware/manson-hcs-3xxx/protocol.h
index 465cdd9d..c63f943d 100644
--- a/src/hardware/manson-hcs-3xxx/protocol.h
+++ b/src/hardware/manson-hcs-3xxx/protocol.h
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "manson-hcs-3xxx"
diff --git a/src/hardware/maynuo-m97/protocol.h b/src/hardware/maynuo-m97/protocol.h
index 7cb1f632..62c1d47c 100644
--- a/src/hardware/maynuo-m97/protocol.h
+++ b/src/hardware/maynuo-m97/protocol.h
@@ -21,7 +21,7 @@
 #define LIBSIGROK_HARDWARE_MAYNUO_M97_PROTOCOL_H
 
 #include <stdint.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "maynuo-m97"
diff --git a/src/hardware/mic-985xx/protocol.h b/src/hardware/mic-985xx/protocol.h
index 10d95d09..42a01daf 100644
--- a/src/hardware/mic-985xx/protocol.h
+++ b/src/hardware/mic-985xx/protocol.h
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "mic-985xx"
diff --git a/src/hardware/motech-lps-30x/protocol.h b/src/hardware/motech-lps-30x/protocol.h
index de700cf0..728c6005 100644
--- a/src/hardware/motech-lps-30x/protocol.h
+++ b/src/hardware/motech-lps-30x/protocol.h
@@ -28,7 +28,7 @@
 
 #include <stdint.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 SR_PRIV int lps_process_status(struct sr_dev_inst *sdi, int stat);
diff --git a/src/hardware/norma-dmm/protocol.h b/src/hardware/norma-dmm/protocol.h
index 80927150..7c52b47f 100644
--- a/src/hardware/norma-dmm/protocol.h
+++ b/src/hardware/norma-dmm/protocol.h
@@ -25,7 +25,7 @@
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /** @file
diff --git a/src/hardware/openbench-logic-sniffer/protocol.h b/src/hardware/openbench-logic-sniffer/protocol.h
index 6e5d61fe..1e6cd69d 100644
--- a/src/hardware/openbench-logic-sniffer/protocol.h
+++ b/src/hardware/openbench-logic-sniffer/protocol.h
@@ -23,7 +23,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "ols"
diff --git a/src/hardware/pipistrello-ols/protocol.h b/src/hardware/pipistrello-ols/protocol.h
index 4923835a..c2bd2ccb 100644
--- a/src/hardware/pipistrello-ols/protocol.h
+++ b/src/hardware/pipistrello-ols/protocol.h
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <glib.h>
 #include <ftdi.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "p-ols"
diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c
index 3febe605..8075a2e8 100644
--- a/src/hardware/rigol-ds/api.c
+++ b/src/hardware/rigol-ds/api.c
@@ -26,7 +26,7 @@
 #include <strings.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
diff --git a/src/hardware/rigol-ds/protocol.c b/src/hardware/rigol-ds/protocol.c
index 75814724..d9a53f54 100644
--- a/src/hardware/rigol-ds/protocol.c
+++ b/src/hardware/rigol-ds/protocol.c
@@ -28,7 +28,7 @@
 #include <ctype.h>
 #include <time.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
diff --git a/src/hardware/rigol-ds/protocol.h b/src/hardware/rigol-ds/protocol.h
index 62981856..5e5f01ba 100644
--- a/src/hardware/rigol-ds/protocol.h
+++ b/src/hardware/rigol-ds/protocol.h
@@ -23,7 +23,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "rigol-ds"
diff --git a/src/hardware/saleae-logic16/api.c b/src/hardware/saleae-logic16/api.c
index 7206c582..af421d3c 100644
--- a/src/hardware/saleae-logic16/api.c
+++ b/src/hardware/saleae-logic16/api.c
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
diff --git a/src/hardware/saleae-logic16/protocol.c b/src/hardware/saleae-logic16/protocol.c
index 36a688da..532320d9 100644
--- a/src/hardware/saleae-logic16/protocol.c
+++ b/src/hardware/saleae-logic16/protocol.c
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <math.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
diff --git a/src/hardware/saleae-logic16/protocol.h b/src/hardware/saleae-logic16/protocol.h
index 0cadd359..9f834164 100644
--- a/src/hardware/saleae-logic16/protocol.h
+++ b/src/hardware/saleae-logic16/protocol.h
@@ -24,7 +24,7 @@
 
 #include <stdint.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "saleae-logic16"
diff --git a/src/hardware/scpi-pps/protocol.h b/src/hardware/scpi-pps/protocol.h
index 4956e5d4..063fddc1 100644
--- a/src/hardware/scpi-pps/protocol.h
+++ b/src/hardware/scpi-pps/protocol.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi-pps"
diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c
index c71dd075..25e7bb61 100644
--- a/src/hardware/serial-dmm/api.c
+++ b/src/hardware/serial-dmm/api.c
@@ -24,7 +24,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
diff --git a/src/hardware/serial-dmm/protocol.c b/src/hardware/serial-dmm/protocol.c
index 84b12cf0..2e092533 100644
--- a/src/hardware/serial-dmm/protocol.c
+++ b/src/hardware/serial-dmm/protocol.c
@@ -22,7 +22,7 @@
 #include <math.h>
 #include <string.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
diff --git a/src/hardware/sysclk-lwla/api.c b/src/hardware/sysclk-lwla/api.c
index f5a6d2f1..dc15bb18 100644
--- a/src/hardware/sysclk-lwla/api.c
+++ b/src/hardware/sysclk-lwla/api.c
@@ -21,7 +21,7 @@
 #include <libusb.h>
 #include <stdlib.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
diff --git a/src/hardware/sysclk-lwla/lwla.c b/src/hardware/sysclk-lwla/lwla.c
index 4cc1b656..d2f2a257 100644
--- a/src/hardware/sysclk-lwla/lwla.c
+++ b/src/hardware/sysclk-lwla/lwla.c
@@ -19,7 +19,7 @@
 
 #include <errno.h>
 #include <glib/gstdio.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 #include "lwla.h"
diff --git a/src/hardware/sysclk-lwla/lwla.h b/src/hardware/sysclk-lwla/lwla.h
index 8d72eda1..d4abea3f 100644
--- a/src/hardware/sysclk-lwla/lwla.h
+++ b/src/hardware/sysclk-lwla/lwla.h
@@ -23,7 +23,7 @@
 #include <stdint.h>
 #include <libusb.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 
 struct sr_usb_dev_inst;
 
diff --git a/src/hardware/sysclk-lwla/protocol.h b/src/hardware/sysclk-lwla/protocol.h
index d890775b..25f349d1 100644
--- a/src/hardware/sysclk-lwla/protocol.h
+++ b/src/hardware/sysclk-lwla/protocol.h
@@ -24,7 +24,7 @@
 
 #include <stdint.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "lwla.h"
 
diff --git a/src/hardware/teleinfo/api.c b/src/hardware/teleinfo/api.c
index 26f3a41a..540143e3 100644
--- a/src/hardware/teleinfo/api.c
+++ b/src/hardware/teleinfo/api.c
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
diff --git a/src/hardware/teleinfo/protocol.h b/src/hardware/teleinfo/protocol.h
index 303305e7..84a7546e 100644
--- a/src/hardware/teleinfo/protocol.h
+++ b/src/hardware/teleinfo/protocol.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "teleinfo"
diff --git a/src/hardware/testo/protocol.h b/src/hardware/testo/protocol.h
index 62607e2b..8621bc2c 100644
--- a/src/hardware/testo/protocol.h
+++ b/src/hardware/testo/protocol.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "testo"
diff --git a/src/hardware/tondaj-sl-814/api.c b/src/hardware/tondaj-sl-814/api.c
index 83312249..fceca244 100644
--- a/src/hardware/tondaj-sl-814/api.c
+++ b/src/hardware/tondaj-sl-814/api.c
@@ -20,7 +20,7 @@
 
 #include <fcntl.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
diff --git a/src/hardware/tondaj-sl-814/protocol.c b/src/hardware/tondaj-sl-814/protocol.c
index c3b06561..97ab844e 100644
--- a/src/hardware/tondaj-sl-814/protocol.c
+++ b/src/hardware/tondaj-sl-814/protocol.c
@@ -20,7 +20,7 @@
 
 #include <string.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
diff --git a/src/hardware/tondaj-sl-814/protocol.h b/src/hardware/tondaj-sl-814/protocol.h
index 027b66df..77c6ca08 100644
--- a/src/hardware/tondaj-sl-814/protocol.h
+++ b/src/hardware/tondaj-sl-814/protocol.h
@@ -22,7 +22,7 @@
 #define LIBSIGROK_HARDWARE_TONDAJ_SL_814_PROTOCOL_H
 
 #include <stdint.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "tondaj-sl-814"
diff --git a/src/hardware/uni-t-dmm/api.c b/src/hardware/uni-t-dmm/api.c
index 6f3ad6a2..a21663fc 100644
--- a/src/hardware/uni-t-dmm/api.c
+++ b/src/hardware/uni-t-dmm/api.c
@@ -20,7 +20,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
diff --git a/src/hardware/uni-t-dmm/protocol.c b/src/hardware/uni-t-dmm/protocol.c
index 7047ca86..f30b1d9b 100644
--- a/src/hardware/uni-t-dmm/protocol.c
+++ b/src/hardware/uni-t-dmm/protocol.c
@@ -20,7 +20,7 @@
 
 #include <string.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
diff --git a/src/hardware/uni-t-dmm/protocol.h b/src/hardware/uni-t-dmm/protocol.h
index 3e063664..02810b72 100644
--- a/src/hardware/uni-t-dmm/protocol.h
+++ b/src/hardware/uni-t-dmm/protocol.h
@@ -24,7 +24,7 @@
 #include <stdint.h>
 #include <glib.h>
 #include <libusb.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "uni-t-dmm"
diff --git a/src/hardware/uni-t-ut32x/protocol.h b/src/hardware/uni-t-ut32x/protocol.h
index 1a1cf1f5..4010e179 100644
--- a/src/hardware/uni-t-ut32x/protocol.h
+++ b/src/hardware/uni-t-ut32x/protocol.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "uni-t-ut32x"
diff --git a/src/hardware/victor-dmm/api.c b/src/hardware/victor-dmm/api.c
index e8230261..3970a838 100644
--- a/src/hardware/victor-dmm/api.c
+++ b/src/hardware/victor-dmm/api.c
@@ -21,7 +21,7 @@
 #include <libusb.h>
 #include <stdlib.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
diff --git a/src/hardware/victor-dmm/protocol.c b/src/hardware/victor-dmm/protocol.c
index 6f72d947..2e9392db 100644
--- a/src/hardware/victor-dmm/protocol.c
+++ b/src/hardware/victor-dmm/protocol.c
@@ -20,7 +20,7 @@
 #include <glib.h>
 #include <string.h>
 #include <math.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
diff --git a/src/hardware/victor-dmm/protocol.h b/src/hardware/victor-dmm/protocol.h
index 8f126803..38fd5241 100644
--- a/src/hardware/victor-dmm/protocol.h
+++ b/src/hardware/victor-dmm/protocol.h
@@ -21,7 +21,7 @@
 #define LIBSIGROK_HARDWARE_VICTOR_DMM_PROTOCOL_H
 
 #include <stdint.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "victor-dmm"
diff --git a/src/hardware/yokogawa-dlm/protocol.h b/src/hardware/yokogawa-dlm/protocol.h
index 24c8e278..80def3f9 100644
--- a/src/hardware/yokogawa-dlm/protocol.h
+++ b/src/hardware/yokogawa-dlm/protocol.h
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol_wrappers.h"
 
diff --git a/src/hardware/yokogawa-dlm/protocol_wrappers.h b/src/hardware/yokogawa-dlm/protocol_wrappers.h
index a88ef200..47ae40ec 100644
--- a/src/hardware/yokogawa-dlm/protocol_wrappers.h
+++ b/src/hardware/yokogawa-dlm/protocol_wrappers.h
@@ -23,7 +23,7 @@
 #include <glib.h>
 #include <stdint.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
diff --git a/src/hardware/zeroplus-logic-cube/analyzer.c b/src/hardware/zeroplus-logic-cube/analyzer.c
index 9453bd0b..6af8cfc7 100644
--- a/src/hardware/zeroplus-logic-cube/analyzer.c
+++ b/src/hardware/zeroplus-logic-cube/analyzer.c
@@ -30,7 +30,7 @@
  */
 
 #include <assert.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "analyzer.h"
 #include "gl_usb.h"
diff --git a/src/hardware/zeroplus-logic-cube/analyzer.h b/src/hardware/zeroplus-logic-cube/analyzer.h
index 9f872598..41a1eed8 100644
--- a/src/hardware/zeroplus-logic-cube/analyzer.h
+++ b/src/hardware/zeroplus-logic-cube/analyzer.h
@@ -33,7 +33,7 @@
 #define LIBSIGROK_HARDWARE_ZEROPLUS_LOGIC_CUBE_ANALYZER_H
 
 #include <libusb.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 
 #define STATUS_FLAG_NONE	0x00
 #define STATUS_FLAG_RESET	0x01
diff --git a/src/hardware/zeroplus-logic-cube/gl_usb.c b/src/hardware/zeroplus-logic-cube/gl_usb.c
index 2443f455..812e4a76 100644
--- a/src/hardware/zeroplus-logic-cube/gl_usb.c
+++ b/src/hardware/zeroplus-logic-cube/gl_usb.c
@@ -31,7 +31,7 @@
 
 #include <stdio.h>
 #include <libusb.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "gl_usb.h"
 #include "protocol.h"
diff --git a/src/hardware/zeroplus-logic-cube/gl_usb.h b/src/hardware/zeroplus-logic-cube/gl_usb.h
index c3a33fb3..9eef7c9b 100644
--- a/src/hardware/zeroplus-logic-cube/gl_usb.h
+++ b/src/hardware/zeroplus-logic-cube/gl_usb.h
@@ -33,7 +33,7 @@
 #define LIBSIGROK_HARDWARE_ZEROPLUS_LOGIC_CUBE_GL_USB_H
 
 #include <libusb.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 
 SR_PRIV int gl_read_bulk(libusb_device_handle *devh, void *buffer,
 			 unsigned int size);
diff --git a/src/hardware/zeroplus-logic-cube/protocol.h b/src/hardware/zeroplus-logic-cube/protocol.h
index c9db53f5..4d128bed 100644
--- a/src/hardware/zeroplus-logic-cube/protocol.h
+++ b/src/hardware/zeroplus-logic-cube/protocol.h
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <glib.h>
 #include <libusb.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "analyzer.h"
 
diff --git a/src/hwdriver.c b/src/hwdriver.c
index 74d75e6a..3348b759 100644
--- a/src/hwdriver.c
+++ b/src/hwdriver.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <glib.h>
 #include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
diff --git a/src/input/binary.c b/src/input/binary.c
index d7080b0b..23b9574f 100644
--- a/src/input/binary.c
+++ b/src/input/binary.c
@@ -23,7 +23,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/time.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "input/binary"
diff --git a/src/input/chronovu_la8.c b/src/input/chronovu_la8.c
index e62d2c70..97eac150 100644
--- a/src/input/chronovu_la8.c
+++ b/src/input/chronovu_la8.c
@@ -22,7 +22,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "input/chronovu-la8"
diff --git a/src/input/csv.c b/src/input/csv.c
index f4f11f25..cc09045a 100644
--- a/src/input/csv.c
+++ b/src/input/csv.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "input/csv"
diff --git a/src/input/input.c b/src/input/input.c
index 4b36c887..8e51e3f9 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
diff --git a/src/input/vcd.c b/src/input/vcd.c
index ad0ba7f0..0ca7705a 100644
--- a/src/input/vcd.c
+++ b/src/input/vcd.c
@@ -61,7 +61,7 @@
 #include <glib.h>
 #include <stdio.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "input/vcd"
diff --git a/src/input/wav.c b/src/input/wav.c
index 4f36e8c4..f2d5db0d 100644
--- a/src/input/wav.c
+++ b/src/input/wav.c
@@ -24,7 +24,7 @@
 #include <ctype.h>
 #include <string.h>
 #include <stdint.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "input/wav"
diff --git a/src/lcr/es51919.c b/src/lcr/es51919.c
index 06d05d0f..0e8635f6 100644
--- a/src/lcr/es51919.c
+++ b/src/lcr/es51919.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "es51919"
diff --git a/src/log.c b/src/log.c
index db16c30d..4750a5be 100644
--- a/src/log.c
+++ b/src/log.c
@@ -20,7 +20,7 @@
 
 #include <stdarg.h>
 #include <stdio.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 /** @cond PRIVATE */
 #define NO_LOG_WRAPPERS
 /** @endcond */
diff --git a/src/modbus/modbus.c b/src/modbus/modbus.c
index ee018331..e91f6f5e 100644
--- a/src/modbus/modbus.c
+++ b/src/modbus/modbus.c
@@ -19,7 +19,7 @@
 
 #include <glib.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "modbus"
diff --git a/src/modbus/modbus_serial_rtu.c b/src/modbus/modbus_serial_rtu.c
index d8cb046d..b723020b 100644
--- a/src/modbus/modbus_serial_rtu.c
+++ b/src/modbus/modbus_serial_rtu.c
@@ -20,7 +20,7 @@
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "modbus_serial"
diff --git a/src/output/analog.c b/src/output/analog.c
index ff5e91f3..ed8e163e 100644
--- a/src/output/analog.c
+++ b/src/output/analog.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/analog"
diff --git a/src/output/ascii.c b/src/output/ascii.c
index e5072416..f45081f1 100644
--- a/src/output/ascii.c
+++ b/src/output/ascii.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/hex"
diff --git a/src/output/binary.c b/src/output/binary.c
index 4037d9e9..196aa475 100644
--- a/src/output/binary.c
+++ b/src/output/binary.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/binary"
diff --git a/src/output/bits.c b/src/output/bits.c
index a26424d5..eb134b4e 100644
--- a/src/output/bits.c
+++ b/src/output/bits.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/bits"
diff --git a/src/output/chronovu_la8.c b/src/output/chronovu_la8.c
index cfabf4cd..acb499d3 100644
--- a/src/output/chronovu_la8.c
+++ b/src/output/chronovu_la8.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/chronovu-la8"
diff --git a/src/output/csv.c b/src/output/csv.c
index 5f0d647c..36cf2e86 100644
--- a/src/output/csv.c
+++ b/src/output/csv.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <glib.h>
 #include "config.h" /* Needed for PACKAGE_STRING and others. */
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/csv"
diff --git a/src/output/gnuplot.c b/src/output/gnuplot.c
index fc3c15ac..111dcadf 100644
--- a/src/output/gnuplot.c
+++ b/src/output/gnuplot.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <glib.h>
 #include "config.h" /* Needed for PACKAGE_STRING and others. */
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/gnuplot"
diff --git a/src/output/hex.c b/src/output/hex.c
index a499e354..52c33a10 100644
--- a/src/output/hex.c
+++ b/src/output/hex.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/hex"
diff --git a/src/output/ols.c b/src/output/ols.c
index 1202a93e..55a8dec2 100644
--- a/src/output/ols.c
+++ b/src/output/ols.c
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/ols"
diff --git a/src/output/output.c b/src/output/output.c
index d06002e3..0a9e7f88 100644
--- a/src/output/output.c
+++ b/src/output/output.c
@@ -18,7 +18,7 @@
  */
 
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
diff --git a/src/output/srzip.c b/src/output/srzip.c
index dd493334..ae066cde 100644
--- a/src/output/srzip.c
+++ b/src/output/srzip.c
@@ -24,7 +24,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <zip.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/srzip"
diff --git a/src/output/vcd.c b/src/output/vcd.c
index 7403d575..8dd503a2 100644
--- a/src/output/vcd.c
+++ b/src/output/vcd.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <glib.h>
 #include "config.h" /* Needed for PACKAGE and others. */
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/vcd"
diff --git a/src/output/wav.c b/src/output/wav.c
index a16f45ea..c2360235 100644
--- a/src/output/wav.c
+++ b/src/output/wav.c
@@ -18,7 +18,7 @@
  */
 
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/wav"
diff --git a/src/scpi/scpi.c b/src/scpi/scpi.c
index c3ef6ff7..baf6e79f 100644
--- a/src/scpi/scpi.c
+++ b/src/scpi/scpi.c
@@ -19,7 +19,7 @@
 
 #include <glib.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi"
diff --git a/src/scpi/scpi_libgpib.c b/src/scpi/scpi_libgpib.c
index cd098e89..62d99c0a 100644
--- a/src/scpi/scpi_libgpib.c
+++ b/src/scpi/scpi_libgpib.c
@@ -19,7 +19,7 @@
 
 #include <gpib/ib.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi_gpib"
diff --git a/src/scpi/scpi_serial.c b/src/scpi/scpi_serial.c
index 68a684c2..fae623ba 100644
--- a/src/scpi/scpi_serial.c
+++ b/src/scpi/scpi_serial.c
@@ -21,7 +21,7 @@
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi_serial"
diff --git a/src/scpi/scpi_tcp.c b/src/scpi/scpi_tcp.c
index 7b3c9155..7e891dbc 100644
--- a/src/scpi/scpi_tcp.c
+++ b/src/scpi/scpi_tcp.c
@@ -32,7 +32,7 @@
 #include <netdb.h>
 #endif
 #include <errno.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi_tcp"
diff --git a/src/scpi/scpi_usbtmc_libusb.c b/src/scpi/scpi_usbtmc_libusb.c
index c143e599..351f8158 100644
--- a/src/scpi/scpi_usbtmc_libusb.c
+++ b/src/scpi/scpi_usbtmc_libusb.c
@@ -18,7 +18,7 @@
  */
 
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi_usbtmc"
diff --git a/src/scpi/scpi_visa.c b/src/scpi/scpi_visa.c
index 34ac9455..4b905666 100644
--- a/src/scpi/scpi_visa.c
+++ b/src/scpi/scpi_visa.c
@@ -19,7 +19,7 @@
 
 #include <visa.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi_visa"
diff --git a/src/scpi/scpi_vxi.c b/src/scpi/scpi_vxi.c
index e7e48d62..2526b487 100644
--- a/src/scpi/scpi_vxi.c
+++ b/src/scpi/scpi_vxi.c
@@ -23,7 +23,7 @@
 #include <rpc/rpc.h>
 #include <string.h>
 #include "vxi.h"
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi_vxi"
diff --git a/src/serial.c b/src/serial.c
index 959413b6..d3cacba9 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <libserialport.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
diff --git a/src/session.c b/src/session.c
index a3f6a86d..2ab3f7eb 100644
--- a/src/session.c
+++ b/src/session.c
@@ -22,7 +22,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
diff --git a/src/session_driver.c b/src/session_driver.c
index 91c05404..72011d2f 100644
--- a/src/session_driver.c
+++ b/src/session_driver.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include <zip.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "virtual-session"
diff --git a/src/session_file.c b/src/session_file.c
index 9a1e316e..e0c544bf 100644
--- a/src/session_file.c
+++ b/src/session_file.c
@@ -27,7 +27,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include "config.h" /* Needed for PACKAGE_VERSION and others. */
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
diff --git a/src/soft-trigger.c b/src/soft-trigger.c
index 9c3963d3..116e7b34 100644
--- a/src/soft-trigger.c
+++ b/src/soft-trigger.c
@@ -18,7 +18,7 @@
  */
 
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /* @cond PRIVATE */
diff --git a/src/std.c b/src/std.c
index 5b97f66a..b9757381 100644
--- a/src/std.c
+++ b/src/std.c
@@ -24,7 +24,7 @@
   */
 
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "std"
diff --git a/src/strutil.c b/src/strutil.c
index ae2b7dd3..bb5913f3 100644
--- a/src/strutil.c
+++ b/src/strutil.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <strings.h>
 #include <errno.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
diff --git a/src/transform/invert.c b/src/transform/invert.c
index 9f4dcea8..5a64afac 100644
--- a/src/transform/invert.c
+++ b/src/transform/invert.c
@@ -19,7 +19,7 @@
  */
 
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "transform/invert"
diff --git a/src/transform/nop.c b/src/transform/nop.c
index 8de2f2d7..56251bd1 100644
--- a/src/transform/nop.c
+++ b/src/transform/nop.c
@@ -19,7 +19,7 @@
  */
 
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "transform/nop"
diff --git a/src/transform/scale.c b/src/transform/scale.c
index 6d3769b3..5b9c99c5 100644
--- a/src/transform/scale.c
+++ b/src/transform/scale.c
@@ -19,7 +19,7 @@
  */
 
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "transform/scale"
diff --git a/src/transform/transform.c b/src/transform/transform.c
index 9e585a09..b518088b 100644
--- a/src/transform/transform.c
+++ b/src/transform/transform.c
@@ -19,7 +19,7 @@
  */
 
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
diff --git a/src/trigger.c b/src/trigger.c
index 974b431c..34474982 100644
--- a/src/trigger.c
+++ b/src/trigger.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /* * @cond PRIVATE */
diff --git a/src/usb.c b/src/usb.c
index b0ea618c..7fe1eff6 100644
--- a/src/usb.c
+++ b/src/usb.c
@@ -23,7 +23,7 @@
 #include <memory.h>
 #include <glib.h>
 #include <libusb.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /* SR_CONF_CONN takes one of these: */
diff --git a/src/version.c b/src/version.c
index 3da0c173..10bd726d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 
 /**
  * @file