diff --git a/hardware/asix-sigma/asix-sigma.h b/hardware/asix-sigma/asix-sigma.h
index 9af08184..78875b11 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 ASIX_SIGMA_H
-#define ASIX_SIGMA_H
+#ifndef SIGROK_ASIX_SIGMA_H
+#define SIGROK_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 e7abee03..dddcd852 100644
--- a/hardware/link-mso19/link-mso19.h
+++ b/hardware/link-mso19/link-mso19.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LINK_MSO19_H
-#define LINK_MSO19_H
+#ifndef SIGROK_LINK_MSO19_H
+#define SIGROK_LINK_MSO19_H
 
 /* our private per-instance data */
 struct mso {
diff --git a/hardware/zeroplus-logic-cube/analyzer.h b/hardware/zeroplus-logic-cube/analyzer.h
index 81176bd0..9865a2ed 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 ANALYZER_H__
-#define ANALYZER_H__
+#ifndef SIGROK_ZEROPLUS_ANALYZER_H
+#define SIGROK_ZEROPLUS_ANALYZER_H
 
 #include <libusb.h>
 
diff --git a/hardware/zeroplus-logic-cube/gl_usb.h b/hardware/zeroplus-logic-cube/gl_usb.h
index a18b9991..921dae8e 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 GL_H__
-#define GL_G__
+#ifndef SIGROK_ZEROPLUS_GL_H
+#define SIGROK_ZEROPLUS_GL_H
 
 #include <libusb.h>
 
diff --git a/sigrok-proto.h b/sigrok-proto.h
index ed06bd0f..37d867ed 100644
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -17,9 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-#ifndef SIGROK_PROTO_H_
-#define SIGROK_PROTO_H_
+#ifndef SIGROK_SIGROK_PROTO_H
+#define SIGROK_SIGROK_PROTO_H
 
 int filter_probes(int in_unitsize, int out_unitsize, int *probelist,
 		  char *data_in, uint64_t length_in, char **data_out,
@@ -28,7 +27,6 @@ int filter_probes(int in_unitsize, int out_unitsize, int *probelist,
 char *sigrok_samplerate_string(uint64_t samplerate);
 char *sigrok_period_string(uint64_t frequency);
 
-
 /*--- backend.c -------------------------------------------------------------*/
 
 int sigrok_init(void);
@@ -146,5 +144,4 @@ int datastore_destroy(struct datastore *ds);
 void datastore_put(struct datastore *ds, void *data, unsigned int length,
 		   int in_unitsize, int *probelist);
 
-
-#endif /* SIGROK_PROTO_H_ */
+#endif
diff --git a/sigrok.h b/sigrok.h
index 1b4552ca..26bf9fcc 100644
--- a/sigrok.h
+++ b/sigrok.h
@@ -347,4 +347,5 @@ struct session {
 };
 
 #include "sigrok-proto.h"
+
 #endif