diff --git a/agent/qrexec-agent.c b/agent/qrexec-agent.c
index ec42d201..c7b2bf77 100644
--- a/agent/qrexec-agent.c
+++ b/agent/qrexec-agent.c
@@ -47,7 +47,7 @@
 #include "libqrexec-utils.h"
 #include "qrexec-agent.h"
 
-struct _connection_info {
+struct connection_info {
     int pid; /* pid of child process handling the data */
     int fd;  /* socket to the process handling the data (wait for EOF here) */
     int connect_domain;
@@ -56,7 +56,7 @@ struct _connection_info {
 
 /* structure describing a single request waiting for qubes.WaitForSession to
  * finish */
-struct _waiting_request {
+struct waiting_request {
     int type;
     int connect_domain;
     int connect_port;
@@ -65,9 +65,9 @@ struct _waiting_request {
 };
 
 /*  */
-static struct _connection_info connection_info[MAX_FDS];
+static struct connection_info connection_info[MAX_FDS];
 
-static struct _waiting_request requests_waiting_for_session[MAX_FDS];
+static struct waiting_request requests_waiting_for_session[MAX_FDS];
 
 static libvchan_t *ctrl_vchan;
 
diff --git a/libqrexec/libqrexec-utils.h b/libqrexec/libqrexec-utils.h
index d21225c6..795c9cb8 100644
--- a/libqrexec/libqrexec-utils.h
+++ b/libqrexec/libqrexec-utils.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef _LIBQREXEC_UTILS_H
-#define _LIBQREXEC_UTILS_H
+#ifndef LIBQREXEC_UTILS_H
+#define LIBQREXEC_UTILS_H
 
 #define _POSIX_C_SOURCE 200809L
 #define _GNU_SOURCE 1
@@ -279,4 +279,4 @@ void qrexec_log(int level, int errnoval, const char *file, int line,
 
 void setup_logging(const char *program_name);
 
-#endif /* _LIBQREXEC_UTILS_H */
+#endif /* LIBQREXEC_UTILS_H */
diff --git a/libqrexec/qrexec.h b/libqrexec/qrexec.h
index 3cce2bdc..a466c006 100644
--- a/libqrexec/qrexec.h
+++ b/libqrexec/qrexec.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef _QREXEC_H
-#define _QREXEC_H
+#ifndef QREXEC_H
+#define QREXEC_H
 
 /* For information on qrexec, see:
  * - https://www.qubes-os.org/doc/qrexec/
@@ -173,4 +173,4 @@ enum {
 // support only very small configuration files,
 #define MAX_CONFIG_SIZE 4096
 
-#endif /* _QREXEC_H */
+#endif /* QREXEC_H */