7 files changed, 20 insertions, 10 deletions
diff --git a/src/config/account.h b/src/config/account.h
index e268d77d..09166752 100644
--- a/src/config/account.h
+++ b/src/config/account.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef ACCOUNT_H
-#define ACCOUNT_H
+#ifndef CONFIG_ACCOUNT_H
+#define CONFIG_ACCOUNT_H
 
 #include "common.h"
 
diff --git a/src/config/accounts.h b/src/config/accounts.h
index 4bc8fc14..7524c65e 100644
--- a/src/config/accounts.h
+++ b/src/config/accounts.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef ACCOUNTS_H
-#define ACCOUNTS_H
+#ifndef CONFIG_ACCOUNTS_H
+#define CONFIG_ACCOUNTS_H
 
 #define MAX_PASSWORD_SIZE 64
 
diff --git a/src/config/conflists.h b/src/config/conflists.h
index d1f3f211..5fb280e1 100644
--- a/src/config/conflists.h
+++ b/src/config/conflists.h
@@ -32,9 +32,14 @@
  *
  */
 
+#ifndef CONFIG_CONFLISTS_H
+#define CONFIG_CONFLISTS_H
+
 #include <glib.h>
 
 gboolean conf_string_list_add(GKeyFile *keyfile, const char *const group, const char *const key,
     const char *const item);
 gboolean conf_string_list_remove(GKeyFile *keyfile, const char *const group, const char *const key,
     const char *const item);
+
+#endif
diff --git a/src/config/preferences.h b/src/config/preferences.h
index 5174d076..621b1760 100644
--- a/src/config/preferences.h
+++ b/src/config/preferences.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef PREFERENCES_H
-#define PREFERENCES_H
+#ifndef CONFIG_PREFERENCES_H
+#define CONFIG_PREFERENCES_H
 
 #include "config.h"
 
diff --git a/src/config/scripts.h b/src/config/scripts.h
index de4bde69..aa2ba3d7 100644
--- a/src/config/scripts.h
+++ b/src/config/scripts.h
@@ -32,9 +32,14 @@
  *
  */
 
+#ifndef CONFIG_SCRIPTS_H
+#define CONFIG_SCRIPTS_H
+
 #include <glib.h>
 
 void scripts_init(void);
 GSList* scripts_list(void);
 GSList* scripts_read(const char *const script);
 gboolean scripts_exec(const char *const script);
+
+#endif
diff --git a/src/config/theme.h b/src/config/theme.h
index 20868ffc..c8e740b2 100644
--- a/src/config/theme.h
+++ b/src/config/theme.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef THEME_H
-#define THEME_H
+#ifndef CONFIG_THEME_H
+#define CONFIG_THEME_H
 
 #include "config.h"
 
diff --git a/src/config/tlscerts.h b/src/config/tlscerts.h
index 8e9bdfa4..0001fc28 100644
--- a/src/config/tlscerts.h
+++ b/src/config/tlscerts.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef TLSCERTS_H
-#define TLSCERTS_H
+#ifndef CONFIG_TLSCERTS_H
+#define CONFIG_TLSCERTS_H
 
 typedef struct tls_cert_t {
     int version;