12 files changed, 27 insertions, 22 deletions
diff --git a/src/plugins/api.h b/src/plugins/api.h
index 126facb5..db1417cf 100644
--- a/src/plugins/api.h
+++ b/src/plugins/api.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef API_H
-#define API_H
+#ifndef PLUGINS_API_H
+#define PLUGINS_API_H
 
 #include "plugins/callbacks.h"
 
diff --git a/src/plugins/autocompleters.h b/src/plugins/autocompleters.h
index 08b06962..15580514 100644
--- a/src/plugins/autocompleters.h
+++ b/src/plugins/autocompleters.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef AUTOCOMPLETERS_H
-#define AUTOCOMPLETERS_H
+#ifndef PLUGINS_AUTOCOMPLETERS_H
+#define PLUGINS_AUTOCOMPLETERS_H
 
 #include <glib.h>
 
diff --git a/src/plugins/c_api.h b/src/plugins/c_api.h
index 2f541e2f..40281fcf 100644
--- a/src/plugins/c_api.h
+++ b/src/plugins/c_api.h
@@ -32,6 +32,9 @@
  *
  */
 
+#ifndef PLUGINS_C_API_H
+#define PLUGINS_C_API_H
+
 #include <glib.h>
 
 void c_api_init(void);
@@ -39,3 +42,5 @@ void c_api_init(void);
 void c_command_callback(PluginCommand *command, gchar **args);
 void c_timed_callback(PluginTimedFunction *timed_function);
 void c_window_callback(PluginWindowCallback *window_callback, char *tag, char *line);
+
+#endif
diff --git a/src/plugins/c_plugins.h b/src/plugins/c_plugins.h
index a042fbc1..80c3ffe7 100644
--- a/src/plugins/c_plugins.h
+++ b/src/plugins/c_plugins.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef C_PLUGINS_H
-#define C_PLUGINS_H
+#ifndef PLUGINS_C_PLUGINS_H
+#define PLUGINS_C_PLUGINS_H
 
 #include "plugins/plugins.h"
 
diff --git a/src/plugins/callbacks.h b/src/plugins/callbacks.h
index 8620e47b..4fea2151 100644
--- a/src/plugins/callbacks.h
+++ b/src/plugins/callbacks.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef CALLBACKS_H
-#define CALLBACKS_H
+#ifndef PLUGINS_CALLBACKS_H
+#define PLUGINS_CALLBACKS_H
 
 #include <glib.h>
 
diff --git a/src/plugins/disco.h b/src/plugins/disco.h
index 2f7799ab..0fb3f628 100644
--- a/src/plugins/disco.h
+++ b/src/plugins/disco.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef DISCO_H
-#define DISCO_H
+#ifndef PLUGINS_DISCO_H
+#define PLUGINS_DISCO_H
 
 void disco_add_feature(char *feature);
 GList* disco_get_features(void);
diff --git a/src/plugins/plugins.h b/src/plugins/plugins.h
index c5cc56c2..4a324a5f 100644
--- a/src/plugins/plugins.h
+++ b/src/plugins/plugins.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef PLUGINS_H
-#define PLUGINS_H
+#ifndef PLUGINS_PLUGINS_H
+#define PLUGINS_PLUGINS_H
 
 #include "command/cmd_defs.h"
 
diff --git a/src/plugins/profapi.h b/src/plugins/profapi.h
index cde726f7..1e2e8b01 100644
--- a/src/plugins/profapi.h
+++ b/src/plugins/profapi.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef PROF_API_H
-#define PROF_API_H
+#ifndef PLUGINS_PROF_API_H
+#define PLUGINS_PROF_API_H
 
 #define prof_register_command(command_name, min_args, max_args, synopsis, description, arguments, examples, callback) _prof_register_command(__FILE__, command_name, min_args, max_args, synopsis, description, arguments, examples, callback)
 #define prof_register_timed(callback, interval_seconds) _prof_register_timed(__FILE__, callback, interval_seconds)
diff --git a/src/plugins/python_api.h b/src/plugins/python_api.h
index 27c17a3d..335821d0 100644
--- a/src/plugins/python_api.h
+++ b/src/plugins/python_api.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef PYTHON_API_H
-#define PYTHON_API_H
+#ifndef PLUGINS_PYTHON_API_H
+#define PLUGINS_PYTHON_API_H
 
 void python_env_init(void);
 void python_init_prof(void);
diff --git a/src/plugins/python_plugins.h b/src/plugins/python_plugins.h
index dda73405..f0ac48a5 100644
--- a/src/plugins/python_plugins.h
+++ b/src/plugins/python_plugins.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef PYTHON_PLUGINS_H
-#define PYTHON_PLUGINS_H
+#ifndef PLUGINS_PYTHON_PLUGINS_H
+#define PLUGINS_PYTHON_PLUGINS_H
 
 #include "plugins/plugins.h"
 
diff --git a/src/plugins/settings.h b/src/plugins/settings.h
index 2c91b0c9..09913243 100644
--- a/src/plugins/settings.h
+++ b/src/plugins/settings.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef PLUGIN_SETTINGS_H
-#define PLUGIN_SETTINGS_H
+#ifndef PLUGINS_SETTINGS_H
+#define PLUGINS_SETTINGS_H
 
 void plugin_settings_init(void);
 void plugin_settings_close(void);
diff --git a/src/plugins/themes.h b/src/plugins/themes.h
index 9c3c4a8c..398eb9e3 100644
--- a/src/plugins/themes.h
+++ b/src/plugins/themes.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef PLUGIN_THEMES_H
-#define PLUGIN_THEMES_H
+#ifndef PLUGINS_THEMES_H
+#define PLUGINS_THEMES_H
 
 void plugin_themes_init(void);
 void plugin_themes_close(void);