diff --git a/hardware/asix-sigma/asix-sigma.h b/hardware/asix-sigma/asix-sigma.h
index 9e35805a..fbecb80f 100644
--- a/hardware/asix-sigma/asix-sigma.h
+++ b/hardware/asix-sigma/asix-sigma.h
@@ -19,8 +19,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGROK_ASIX_SIGMA_H
-#define SIGROK_ASIX_SIGMA_H
+#ifndef LIBSIGROK_HARDWARE_ASIX_SIGMA_ASIX_SIGMA_H
+#define LIBSIGROK_HARDWARE_ASIX_SIGMA_ASIX_SIGMA_H
 
 enum sigma_write_register {
 	WRITE_CLOCK_SELECT	= 0,
diff --git a/hardware/link-mso19/link-mso19.h b/hardware/link-mso19/link-mso19.h
index 47a9af28..02a42e52 100644
--- a/hardware/link-mso19/link-mso19.h
+++ b/hardware/link-mso19/link-mso19.h
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGROK_LINK_MSO19_H
-#define SIGROK_LINK_MSO19_H
+#ifndef LIBSIGROK_HARDWARE_LINK_MSO19_LINK_MSO19_H
+#define LIBSIGROK_HARDWARE_LINK_MSO19_LINK_MSO19_H
 
 /* Structure for the pattern generator state */
 struct mso_patgen {
diff --git a/hardware/openbench-logic-sniffer/ols.h b/hardware/openbench-logic-sniffer/ols.h
index a554ae8c..0b1a6136 100644
--- a/hardware/openbench-logic-sniffer/ols.h
+++ b/hardware/openbench-logic-sniffer/ols.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef OLS_H_
-#define OLS_H_
+#ifndef LIBSIGROK_HARDWARE_OPENBENCH_LOGIC_SNIFFER_OLS_H
+#define LIBSIGROK_HARDWARE_OPENBENCH_LOGIC_SNIFFER_OLS_H
 
 #define NUM_PROBES             32
 #define NUM_TRIGGER_STAGES     4
@@ -91,4 +91,4 @@ struct ols_device {
 	struct sr_serial_device_instance *serial;
 };
 
-#endif /* OLS_H_ */
+#endif
diff --git a/hardware/saleae-logic/saleae-logic.h b/hardware/saleae-logic/saleae-logic.h
index d07d033a..bb870019 100644
--- a/hardware/saleae-logic/saleae-logic.h
+++ b/hardware/saleae-logic/saleae-logic.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SALEAE_LOGIC_H_
-#define SALEAE_LOGIC_H_
+#ifndef LIBSIGROK_HARDWARE_SALEAE_LOGIC_SALEAE_LOGIC_H
+#define LIBSIGROK_HARDWARE_SALEAE_LOGIC_SALEAE_LOGIC_H
 
 #define USB_INTERFACE          0
 #define USB_CONFIGURATION      1
@@ -74,4 +74,4 @@ struct fx2_device {
 	struct sr_usb_device_instance *usb;
 };
 
-#endif /* SALEAE_LOGIC_H_ */
+#endif
diff --git a/hardware/zeroplus-logic-cube/analyzer.h b/hardware/zeroplus-logic-cube/analyzer.h
index 94164784..27722af7 100644
--- a/hardware/zeroplus-logic-cube/analyzer.h
+++ b/hardware/zeroplus-logic-cube/analyzer.h
@@ -29,8 +29,8 @@
  *  THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SIGROK_ZEROPLUS_ANALYZER_H
-#define SIGROK_ZEROPLUS_ANALYZER_H
+#ifndef LIBSIGROK_HARDWARE_ZEROPLUS_LOGIC_CUBE_ANALYZER_H
+#define LIBSIGROK_HARDWARE_ZEROPLUS_LOGIC_CUBE_ANALYZER_H
 
 #include <libusb.h>
 #include "sigrok.h"
diff --git a/hardware/zeroplus-logic-cube/gl_usb.h b/hardware/zeroplus-logic-cube/gl_usb.h
index a5ae0113..04a5163d 100644
--- a/hardware/zeroplus-logic-cube/gl_usb.h
+++ b/hardware/zeroplus-logic-cube/gl_usb.h
@@ -29,8 +29,8 @@
  *  THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SIGROK_ZEROPLUS_GL_H
-#define SIGROK_ZEROPLUS_GL_H
+#ifndef LIBSIGROK_HARDWARE_ZEROPLUS_LOGIC_CUBE_GL_USB_H
+#define LIBSIGROK_HARDWARE_ZEROPLUS_LOGIC_CUBE_GL_USB_H
 
 #include <libusb.h>
 #include "sigrok.h"
diff --git a/output/text/text.h b/output/text/text.h
index c166d853..9d5abd53 100644
--- a/output/text/text.h
+++ b/output/text/text.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TEXT_H_
-#define TEXT_H_
+#ifndef LIBSIGROK_OUTPUT_TEXT_TEXT_H
+#define LIBSIGROK_OUTPUT_TEXT_TEXT_H
 
 #define DEFAULT_BPL_BITS 64
 #define DEFAULT_BPL_HEX  192
diff --git a/sigrok-internal.h b/sigrok-internal.h
index b5aea17b..63b45a30 100644
--- a/sigrok-internal.h
+++ b/sigrok-internal.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGROK_SIGROK_INTERNAL_H
-#define SIGROK_SIGROK_INTERNAL_H
+#ifndef LIBSIGROK_SIGROK_INTERNAL_H
+#define LIBSIGROK_SIGROK_INTERNAL_H
 
 #include <stdarg.h>
 #include <glib.h>
diff --git a/sigrok-proto.h b/sigrok-proto.h
index 5b883043..3e91a3fa 100644
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGROK_SIGROK_PROTO_H
-#define SIGROK_SIGROK_PROTO_H
+#ifndef LIBSIGROK_SIGROK_PROTO_H
+#define LIBSIGROK_SIGROK_PROTO_H
 
 /*--- backend.c -------------------------------------------------------------*/
 
diff --git a/sigrok.h.in b/sigrok.h.in
index 0a18f8d1..a767dc71 100644
--- a/sigrok.h.in
+++ b/sigrok.h.in
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGROK_SIGROK_H
-#define SIGROK_SIGROK_H
+#ifndef LIBSIGROK_SIGROK_H
+#define LIBSIGROK_SIGROK_H
 
 #include <stdio.h>
 #include <sys/time.h>