Merge ~mitya57/compiz:lp1882792 into compiz:master

[Dmitry Shachnev]

Add support for CMake Unity builds (aka Jumbo builds).

The first commit adds #ifndef guards to all header files that did not have them (and fixes the existing guard in one more file). This was done semi-automatically.

The second commit sets SKIP_UNITY_BUILD_INCLUSION property on some files that have conflicting function/enums declarations or similar problems.

These two commits together fix CMake Unity builds (LP: #1882792).

[Alberts Muktupāvels (muktupavels)]

I would prefer separate commit for include guard fix.

SKIP_UNITY_BUILD_INCLUSION sounds like workaround. Can it be fixed so this is not needed?

[Dmitry Shachnev (mitya57)]

> Can it be fixed so this is not needed?

I will try in a few days, when I have more time.

[Dmitry Shachnev (mitya57)]

Alberts: I removed all uses of SKIP_UNITY_BUILD_INCLUSION except two:

- outputdevices_x11.cpp had some strange linker errors when using Unity build, see the commit message.
- gsettings_util.c, that file redefined CCS_LOG_DOMAIN so it needed to be built separately in order for log functions to work.

[Alberts Muktupāvels (muktupavels)]

review: Approve

diff --git a/compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt b/compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt
index 009f448..3e65f01 100644
--- a/compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt
+++ b/compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt
@@ -68,4 +68,10 @@ if (GSETTINGS_UTIL_FOUND)
     install (TARGETS compizconfig_gsettings_backend
              DESTINATION ${libdir})
 
+    set_source_files_properties (
+        gsettings_util.c
+        PROPERTIES
+        SKIP_UNITY_BUILD_INCLUSION ON
+    )
+
 endif (GSETTINGS_UTIL_FOUND)
diff --git a/compizconfig/libcompizconfig/src/ccs-private.h b/compizconfig/libcompizconfig/src/ccs-private.h
index f3caf7b..a6ccc00 100644
--- a/compizconfig/libcompizconfig/src/ccs-private.h
+++ b/compizconfig/libcompizconfig/src/ccs-private.h
@@ -20,7 +20,7 @@
  */
 
 #ifndef CCS_PRIVATE_H
-#define CSS_PRIVATE_H
+#define CCS_PRIVATE_H
 
 #include <ccs-defs.h>
 
diff --git a/compizconfig/libcompizconfig/src/ccs_backend_loader.c b/compizconfig/libcompizconfig/src/ccs_backend_loader.c
index 0960ea7..9798e4e 100644
--- a/compizconfig/libcompizconfig/src/ccs_backend_loader.c
+++ b/compizconfig/libcompizconfig/src/ccs_backend_loader.c
@@ -210,7 +210,7 @@ allocateLoader (CCSObjectAllocationInterface *ai)
 }
 
 static CCSShraedLibBackendLoaderPrivate *
-allocatePrivate (CCSBackendLoader *loader, CCSObjectAllocationInterface *ai)
+backendLoaderAllocatePrivate (CCSBackendLoader *loader, CCSObjectAllocationInterface *ai)
 {
     CCSShraedLibBackendLoaderPrivate *priv = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSShraedLibBackendLoaderPrivate));
 
@@ -231,7 +231,7 @@ ccsSharedLibBackendLoaderNew (CCSObjectAllocationInterface *ai)
     if (!loader)
 	return NULL;
 
-    CCSShraedLibBackendLoaderPrivate *priv = allocatePrivate (loader, ai);
+    CCSShraedLibBackendLoaderPrivate *priv = backendLoaderAllocatePrivate (loader, ai);
 
     if (!priv)
 	return NULL;
diff --git a/compizconfig/libcompizconfig/src/ccs_config_file.c b/compizconfig/libcompizconfig/src/ccs_config_file.c
index 9a98c5b..9a3cc65 100644
--- a/compizconfig/libcompizconfig/src/ccs_config_file.c
+++ b/compizconfig/libcompizconfig/src/ccs_config_file.c
@@ -394,7 +394,7 @@ allocateConfigFile (CCSObjectAllocationInterface *ai)
 }
 
 static CCSIniConfigFilePrivate *
-allocatePrivate (CCSConfigFile *config, CCSObjectAllocationInterface *ai)
+configFileAllocatePrivate (CCSConfigFile *config, CCSObjectAllocationInterface *ai)
 {
     CCSIniConfigFilePrivate *priv = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSIniConfigFilePrivate));
 
@@ -415,7 +415,7 @@ ccsInternalConfigFileNew (CCSObjectAllocationInterface *ai)
     if (!loader)
 	return NULL;
 
-    CCSIniConfigFilePrivate *priv = allocatePrivate (loader, ai);
+    CCSIniConfigFilePrivate *priv = configFileAllocatePrivate (loader, ai);
 
     if (!priv)
 	return NULL;
diff --git a/compizconfig/mocks/libcompizconfig/compizconfig_ccs_plugin_mock.h b/compizconfig/mocks/libcompizconfig/compizconfig_ccs_plugin_mock.h
index 0c6cc7c..e37b37e 100644
--- a/compizconfig/mocks/libcompizconfig/compizconfig_ccs_plugin_mock.h
+++ b/compizconfig/mocks/libcompizconfig/compizconfig_ccs_plugin_mock.h
@@ -1,3 +1,6 @@
+#ifndef _COMPIZCONFIG_MOCKS_LIBCOMPIZCONFIG_COMPIZCONFIG_CCS_PLUGIN_MOCK_H
+#define _COMPIZCONFIG_MOCKS_LIBCOMPIZCONFIG_COMPIZCONFIG_CCS_PLUGIN_MOCK_H
+
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
@@ -182,3 +185,5 @@ class CCSPluginGMock :
 };
 
 extern CCSPluginInterface CCSPluginGMockInterface;
+
+#endif /* _COMPIZCONFIG_MOCKS_LIBCOMPIZCONFIG_COMPIZCONFIG_CCS_PLUGIN_MOCK_H */
diff --git a/gtk/window-decorator/decorator.c b/gtk/window-decorator/decorator.c
index 3c56880..8f4dc9e 100644
--- a/gtk/window-decorator/decorator.c
+++ b/gtk/window-decorator/decorator.c
@@ -32,7 +32,7 @@
 #endif
 
 static void
-draw_window_decoration (decor_t *decor)
+decorator_draw_window_decoration (decor_t *decor)
 {
     gwd_theme_draw_window_decoration (gwd_theme, decor);
 }
@@ -648,7 +648,7 @@ draw_border_shape (Display	   *xdisplay,
     d.width   = width;
     d.height  = height;
     d.active  = TRUE;
-    d.draw    = draw_window_decoration;
+    d.draw    = decorator_draw_window_decoration;
     d.picture = picture;
     d.context = c;
 
@@ -1289,7 +1289,7 @@ update_default_decorations (GdkScreen *screen)
         default_frames[i].d->frame = frame;
         default_frames[i].d->active = i < WINDOW_TYPE_FRAMES_NUM ? TRUE : FALSE;
 
-        default_frames[i].d->draw = draw_window_decoration;
+        default_frames[i].d->draw = decorator_draw_window_decoration;
 	default_frames[i].d->surface = create_native_surface_and_wrap (default_frames[i].d->width,
 	                                                               default_frames[i].d->height,
 	                                                               style_window);
diff --git a/gtk/window-decorator/gwd-settings-xproperty-storage.c b/gtk/window-decorator/gwd-settings-xproperty-storage.c
index e958777..f158c25 100644
--- a/gtk/window-decorator/gwd-settings-xproperty-storage.c
+++ b/gtk/window-decorator/gwd-settings-xproperty-storage.c
@@ -37,14 +37,14 @@ struct _GWDSettingsXPropertyStorage
 
 enum
 {
-    PROP_0,
+    XPROPERTY_STORAGE_PROP_0,
 
-    PROP_SETTINGS,
+    XPROPERTY_STORAGE_PROP_SETTINGS,
 
-    LAST_PROP
+    XPROPERTY_STORAGE_LAST_PROP
 };
 
-static GParamSpec *storage_properties[LAST_PROP] = { NULL };
+static GParamSpec *storage_properties[XPROPERTY_STORAGE_LAST_PROP] = { NULL };
 
 G_DEFINE_TYPE (GWDSettingsXPropertyStorage, gwd_settings_xproperty_storage,
                G_TYPE_OBJECT)
@@ -72,7 +72,7 @@ gwd_settings_xproperty_storage_set_property (GObject      *object,
     storage = GWD_SETTINGS_XPROPERTY_STORAGE (object);
 
     switch (property_id) {
-        case PROP_SETTINGS:
+        case XPROPERTY_STORAGE_PROP_SETTINGS:
             g_return_if_fail (!storage->settings);
             storage->settings = g_value_dup_object (value);
             break;
@@ -93,13 +93,13 @@ gwd_settings_xproperty_storage_class_init (GWDSettingsXPropertyStorageClass *kla
     object_class->dispose = gwd_settings_xproperty_storage_dispose;
     object_class->set_property = gwd_settings_xproperty_storage_set_property;
 
-    storage_properties[PROP_SETTINGS] =
+    storage_properties[XPROPERTY_STORAGE_PROP_SETTINGS] =
         g_param_spec_object ("settings", "GWDSettings", "GWDSettings",
                              GWD_TYPE_SETTINGS,
                              G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE |
                              G_PARAM_STATIC_STRINGS);
 
-    g_object_class_install_properties (object_class, LAST_PROP,
+    g_object_class_install_properties (object_class, XPROPERTY_STORAGE_LAST_PROP,
                                        storage_properties);
 }
 
diff --git a/gtk/window-decorator/gwd-theme.c b/gtk/window-decorator/gwd-theme.c
index b2f5cd4..80b3a12 100644
--- a/gtk/window-decorator/gwd-theme.c
+++ b/gtk/window-decorator/gwd-theme.c
@@ -45,14 +45,14 @@ typedef struct
 
 enum
 {
-    PROP_0,
+    THEME_PROP_0,
 
-    PROP_SETTINGS,
+    THEME_PROP_SETTINGS,
 
-    LAST_PROP
+    THEME_LAST_PROP
 };
 
-static GParamSpec *properties[LAST_PROP] = { NULL };
+static GParamSpec *properties[THEME_LAST_PROP] = { NULL };
 
 G_DEFINE_TYPE_WITH_PRIVATE (GWDTheme, gwd_theme, G_TYPE_OBJECT)
 
@@ -270,7 +270,7 @@ gwd_theme_get_property (GObject    *object,
     GWDThemePrivate *priv = gwd_theme_get_instance_private (theme);
 
     switch (property_id) {
-        case PROP_SETTINGS:
+        case THEME_PROP_SETTINGS:
             g_value_set_object (value, priv->settings);
             break;
 
@@ -290,7 +290,7 @@ gwd_theme_set_property (GObject      *object,
     GWDThemePrivate *priv = gwd_theme_get_instance_private (theme);
 
     switch (property_id) {
-        case PROP_SETTINGS:
+        case THEME_PROP_SETTINGS:
             priv->settings = g_value_dup_object (value);
             break;
 
@@ -413,13 +413,13 @@ gwd_theme_class_init (GWDThemeClass *theme_class)
     theme_class->get_button_position = gwd_theme_real_get_button_position;
     theme_class->update_titlebar_font = gwd_theme_real_update_titlebar_font;
 
-    properties[PROP_SETTINGS] =
+    properties[THEME_PROP_SETTINGS] =
         g_param_spec_object ("settings", "GWDSettings", "GWDSettings",
                              GWD_TYPE_SETTINGS,
                              G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
                              G_PARAM_STATIC_STRINGS);
 
-    g_object_class_install_properties (object_class, LAST_PROP, properties);
+    g_object_class_install_properties (object_class, THEME_LAST_PROP, properties);
 }
 
 static void
diff --git a/gtk/window-decorator/wnck.c b/gtk/window-decorator/wnck.c
index 4ac1483..c91ea40 100644
--- a/gtk/window-decorator/wnck.c
+++ b/gtk/window-decorator/wnck.c
@@ -27,7 +27,7 @@
 #include "gwd-settings.h"
 
 static void
-draw_window_decoration (decor_t *decor)
+wnck_draw_window_decoration (decor_t *decor)
 {
     gwd_theme_draw_window_decoration (gwd_theme, decor);
 }
@@ -215,7 +215,7 @@ decorations_changed (WnckScreen *screen)
 	decor_t *d = g_object_get_data (G_OBJECT (windows->data), "decor");
 
         if (d->decorated)
-            d->draw = draw_window_decoration;
+            d->draw = wnck_draw_window_decoration;
 
 	update_window_decoration (WNCK_WINDOW (windows->data));
 	windows = windows->next;
@@ -685,7 +685,7 @@ window_opened (WnckScreen *screen,
 					    &d->client_width,
 					    &d->client_height);
 
-    d->draw = draw_window_decoration;
+    d->draw = wnck_draw_window_decoration;
 
     d->created = FALSE;
     d->surface = NULL;
diff --git a/include/core/modifierhandler.h b/include/core/modifierhandler.h
index 7b8161c..7ed8669 100644
--- a/include/core/modifierhandler.h
+++ b/include/core/modifierhandler.h
@@ -26,6 +26,9 @@
  *	    Sam Spilsbury <[e-mail]>
  */
 
+#ifndef _COMPIZ_CORE_MODIFIERHANDLER_H
+#define _COMPIZ_CORE_MODIFIERHANDLER_H
+
 #include <core/core.h>
 
 /**
@@ -112,3 +115,5 @@ class ModifierHandler
 	unsigned int    mIgnoredModMask;
 	XModifierKeymap *mModMap;
 };
+
+#endif /* _COMPIZ_CORE_MODIFIERHANDLER_H */
diff --git a/plugins/addhelper/src/addhelper.h b/plugins/addhelper/src/addhelper.h
index 64d8838..13520ea 100644
--- a/plugins/addhelper/src/addhelper.h
+++ b/plugins/addhelper/src/addhelper.h
@@ -26,6 +26,9 @@
  *
  */
 
+#ifndef _COMPIZ_ADDHELPER_SRC_ADDHELPER_H
+#define _COMPIZ_ADDHELPER_SRC_ADDHELPER_H
+
 #include <core/core.h>
 #include <composite/composite.h>
 #include <opengl/opengl.h>
@@ -100,3 +103,5 @@ class AddPluginVTable :
 
 #define ADD_WINDOW(w)							       \
     AddWindow *aw = AddWindow::get (w)
+
+#endif /* _COMPIZ_ADDHELPER_SRC_ADDHELPER_H */
diff --git a/plugins/animation/src/private.h b/plugins/animation/src/private.h
index 7d5ae2c..9dd63a2 100644
--- a/plugins/animation/src/private.h
+++ b/plugins/animation/src/private.h
@@ -1,3 +1,6 @@
+#ifndef _COMPIZ_ANIMATION_SRC_PRIVATE_H
+#define _COMPIZ_ANIMATION_SRC_PRIVATE_H
+
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
@@ -903,3 +906,5 @@ protected:
 		      float               foldMaxAmp);
     bool requiresTransformedWindow () const { return true; }
 };
+
+#endif /* _COMPIZ_ANIMATION_SRC_PRIVATE_H */
diff --git a/plugins/animationaddon/src/animation_tex.h b/plugins/animationaddon/src/animation_tex.h
index a34ab58..861bd6f 100644
--- a/plugins/animationaddon/src/animation_tex.h
+++ b/plugins/animationaddon/src/animation_tex.h
@@ -18,6 +18,9 @@
  *
  **/
 
+#ifndef _COMPIZ_ANIMATIONADDON_SRC_ANIMATION_TEX_H
+#define _COMPIZ_ANIMATIONADDON_SRC_ANIMATION_TEX_H
+
 const unsigned char fireTex[4097] = {
     "\0\0\0\0\377\377\377\3\377\377\377\2\377\377\377\5\377\377\377\7\377\377"
     "\377\6\377\377\377\6\377\377\377\12\377\377\377\13\377\377\377\11\377\377"
@@ -220,3 +223,5 @@ const unsigned char fireTex[4097] = {
     "\377\7\377\377\377\4\377\377\377\5\377\377\377\3\377\377\377\1\0\0\0\0\0"
     "\0\0\0"
 };
+
+#endif /* _COMPIZ_ANIMATIONADDON_SRC_ANIMATION_TEX_H */
diff --git a/plugins/animationaddon/src/private.h b/plugins/animationaddon/src/private.h
index 8fd204a..f60498b 100644
--- a/plugins/animationaddon/src/private.h
+++ b/plugins/animationaddon/src/private.h
@@ -1,3 +1,6 @@
+#ifndef _COMPIZ_ANIMATIONADDON_SRC_PRIVATE_H
+#define _COMPIZ_ANIMATIONADDON_SRC_PRIVATE_H
+
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
@@ -369,3 +372,5 @@ public:
     {
     }
 };
+
+#endif /* _COMPIZ_ANIMATIONADDON_SRC_PRIVATE_H */
diff --git a/plugins/animationjc/src/private.h b/plugins/animationjc/src/private.h
index 28e2804..ef5ce6a 100644
--- a/plugins/animationjc/src/private.h
+++ b/plugins/animationjc/src/private.h
@@ -1,3 +1,6 @@
+#ifndef _COMPIZ_ANIMATIONJC_SRC_PRIVATE_H
+#define _COMPIZ_ANIMATIONJC_SRC_PRIVATE_H
+
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
@@ -230,3 +233,5 @@ public:
     {
     }
 };
+
+#endif /* _COMPIZ_ANIMATIONJC_SRC_PRIVATE_H */
diff --git a/plugins/animationplus/src/animation_tex.h b/plugins/animationplus/src/animation_tex.h
index 7ac34f9..09ff2e4 100644
--- a/plugins/animationplus/src/animation_tex.h
+++ b/plugins/animationplus/src/animation_tex.h
@@ -18,6 +18,9 @@
  *
  **/
 
+#ifndef _COMPIZ_ANIMATIONPLUS_SRC_ANIMATION_TEX_H
+#define _COMPIZ_ANIMATIONPLUS_SRC_ANIMATION_TEX_H
+
 static const unsigned char fireTex[4097] = {
     "\0\0\0\0\377\377\377\3\377\377\377\2\377\377\377\5\377\377\377\7\377\377"
     "\377\6\377\377\377\6\377\377\377\12\377\377\377\13\377\377\377\11\377\377"
@@ -220,3 +223,5 @@ static const unsigned char fireTex[4097] = {
     "\377\7\377\377\377\4\377\377\377\5\377\377\377\3\377\377\377\1\0\0\0\0\0"
     "\0\0\0"
 };
+
+#endif /* _COMPIZ_ANIMATIONPLUS_SRC_ANIMATION_TEX_H */
diff --git a/plugins/animationplus/src/private.h b/plugins/animationplus/src/private.h
index ff52435..2b5238e 100644
--- a/plugins/animationplus/src/private.h
+++ b/plugins/animationplus/src/private.h
@@ -1,3 +1,6 @@
+#ifndef _COMPIZ_ANIMATIONPLUS_SRC_PRIVATE_H
+#define _COMPIZ_ANIMATIONPLUS_SRC_PRIVATE_H
+
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
@@ -194,3 +197,5 @@ class AnimPlusPluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_ANIMATIONPLUS_SRC_PRIVATE_H */
diff --git a/plugins/annotate/src/annotate.h b/plugins/annotate/src/annotate.h
index 273557a..e9f8c41 100644
--- a/plugins/annotate/src/annotate.h
+++ b/plugins/annotate/src/annotate.h
@@ -23,6 +23,9 @@
  * Author: David Reveman <[e-mail]>
  */
 
+#ifndef _COMPIZ_ANNOTATE_SRC_ANNOTATE_H
+#define _COMPIZ_ANNOTATE_SRC_ANNOTATE_H
+
 #include "annotate_options.h"
 #include <composite/composite.h>
 
@@ -196,3 +199,5 @@ class AnnoPluginVTable :
     public:
 	bool init ();
 };
+
+#endif /* _COMPIZ_ANNOTATE_SRC_ANNOTATE_H */
diff --git a/plugins/bench/src/bench.h b/plugins/bench/src/bench.h
index 6582577..069eb6d 100644
--- a/plugins/bench/src/bench.h
+++ b/plugins/bench/src/bench.h
@@ -23,6 +23,9 @@
  *
  **/
 
+#ifndef _COMPIZ_BENCH_SRC_BENCH_H
+#define _COMPIZ_BENCH_SRC_BENCH_H
+
 #include <core/core.h>
 #include <core/timer.h>
 #include <core/pluginclasshandler.h>
@@ -123,3 +126,4 @@ class BenchPluginVTable :
 	bool init ();
 };
 
+#endif /* _COMPIZ_BENCH_SRC_BENCH_H */
diff --git a/plugins/bench/src/bench_tex.h b/plugins/bench/src/bench_tex.h
index 0d95c65..39a3efb 100644
--- a/plugins/bench/src/bench_tex.h
+++ b/plugins/bench/src/bench_tex.h
@@ -18,6 +18,9 @@
  *
  **/
 
+#ifndef _COMPIZ_BENCH_SRC_BENCH_TEX_H
+#define _COMPIZ_BENCH_SRC_BENCH_TEX_H
+
 unsigned char number_data[10][2049] = {
   "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
   "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
@@ -21762,3 +21765,4 @@ static unsigned char image_data[512 * 256 * 4 + 1] = {
   "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
 };
 
+#endif /* _COMPIZ_BENCH_SRC_BENCH_TEX_H */
diff --git a/plugins/bicubic/src/bicubic.h b/plugins/bicubic/src/bicubic.h
index 4d7e0d5..7af74a2 100644
--- a/plugins/bicubic/src/bicubic.h
+++ b/plugins/bicubic/src/bicubic.h
@@ -24,6 +24,9 @@
  *
  */
 
+#ifndef _COMPIZ_BICUBIC_SRC_BICUBIC_H
+#define _COMPIZ_BICUBIC_SRC_BICUBIC_H
+
 #include <core/core.h>
 #include <composite/composite.h>
 #include <opengl/opengl.h>
@@ -92,3 +95,5 @@ class BicubicPluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_BICUBIC_SRC_BICUBIC_H */
diff --git a/plugins/blur/src/blur.h b/plugins/blur/src/blur.h
index 426e9f0..2df38a3 100644
--- a/plugins/blur/src/blur.h
+++ b/plugins/blur/src/blur.h
@@ -23,6 +23,9 @@
  * Author: David Reveman <[e-mail]>
  */
 
+#ifndef _COMPIZ_BLUR_SRC_BLUR_H
+#define _COMPIZ_BLUR_SRC_BLUR_H
+
 #include <iosfwd>
 #include <boost/shared_ptr.hpp>
 
@@ -261,3 +264,5 @@ class BlurPluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_BLUR_SRC_BLUR_H */
diff --git a/plugins/ccp/src/ccp.h b/plugins/ccp/src/ccp.h
index e04cae5..0d9544e 100644
--- a/plugins/ccp/src/ccp.h
+++ b/plugins/ccp/src/ccp.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#ifndef _COMPIZ_CCP_SRC_CCP_H
+#define _COMPIZ_CCP_SRC_CCP_H
+
 extern "C"
 {
 #include <string.h>
@@ -73,3 +76,5 @@ class CcpPluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_CCP_SRC_CCP_H */
diff --git a/plugins/commands/src/commands.h b/plugins/commands/src/commands.h
index f0f8bcf..4c20a21 100644
--- a/plugins/commands/src/commands.h
+++ b/plugins/commands/src/commands.h
@@ -23,6 +23,9 @@
  * Author: Danny Baumann <[e-mail]>
  */
 
+#ifndef _COMPIZ_COMMANDS_SRC_COMMANDS_H
+#define _COMPIZ_COMMANDS_SRC_COMMANDS_H
+
 #include "commands_options.h"
 
 #include "core/plugin.h"
@@ -49,3 +52,5 @@ class CommandsPluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_COMMANDS_SRC_COMMANDS_H */
diff --git a/plugins/copytex/src/copytex.h b/plugins/copytex/src/copytex.h
index 8530c5f..ed0cd5a 100644
--- a/plugins/copytex/src/copytex.h
+++ b/plugins/copytex/src/copytex.h
@@ -17,6 +17,9 @@
  *
  */
 
+#ifndef _COMPIZ_COPYTEX_SRC_COPYTEX_H
+#define _COMPIZ_COPYTEX_SRC_COPYTEX_H
+
 /*
  * This plugin uses the "copy to texture" taken from Luminocity
  * http://live.gnome.org/Luminocity
@@ -123,3 +126,5 @@ class CopytexPluginVTable :
 	bool init ();
 
 };
+
+#endif /* _COMPIZ_COPYTEX_SRC_COPYTEX_H */
diff --git a/plugins/crashhandler/src/crashhandler.h b/plugins/crashhandler/src/crashhandler.h
index c0b774f..b45525d 100644
--- a/plugins/crashhandler/src/crashhandler.h
+++ b/plugins/crashhandler/src/crashhandler.h
@@ -20,6 +20,9 @@
  *
  */
 
+#ifndef _COMPIZ_CRASHHANDLER_SRC_CRASHHANDLER_H
+#define _COMPIZ_CRASHHANDLER_SRC_CRASHHANDLER_H
+
 #include <core/core.h>
 #include <core/pluginclasshandler.h>
 #include "crashhandler_options.h"
@@ -46,3 +49,5 @@ class CrashPluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_CRASHHANDLER_SRC_CRASHHANDLER_H */
diff --git a/plugins/cubeaddon/src/cubeaddon.h b/plugins/cubeaddon/src/cubeaddon.h
index eb2e124..78b5438 100644
--- a/plugins/cubeaddon/src/cubeaddon.h
+++ b/plugins/cubeaddon/src/cubeaddon.h
@@ -23,6 +23,9 @@
  *
  */
 
+#ifndef _COMPIZ_CUBEADDON_SRC_CUBEADDON_H
+#define _COMPIZ_CUBEADDON_SRC_CUBEADDON_H
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ -189,3 +192,5 @@ class CubeaddonPluginVTable :
     public:
 	bool init ();
 };
+
+#endif /* _COMPIZ_CUBEADDON_SRC_CUBEADDON_H */
diff --git a/plugins/dbus/src/dbus.h b/plugins/dbus/src/dbus.h
index eceadb4..a70353b 100644
--- a/plugins/dbus/src/dbus.h
+++ b/plugins/dbus/src/dbus.h
@@ -26,6 +26,9 @@
  * Copyright (C) 2009 Sam Spilsbury <[e-mail]>
  */
 
+#ifndef _COMPIZ_DBUS_SRC_DBUS_H
+#define _COMPIZ_DBUS_SRC_DBUS_H
+
 #include <core/screen.h>
 #include <core/pluginclasshandler.h>
 
@@ -235,3 +238,5 @@ class DbusPluginVTable :
 
 #define DBUS_SCREEN(s)							       \
      DbusScreen *ds = DbusScreen::get (s)
+
+#endif /* _COMPIZ_DBUS_SRC_DBUS_H */
diff --git a/plugins/decor/src/decor.h b/plugins/decor/src/decor.h
index 2696c80..4f9be59 100644
--- a/plugins/decor/src/decor.h
+++ b/plugins/decor/src/decor.h
@@ -23,6 +23,9 @@
  * Author: David Reveman <[e-mail]>
  */
 
+#ifndef _COMPIZ_DECOR_SRC_DECOR_H
+#define _COMPIZ_DECOR_SRC_DECOR_H
+
 #include <boost/shared_ptr.hpp>
 #include <boost/shared_array.hpp>
 #include <boost/make_shared.hpp>
@@ -401,3 +404,4 @@ class DecorPluginVTable :
 	bool init ();
 };
 
+#endif /* _COMPIZ_DECOR_SRC_DECOR_H */
diff --git a/plugins/expo/src/expo.h b/plugins/expo/src/expo.h
index 9c337e8..86c9740 100644
--- a/plugins/expo/src/expo.h
+++ b/plugins/expo/src/expo.h
@@ -23,6 +23,9 @@
  *
  **/
 
+#ifndef _COMPIZ_EXPO_SRC_EXPO_H
+#define _COMPIZ_EXPO_SRC_EXPO_H
+
 #include <core/core.h>
 #include <core/pluginclasshandler.h>
 
@@ -219,3 +222,5 @@ class ExpoPluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_EXPO_SRC_EXPO_H */
diff --git a/plugins/extrawm/src/extrawm.h b/plugins/extrawm/src/extrawm.h
index fa02ddd..5e7e5f6 100644
--- a/plugins/extrawm/src/extrawm.h
+++ b/plugins/extrawm/src/extrawm.h
@@ -19,6 +19,9 @@
  *
  */
 
+#ifndef _COMPIZ_EXTRAWM_SRC_EXTRAWM_H
+#define _COMPIZ_EXTRAWM_SRC_EXTRAWM_H
+
 #include <X11/Xatom.h>
 
 #include <core/core.h>
@@ -114,3 +117,5 @@ class ExtraWMPluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_EXTRAWM_SRC_EXTRAWM_H */
diff --git a/plugins/ezoom/src/ezoom.h b/plugins/ezoom/src/ezoom.h
index ff79c04..910dde0 100755
--- a/plugins/ezoom/src/ezoom.h
+++ b/plugins/ezoom/src/ezoom.h
@@ -39,6 +39,9 @@
  *
  */
 
+#ifndef _COMPIZ_EZOOM_SRC_EZOOM_H
+#define _COMPIZ_EZOOM_SRC_EZOOM_H
+
 #include <core/core.h>
 #include <composite/composite.h>
 #include <opengl/opengl.h>
@@ -401,3 +404,5 @@ class ZoomPluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_EZOOM_SRC_EZOOM_H */
diff --git a/plugins/fade/src/fade.h b/plugins/fade/src/fade.h
index 9cd43af..1635b9d 100644
--- a/plugins/fade/src/fade.h
+++ b/plugins/fade/src/fade.h
@@ -23,6 +23,9 @@
  * Author: David Reveman <[e-mail]>
  */
 
+#ifndef _COMPIZ_FADE_SRC_FADE_H
+#define _COMPIZ_FADE_SRC_FADE_H
+
 #include <core/window.h>
 #include <core/pluginclasshandler.h>
 #include <composite/composite.h>
@@ -117,3 +120,5 @@ class FadePluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_FADE_SRC_FADE_H */
diff --git a/plugins/fadedesktop/src/fadedesktop.h b/plugins/fadedesktop/src/fadedesktop.h
index 13df35b..4c65f1e 100644
--- a/plugins/fadedesktop/src/fadedesktop.h
+++ b/plugins/fadedesktop/src/fadedesktop.h
@@ -19,6 +19,9 @@
  *
  **/
 
+#ifndef _COMPIZ_FADEDESKTOP_SRC_FADEDESKTOP_H
+#define _COMPIZ_FADEDESKTOP_SRC_FADEDESKTOP_H
+
 #include <core/core.h>
 #include <core/pluginclasshandler.h>
 
@@ -100,3 +103,5 @@ class FadedesktopPluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_FADEDESKTOP_SRC_FADEDESKTOP_H */
diff --git a/plugins/firepaint/src/firepaint.h b/plugins/firepaint/src/firepaint.h
index 22db853..6092bfe 100644
--- a/plugins/firepaint/src/firepaint.h
+++ b/plugins/firepaint/src/firepaint.h
@@ -23,6 +23,9 @@
  *
  */
 
+#ifndef _COMPIZ_FIREPAINT_SRC_FIREPAINT_H
+#define _COMPIZ_FIREPAINT_SRC_FIREPAINT_H
+
 #include <core/core.h>
 #include <composite/composite.h>
 #include <opengl/opengl.h>
@@ -184,3 +187,5 @@ class FirePluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_FIREPAINT_SRC_FIREPAINT_H */
diff --git a/plugins/firepaint/src/firepaint_tex.h b/plugins/firepaint/src/firepaint_tex.h
index 934b622..8e134cc 100644
--- a/plugins/firepaint/src/firepaint_tex.h
+++ b/plugins/firepaint/src/firepaint_tex.h
@@ -18,6 +18,9 @@
  *
  **/
 
+#ifndef _COMPIZ_FIREPAINT_SRC_FIREPAINT_TEX_H
+#define _COMPIZ_FIREPAINT_SRC_FIREPAINT_TEX_H
+
 const unsigned char fireTex[4097] = {
   "\0\0\0\0\377\377\377\3\377\377\377\2\377\377\377\5\377\377\377\7\377\377"
   "\377\6\377\377\377\6\377\377\377\12\377\377\377\13\377\377\377\11\377\377"
@@ -221,3 +224,4 @@ const unsigned char fireTex[4097] = {
   "\0\0\0"
 };
 
+#endif /* _COMPIZ_FIREPAINT_SRC_FIREPAINT_TEX_H */
diff --git a/plugins/freewins/src/action.cpp b/plugins/freewins/src/action.cpp
index 42aa23f..2c27daa 100644
--- a/plugins/freewins/src/action.cpp
+++ b/plugins/freewins/src/action.cpp
@@ -504,12 +504,6 @@ FWWindow::setPrepareRotation (float dx,
     }
 }
 
-#define ROTATE_INC freewinsGetRotateIncrementAmount (w->screen)
-#define NEG_ROTATE_INC freewinsGetRotateIncrementAmount (w->screen) *-1
-
-#define SCALE_INC freewinsGetScaleIncrementAmount (w->screen)
-#define NEG_SCALE_INC freewinsGetScaleIncrementAmount (w->screen) *-1
-
 bool
 FWScreen::rotate (CompAction         *action,
 		  CompAction::State  state,
diff --git a/plugins/freewins/src/freewins.h b/plugins/freewins/src/freewins.h
index 18a8d3a..f6ee3c8 100644
--- a/plugins/freewins/src/freewins.h
+++ b/plugins/freewins/src/freewins.h
@@ -50,6 +50,9 @@
  *    - 'Rotate' Button
  */
 
+#ifndef _COMPIZ_FREEWINS_SRC_FREEWINS_H
+#define _COMPIZ_FREEWINS_SRC_FREEWINS_H
+
 #include <core/core.h>
 #include <core/pluginclasshandler.h>
 #include <composite/composite.h>
@@ -585,3 +588,5 @@ class FWPluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_FREEWINS_SRC_FREEWINS_H */
diff --git a/plugins/gears/src/gears.h b/plugins/gears/src/gears.h
index 6eeae5e..0f8921c 100644
--- a/plugins/gears/src/gears.h
+++ b/plugins/gears/src/gears.h
@@ -24,6 +24,9 @@
  *    http://cvsweb.xfree86.org/cvsweb/xc/programs/glxgears/glxgears.c
  */
 
+#ifndef _COMPIZ_GEARS_SRC_GEARS_H
+#define _COMPIZ_GEARS_SRC_GEARS_H
+
 #include <cstdlib>
 #include <cstring>
 #include <cstdio>
@@ -98,3 +101,4 @@ class GearsPluginVTable :
 };
 
 
+#endif /* _COMPIZ_GEARS_SRC_GEARS_H */
diff --git a/plugins/gnomecompat/src/gnomecompat.h b/plugins/gnomecompat/src/gnomecompat.h
index eb4731a..cd21048 100644
--- a/plugins/gnomecompat/src/gnomecompat.h
+++ b/plugins/gnomecompat/src/gnomecompat.h
@@ -23,6 +23,9 @@
  * Author: Danny Baumann <[e-mail]>
  */
 
+#ifndef _COMPIZ_GNOMECOMPAT_SRC_GNOMECOMPAT_H
+#define _COMPIZ_GNOMECOMPAT_SRC_GNOMECOMPAT_H
+
 #include <core/screen.h>
 #include <core/pluginclasshandler.h>
 
@@ -51,3 +54,5 @@ class GnomeCompatPluginVTable :
     public:
 	bool init ();
 };
+
+#endif /* _COMPIZ_GNOMECOMPAT_SRC_GNOMECOMPAT_H */
diff --git a/plugins/grid/src/grid.h b/plugins/grid/src/grid.h
index 40b1801..8d1bd3e 100644
--- a/plugins/grid/src/grid.h
+++ b/plugins/grid/src/grid.h
@@ -22,6 +22,9 @@
  * Press the tiling keys several times to cycle through some tiling options.
  */
 
+#ifndef _COMPIZ_GRID_SRC_GRID_H
+#define _COMPIZ_GRID_SRC_GRID_H
+
 #include <core/core.h>
 #include <core/atoms.h>
 #include <core/pluginclasshandler.h>
@@ -248,3 +251,5 @@ class GridPluginVTable :
 };
 
 COMPIZ_PLUGIN_20090315 (grid, GridPluginVTable);
+
+#endif /* _COMPIZ_GRID_SRC_GRID_H */
diff --git a/plugins/imgjpeg/src/imgjpeg.h b/plugins/imgjpeg/src/imgjpeg.h
index 5a36bd8..2319e9e 100644
--- a/plugins/imgjpeg/src/imgjpeg.h
+++ b/plugins/imgjpeg/src/imgjpeg.h
@@ -23,6 +23,9 @@
  * Author: David Reveman <[e-mail]>
  */
 
+#ifndef _COMPIZ_IMGJPEG_SRC_IMGJPEG_H
+#define _COMPIZ_IMGJPEG_SRC_IMGJPEG_H
+
 #include <string.h>
 #include <ctype.h>
 #include <stdio.h>
@@ -85,3 +88,5 @@ class JpegPluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_IMGJPEG_SRC_IMGJPEG_H */
diff --git a/plugins/imgsvg/src/imgsvg.h b/plugins/imgsvg/src/imgsvg.h
index 7475906..46b844c 100644
--- a/plugins/imgsvg/src/imgsvg.h
+++ b/plugins/imgsvg/src/imgsvg.h
@@ -23,6 +23,9 @@
  * Author: David Reveman <[e-mail]>
  */
 
+#ifndef _COMPIZ_IMGSVG_SRC_IMGSVG_H
+#define _COMPIZ_IMGSVG_SRC_IMGSVG_H
+
 #include "imgsvg_options.h"
 
 #include <composite/composite.h>
@@ -170,3 +173,5 @@ class SvgPluginVTable :
 	bool init ();
 	void fini ();
 };
+
+#endif /* _COMPIZ_IMGSVG_SRC_IMGSVG_H */
diff --git a/plugins/loginout/src/loginout.h b/plugins/loginout/src/loginout.h
index d8b8494..e3b91a4 100644
--- a/plugins/loginout/src/loginout.h
+++ b/plugins/loginout/src/loginout.h
@@ -19,6 +19,9 @@
  *
  */
 
+#ifndef _COMPIZ_LOGINOUT_SRC_LOGINOUT_H
+#define _COMPIZ_LOGINOUT_SRC_LOGINOUT_H
+
 #include <core/core.h>
 #include <core/pluginclasshandler.h>
 
@@ -113,3 +116,5 @@ class LoginoutPluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_LOGINOUT_SRC_LOGINOUT_H */
diff --git a/plugins/mag/src/mag.h b/plugins/mag/src/mag.h
index c13b092..2f33e28 100644
--- a/plugins/mag/src/mag.h
+++ b/plugins/mag/src/mag.h
@@ -20,6 +20,9 @@
  *
  */
 
+#ifndef _COMPIZ_MAG_SRC_MAG_H
+#define _COMPIZ_MAG_SRC_MAG_H
+
 #include <cmath>
 
 #include <core/core.h>
@@ -178,3 +181,5 @@ static const char *fisheyeFpString =
 
     "END";
 #endif
+
+#endif /* _COMPIZ_MAG_SRC_MAG_H */
diff --git a/plugins/matecompat/src/matecompat.h b/plugins/matecompat/src/matecompat.h
index b6c66bd..4ba26c7 100644
--- a/plugins/matecompat/src/matecompat.h
+++ b/plugins/matecompat/src/matecompat.h
@@ -23,6 +23,9 @@
  * Author: Danny Baumann <[e-mail]>
  */
 
+#ifndef _COMPIZ_MATECOMPAT_SRC_MATECOMPAT_H
+#define _COMPIZ_MATECOMPAT_SRC_MATECOMPAT_H
+
 #include <core/screen.h>
 #include <core/pluginclasshandler.h>
 
@@ -51,3 +54,5 @@ class MateCompatPluginVTable :
     public:
 	bool init ();
 };
+
+#endif /* _COMPIZ_MATECOMPAT_SRC_MATECOMPAT_H */
diff --git a/plugins/maximumize/src/maximumize.h b/plugins/maximumize/src/maximumize.h
index 9b11733..3cfc3af 100644
--- a/plugins/maximumize/src/maximumize.h
+++ b/plugins/maximumize/src/maximumize.h
@@ -26,6 +26,9 @@
  * direction as possible without overlapping with other windows.
  */
 
+#ifndef _COMPIZ_MAXIMUMIZE_SRC_MAXIMUMIZE_H
+#define _COMPIZ_MAXIMUMIZE_SRC_MAXIMUMIZE_H
+
 #include <core/core.h>
 #include <core/pluginclasshandler.h>
 
@@ -158,3 +161,4 @@ class MaximumizePluginVTable :
 
 
 
+#endif /* _COMPIZ_MAXIMUMIZE_SRC_MAXIMUMIZE_H */
diff --git a/plugins/mblur/src/mblur.h b/plugins/mblur/src/mblur.h
index 6b82b23..70f4ba5 100644
--- a/plugins/mblur/src/mblur.h
+++ b/plugins/mblur/src/mblur.h
@@ -23,6 +23,9 @@
  *
  */
 
+#ifndef _COMPIZ_MBLUR_SRC_MBLUR_H
+#define _COMPIZ_MBLUR_SRC_MBLUR_H
+
 #include <cmath>
 
 #include <core/core.h>
@@ -88,3 +91,5 @@ class MblurPluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_MBLUR_SRC_MBLUR_H */
diff --git a/plugins/mousepoll/src/private.h b/plugins/mousepoll/src/private.h
index c21fb29..03a0909 100644
--- a/plugins/mousepoll/src/private.h
+++ b/plugins/mousepoll/src/private.h
@@ -20,6 +20,9 @@
  *
  */
 
+#ifndef _COMPIZ_MOUSEPOLL_SRC_PRIVATE_H
+#define _COMPIZ_MOUSEPOLL_SRC_PRIVATE_H
+
 #include <core/core.h>
 #include <core/pluginclasshandler.h>
 #include <core/timer.h>
@@ -78,3 +81,5 @@ class MousepollPluginVTable :
 	bool init ();
 	void fini ();
 };
+
+#endif /* _COMPIZ_MOUSEPOLL_SRC_PRIVATE_H */
diff --git a/plugins/move/src/move.h b/plugins/move/src/move.h
index 3c4677f..493a080 100644
--- a/plugins/move/src/move.h
+++ b/plugins/move/src/move.h
@@ -23,6 +23,9 @@
  * Author: David Reveman <[e-mail]>
  */
 
+#ifndef _COMPIZ_MOVE_SRC_MOVE_H
+#define _COMPIZ_MOVE_SRC_MOVE_H
+
 #include "move_options.h"
 
 #include <core/screen.h>
@@ -149,3 +152,4 @@ class MovePluginVTable :
 	bool init ();
 };
 
+#endif /* _COMPIZ_MOVE_SRC_MOVE_H */
diff --git a/plugins/neg/src/neg.h b/plugins/neg/src/neg.h
index 420cfbc..6be384b 100644
--- a/plugins/neg/src/neg.h
+++ b/plugins/neg/src/neg.h
@@ -21,6 +21,9 @@
  *
  */
 
+#ifndef _COMPIZ_NEG_SRC_NEG_H
+#define _COMPIZ_NEG_SRC_NEG_H
+
 #include <core/core.h>
 #include <core/pluginclasshandler.h>
 
@@ -95,3 +98,5 @@ class NegPluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_NEG_SRC_NEG_H */
diff --git a/plugins/notification/src/notification.h b/plugins/notification/src/notification.h
index bb65902..5e8d4d3 100644
--- a/plugins/notification/src/notification.h
+++ b/plugins/notification/src/notification.h
@@ -22,6 +22,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#ifndef _COMPIZ_NOTIFICATION_SRC_NOTIFICATION_H
+#define _COMPIZ_NOTIFICATION_SRC_NOTIFICATION_H
+
 #include <core/core.h>
 #include <core/pluginclasshandler.h>
 
@@ -55,3 +58,5 @@ class NotificationPluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_NOTIFICATION_SRC_NOTIFICATION_H */
diff --git a/plugins/obs/src/obs.h b/plugins/obs/src/obs.h
index 36cbc62..7fa5553 100644
--- a/plugins/obs/src/obs.h
+++ b/plugins/obs/src/obs.h
@@ -23,6 +23,9 @@
  * Author: Danny Baumann <[e-mail]>
  */
 
+#ifndef _COMPIZ_OBS_SRC_OBS_H
+#define _COMPIZ_OBS_SRC_OBS_H
+
 #include <core/screen.h>
 #include <core/pluginclasshandler.h>
 
@@ -102,3 +105,5 @@ class ObsPluginVTable :
     public:
 	bool init ();
 };
+
+#endif /* _COMPIZ_OBS_SRC_OBS_H */
diff --git a/plugins/opacify/src/opacify.h b/plugins/opacify/src/opacify.h
index efb1427..3f2a3f2 100644
--- a/plugins/opacify/src/opacify.h
+++ b/plugins/opacify/src/opacify.h
@@ -24,6 +24,9 @@
  *
  */
 
+#ifndef _COMPIZ_OPACIFY_SRC_OPACIFY_H
+#define _COMPIZ_OPACIFY_SRC_OPACIFY_H
+
 #include <core/core.h>
 #include <composite/composite.h>
 #include <opengl/opengl.h>
@@ -130,3 +133,5 @@ class OpacifyPluginVTable :
 
 	bool init ();
 }; 
+
+#endif /* _COMPIZ_OPACIFY_SRC_OPACIFY_H */
diff --git a/plugins/place/src/place.h b/plugins/place/src/place.h
index 7d1d218..cc47b82 100644
--- a/plugins/place/src/place.h
+++ b/plugins/place/src/place.h
@@ -20,6 +20,9 @@
  * 02111-1307, USA.
  */
 
+#ifndef _COMPIZ_PLACE_SRC_PLACE_H
+#define _COMPIZ_PLACE_SRC_PLACE_H
+
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
@@ -165,3 +168,5 @@ class PlacePluginVTable :
     public:
 	bool init ();
 };
+
+#endif /* _COMPIZ_PLACE_SRC_PLACE_H */
diff --git a/plugins/put/src/put.h b/plugins/put/src/put.h
index 202a07f..4949880 100644
--- a/plugins/put/src/put.h
+++ b/plugins/put/src/put.h
@@ -17,6 +17,8 @@
  *
  */
 
+#ifndef _COMPIZ_PUT_SRC_PUT_H
+#define _COMPIZ_PUT_SRC_PUT_H
 
 #include <core/core.h>
 #include <core/pluginclasshandler.h>
@@ -211,3 +213,4 @@ class PutPluginVTable :
 	bool init ();
 };
 
+#endif /* _COMPIZ_PUT_SRC_PUT_H */
diff --git a/plugins/reflex/src/reflex.h b/plugins/reflex/src/reflex.h
index 05b7f35..a7b0d32 100644
--- a/plugins/reflex/src/reflex.h
+++ b/plugins/reflex/src/reflex.h
@@ -23,6 +23,9 @@
  *
  */
 
+#ifndef _COMPIZ_REFLEX_SRC_REFLEX_H
+#define _COMPIZ_REFLEX_SRC_REFLEX_H
+
 #include <core/core.h>
 #include <composite/composite.h>
 #include <opengl/opengl.h>
@@ -110,3 +113,5 @@ class ReflexPluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_REFLEX_SRC_REFLEX_H */
diff --git a/plugins/resizeinfo/src/resizeinfo.h b/plugins/resizeinfo/src/resizeinfo.h
index aff99cf..c21c6c4 100644
--- a/plugins/resizeinfo/src/resizeinfo.h
+++ b/plugins/resizeinfo/src/resizeinfo.h
@@ -21,6 +21,9 @@
  *
  **/
 
+#ifndef _COMPIZ_RESIZEINFO_SRC_RESIZEINFO_H
+#define _COMPIZ_RESIZEINFO_SRC_RESIZEINFO_H
+
 #include <core/core.h>
 #include <core/pluginclasshandler.h>
 
@@ -144,3 +147,5 @@ class InfoPluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_RESIZEINFO_SRC_RESIZEINFO_H */
diff --git a/plugins/ring/src/ring.h b/plugins/ring/src/ring.h
index c275402..999a890 100644
--- a/plugins/ring/src/ring.h
+++ b/plugins/ring/src/ring.h
@@ -27,6 +27,9 @@
  *
  */
 
+#ifndef _COMPIZ_RING_SRC_RING_H
+#define _COMPIZ_RING_SRC_RING_H
+
 #include <cmath>
 
 #include <core/atoms.h>
@@ -264,3 +267,5 @@ class RingPluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_RING_SRC_RING_H */
diff --git a/plugins/scaleaddon/src/scaleaddon.h b/plugins/scaleaddon/src/scaleaddon.h
index 6e73a43..f0a5580 100644
--- a/plugins/scaleaddon/src/scaleaddon.h
+++ b/plugins/scaleaddon/src/scaleaddon.h
@@ -28,6 +28,9 @@
  *
  */
 
+#ifndef _COMPIZ_SCALEADDON_SRC_SCALEADDON_H
+#define _COMPIZ_SCALEADDON_SRC_SCALEADDON_H
+
 #include <cmath>
 #include <cstring>
 #include <X11/Xatom.h>
@@ -159,3 +162,5 @@ class ScaleAddonPluginVTable :
     public:
 	bool init ();
 };
+
+#endif /* _COMPIZ_SCALEADDON_SRC_SCALEADDON_H */
diff --git a/plugins/scalefilter/src/scalefilter.h b/plugins/scalefilter/src/scalefilter.h
index 5ab1580..86ec514 100644
--- a/plugins/scalefilter/src/scalefilter.h
+++ b/plugins/scalefilter/src/scalefilter.h
@@ -21,6 +21,9 @@
  *
  */
 
+#ifndef _COMPIZ_SCALEFILTER_SRC_SCALEFILTER_H
+#define _COMPIZ_SCALEFILTER_SRC_SCALEFILTER_H
+
 #include <core/core.h>
 #include <core/pluginclasshandler.h>
 
@@ -156,3 +159,5 @@ class ScalefilterPluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_SCALEFILTER_SRC_SCALEFILTER_H */
diff --git a/plugins/screenshot/src/screenshot.h b/plugins/screenshot/src/screenshot.h
index 25d79e1..553e1fc 100644
--- a/plugins/screenshot/src/screenshot.h
+++ b/plugins/screenshot/src/screenshot.h
@@ -23,6 +23,9 @@
  * Author: David Reveman <[e-mail]>
  */
 
+#ifndef _COMPIZ_SCREENSHOT_SRC_SCREENSHOT_H
+#define _COMPIZ_SCREENSHOT_SRC_SCREENSHOT_H
+
 #include "screenshot_options.h"
 
 #include <core/screen.h>
@@ -78,3 +81,5 @@ class ShotPluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_SCREENSHOT_SRC_SCREENSHOT_H */
diff --git a/plugins/session/src/session.h b/plugins/session/src/session.h
index 335aff2..575b9da 100644
--- a/plugins/session/src/session.h
+++ b/plugins/session/src/session.h
@@ -23,6 +23,9 @@
  *          Patrick Niklaus
  **/
 
+#ifndef _COMPIZ_SESSION_SRC_SESSION_H
+#define _COMPIZ_SESSION_SRC_SESSION_H
+
 #include <core/core.h>
 #include <core/pluginclasshandler.h>
 
@@ -124,3 +127,5 @@ class SessionPluginVTable :
     public:
 	bool init ();
 };
+
+#endif /* _COMPIZ_SESSION_SRC_SESSION_H */
diff --git a/plugins/shelf/src/shelf.h b/plugins/shelf/src/shelf.h
index 0d0854a..54cea91 100644
--- a/plugins/shelf/src/shelf.h
+++ b/plugins/shelf/src/shelf.h
@@ -32,6 +32,9 @@
  *  - Mouse-over?
  */
 
+#ifndef _COMPIZ_SHELF_SRC_SHELF_H
+#define _COMPIZ_SHELF_SRC_SHELF_H
+
 #include <X11/extensions/shape.h>
 #include <X11/cursorfont.h>
 
@@ -229,3 +232,5 @@ class ShelfPluginVTable :
     public:
 	bool init ();
 };
+
+#endif /* _COMPIZ_SHELF_SRC_SHELF_H */
diff --git a/plugins/shift/src/shift.h b/plugins/shift/src/shift.h
index 5750ccf..06fa93a 100644
--- a/plugins/shift/src/shift.h
+++ b/plugins/shift/src/shift.h
@@ -32,6 +32,8 @@
  *
  */
 
+#ifndef _COMPIZ_SHIFT_SRC_SHIFT_H
+#define _COMPIZ_SHIFT_SRC_SHIFT_H
 
 #include <core/core.h>
 #include <core/pluginclasshandler.h>
@@ -323,3 +325,5 @@ class ShiftPluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_SHIFT_SRC_SHIFT_H */
diff --git a/plugins/showdesktop/src/showdesktop.h b/plugins/showdesktop/src/showdesktop.h
index 23e7ae8..50daf13 100644
--- a/plugins/showdesktop/src/showdesktop.h
+++ b/plugins/showdesktop/src/showdesktop.h
@@ -33,6 +33,9 @@
  *
  * */
 
+#ifndef _COMPIZ_SHOWDESKTOP_SRC_SHOWDESKTOP_H
+#define _COMPIZ_SHOWDESKTOP_SRC_SHOWDESKTOP_H
+
 #include <core/core.h>
 #include <composite/composite.h>
 #include <opengl/opengl.h>
@@ -268,3 +271,5 @@ class ShowdesktopPluginVTable:
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_SHOWDESKTOP_SRC_SHOWDESKTOP_H */
diff --git a/plugins/showmouse/src/showmouse.h b/plugins/showmouse/src/showmouse.h
index b051345..11d79e9 100644
--- a/plugins/showmouse/src/showmouse.h
+++ b/plugins/showmouse/src/showmouse.h
@@ -21,6 +21,9 @@
  *
  */
 
+#ifndef _COMPIZ_SHOWMOUSE_SRC_SHOWMOUSE_H
+#define _COMPIZ_SHOWMOUSE_SRC_SHOWMOUSE_H
+
 #include <cmath>
 
 #include <core/core.h>
@@ -184,3 +187,5 @@ class ShowmousePluginVTable :
 {
     bool init ();
 };
+
+#endif /* _COMPIZ_SHOWMOUSE_SRC_SHOWMOUSE_H */
diff --git a/plugins/showmouse/src/showmouse_tex.h b/plugins/showmouse/src/showmouse_tex.h
index 08662a3..6f82c36 100644
--- a/plugins/showmouse/src/showmouse_tex.h
+++ b/plugins/showmouse/src/showmouse_tex.h
@@ -18,6 +18,9 @@
  *
  */
 
+#ifndef _COMPIZ_SHOWMOUSE_SRC_SHOWMOUSE_TEX_H
+#define _COMPIZ_SHOWMOUSE_SRC_SHOWMOUSE_TEX_H
+
 static const unsigned char starTex[4097] = {
   "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\360\360\360\0\15"
   "\15\15\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\16\16\16\0\336\336\336\0"
@@ -214,3 +217,4 @@ static const unsigned char starTex[4097] = {
   "\377\377\377\0\377\377\377\0"
 };
 
+#endif /* _COMPIZ_SHOWMOUSE_SRC_SHOWMOUSE_TEX_H */
diff --git a/plugins/showrepaint/src/showrepaint.h b/plugins/showrepaint/src/showrepaint.h
index c6ff073..1c7c1ae 100644
--- a/plugins/showrepaint/src/showrepaint.h
+++ b/plugins/showrepaint/src/showrepaint.h
@@ -21,6 +21,9 @@
  *
  */
 
+#ifndef _COMPIZ_SHOWREPAINT_SRC_SHOWREPAINT_H
+#define _COMPIZ_SHOWREPAINT_SRC_SHOWREPAINT_H
+
 #include <math.h>
 #include <string.h>
 
@@ -70,3 +73,5 @@ class ShowrepaintPluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_SHOWREPAINT_SRC_SHOWREPAINT_H */
diff --git a/plugins/simple-animations/src/animationsim.h b/plugins/simple-animations/src/animationsim.h
index 1251125..3c2a460 100644
--- a/plugins/simple-animations/src/animationsim.h
+++ b/plugins/simple-animations/src/animationsim.h
@@ -1,3 +1,6 @@
+#ifndef _COMPIZ_SIMPLE_ANIMATIONS_SRC_ANIMATIONSIM_H
+#define _COMPIZ_SIMPLE_ANIMATIONS_SRC_ANIMATIONSIM_H
+
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
@@ -403,3 +406,5 @@ class AnimSimPluginVTable:
     public:
 	bool init ();
 };
+
+#endif /* _COMPIZ_SIMPLE_ANIMATIONS_SRC_ANIMATIONSIM_H */
diff --git a/plugins/snap/src/snap.h b/plugins/snap/src/snap.h
index f56dc4a..f454f4b 100644
--- a/plugins/snap/src/snap.h
+++ b/plugins/snap/src/snap.h
@@ -26,6 +26,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#ifndef _COMPIZ_SNAP_SRC_SNAP_H
+#define _COMPIZ_SNAP_SRC_SNAP_H
+
 #include <vector>
 
 #include <core/core.h>
@@ -166,3 +169,4 @@ class SnapPluginVTable :
 	bool init ();
 };
 
+#endif /* _COMPIZ_SNAP_SRC_SNAP_H */
diff --git a/plugins/splash/src/splash.h b/plugins/splash/src/splash.h
index fcdd240..fa6946a 100644
--- a/plugins/splash/src/splash.h
+++ b/plugins/splash/src/splash.h
@@ -19,6 +19,9 @@
  *
  */
 
+#ifndef _COMPIZ_SPLASH_SRC_SPLASH_H
+#define _COMPIZ_SPLASH_SRC_SPLASH_H
+
 #include <core/core.h>
 #include <core/pluginclasshandler.h>
 
@@ -121,3 +124,5 @@ class SplashPluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_SPLASH_SRC_SPLASH_H */
diff --git a/plugins/stackswitch/src/stackswitch.h b/plugins/stackswitch/src/stackswitch.h
index e2e6325..6da6982 100644
--- a/plugins/stackswitch/src/stackswitch.h
+++ b/plugins/stackswitch/src/stackswitch.h
@@ -23,6 +23,9 @@
  *
  */
 
+#ifndef _COMPIZ_STACKSWITCH_SRC_STACKSWITCH_H
+#define _COMPIZ_STACKSWITCH_SRC_STACKSWITCH_H
+
 #include <cmath>
 
 #include <X11/Xatom.h>
@@ -241,3 +244,5 @@ class StackswitchPluginVTable:
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_STACKSWITCH_SRC_STACKSWITCH_H */
diff --git a/plugins/staticswitcher/src/staticswitcher.h b/plugins/staticswitcher/src/staticswitcher.h
index 54e3cc0..dca18f1 100644
--- a/plugins/staticswitcher/src/staticswitcher.h
+++ b/plugins/staticswitcher/src/staticswitcher.h
@@ -23,6 +23,9 @@
  *
  */
 
+#ifndef _COMPIZ_STATICSWITCHER_SRC_STATICSWITCHER_H
+#define _COMPIZ_STATICSWITCHER_SRC_STATICSWITCHER_H
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -176,3 +179,4 @@ class StaticSwitchPluginVTable :
 	bool init ();
 };
 
+#endif /* _COMPIZ_STATICSWITCHER_SRC_STATICSWITCHER_H */
diff --git a/plugins/switcher/src/switcher.h b/plugins/switcher/src/switcher.h
index 3ad7311..56b0c68 100644
--- a/plugins/switcher/src/switcher.h
+++ b/plugins/switcher/src/switcher.h
@@ -25,6 +25,9 @@
  *  - Auboyneau Vincent <[e-mail]> (size multiplier for A11Y)
  */
 
+#ifndef _COMPIZ_SWITCHER_SRC_SWITCHER_H
+#define _COMPIZ_SWITCHER_SRC_SWITCHER_H
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -187,3 +190,4 @@ class SwitchPluginVTable :
 };
 
 
+#endif /* _COMPIZ_SWITCHER_SRC_SWITCHER_H */
diff --git a/plugins/td/src/3d.h b/plugins/td/src/3d.h
index 4d28bc9..a005325 100644
--- a/plugins/td/src/3d.h
+++ b/plugins/td/src/3d.h
@@ -25,6 +25,9 @@
  *
  */
 
+#ifndef _COMPIZ_TD_SRC_3D_H
+#define _COMPIZ_TD_SRC_3D_H
+
 /** TODO:
   1. Add 3d shadows / projections.
   2. Add an option to select z-order of windows not only by viewports,
@@ -154,3 +157,5 @@ class TdPluginVTable :
     
 	bool init ();
 };
+
+#endif /* _COMPIZ_TD_SRC_3D_H */
diff --git a/plugins/text/src/private.h b/plugins/text/src/private.h
index a565fd4..d359f09 100644
--- a/plugins/text/src/private.h
+++ b/plugins/text/src/private.h
@@ -25,6 +25,9 @@
  *
  */
 
+#ifndef _COMPIZ_TEXT_SRC_PRIVATE_H
+#define _COMPIZ_TEXT_SRC_PRIVATE_H
+
 #include <core/core.h>
 #include <core/pluginclasshandler.h>
 #include <composite/composite.h>
@@ -114,3 +117,5 @@ class TextPluginVTable :
 	bool init ();
 	void fini ();
 };
+
+#endif /* _COMPIZ_TEXT_SRC_PRIVATE_H */
diff --git a/plugins/thumbnail/src/thumbnail.h b/plugins/thumbnail/src/thumbnail.h
index c1cfb07..289f551 100644
--- a/plugins/thumbnail/src/thumbnail.h
+++ b/plugins/thumbnail/src/thumbnail.h
@@ -27,6 +27,8 @@
  *
  */
 
+#ifndef _COMPIZ_THUMBNAIL_SRC_THUMBNAIL_H
+#define _COMPIZ_THUMBNAIL_SRC_THUMBNAIL_H
 
 /* TODO:
 	* - Make Thumbnail it's own class with methods
@@ -200,3 +202,5 @@ class ThumbPluginVTable :
     public:
 	bool init ();
 };
+
+#endif /* _COMPIZ_THUMBNAIL_SRC_THUMBNAIL_H */
diff --git a/plugins/titleinfo/src/titleinfo.h b/plugins/titleinfo/src/titleinfo.h
index e88a861..acc0ac4 100644
--- a/plugins/titleinfo/src/titleinfo.h
+++ b/plugins/titleinfo/src/titleinfo.h
@@ -22,6 +22,10 @@
  * GNU General Public License for more details.
  *
  */
+
+#ifndef _COMPIZ_TITLEINFO_SRC_TITLEINFO_H
+#define _COMPIZ_TITLEINFO_SRC_TITLEINFO_H
+
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
@@ -108,3 +112,5 @@ class TitleinfoPluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_TITLEINFO_SRC_TITLEINFO_H */
diff --git a/plugins/trailfocus/src/trailfocus.h b/plugins/trailfocus/src/trailfocus.h
index 21942b8..1fd637d 100644
--- a/plugins/trailfocus/src/trailfocus.h
+++ b/plugins/trailfocus/src/trailfocus.h
@@ -25,6 +25,9 @@
  *
  */
 
+#ifndef _COMPIZ_TRAILFOCUS_SRC_TRAILFOCUS_H
+#define _COMPIZ_TRAILFOCUS_SRC_TRAILFOCUS_H
+
 #include <core/core.h>
 #include <core/pluginclasshandler.h>
 
@@ -95,3 +98,5 @@ class TrailfocusPluginVTable :
     public:
 	bool init ();
 };
+
+#endif /* _COMPIZ_TRAILFOCUS_SRC_TRAILFOCUS_H */
diff --git a/plugins/trip/src/trip.h b/plugins/trip/src/trip.h
index d7a895e..e0c719e 100644
--- a/plugins/trip/src/trip.h
+++ b/plugins/trip/src/trip.h
@@ -24,6 +24,9 @@
  *
  */
 
+#ifndef _COMPIZ_TRIP_SRC_TRIP_H
+#define _COMPIZ_TRIP_SRC_TRIP_H
+
 #include <cmath>
 
 #include <core/core.h>
@@ -190,3 +193,5 @@ static const char *rippleFpString =
     "TEX result.color, t1, texture[0], %s;"
 
     "END";
+
+#endif /* _COMPIZ_TRIP_SRC_TRIP_H */
diff --git a/plugins/vpswitch/src/vpswitch.h b/plugins/vpswitch/src/vpswitch.h
index 7db3e45..cb1d93c 100644
--- a/plugins/vpswitch/src/vpswitch.h
+++ b/plugins/vpswitch/src/vpswitch.h
@@ -26,6 +26,9 @@
  *
  */
 
+#ifndef _COMPIZ_VPSWITCH_SRC_VPSWITCH_H
+#define _COMPIZ_VPSWITCH_SRC_VPSWITCH_H
+
 #include <core/core.h>
 #include <core/pluginclasshandler.h>
 #include <core/atoms.h>
@@ -134,3 +137,5 @@ class VPSwitchPluginVTable :
 
 	bool init ();
 };	
+
+#endif /* _COMPIZ_VPSWITCH_SRC_VPSWITCH_H */
diff --git a/plugins/wall/src/wall.h b/plugins/wall/src/wall.h
index 13e9c31..b925643 100644
--- a/plugins/wall/src/wall.h
+++ b/plugins/wall/src/wall.h
@@ -22,6 +22,9 @@
  *
  **/
 
+#ifndef _COMPIZ_WALL_SRC_WALL_H
+#define _COMPIZ_WALL_SRC_WALL_H
+
 #include <core/core.h>
 #include <core/pluginclasshandler.h>
 #include <composite/composite.h>
@@ -207,3 +210,4 @@ class WallPluginVTable :
 	bool init ();
 };
 
+#endif /* _COMPIZ_WALL_SRC_WALL_H */
diff --git a/plugins/wallpaper/src/wallpaper.h b/plugins/wallpaper/src/wallpaper.h
index 265c51e..085c0bf 100644
--- a/plugins/wallpaper/src/wallpaper.h
+++ b/plugins/wallpaper/src/wallpaper.h
@@ -19,6 +19,9 @@
  *
  */
 
+#ifndef _COMPIZ_WALLPAPER_SRC_WALLPAPER_H
+#define _COMPIZ_WALLPAPER_SRC_WALLPAPER_H
+
 #include <X11/Xatom.h>
 #include <X11/extensions/Xrender.h>
 #include <X11/extensions/shape.h>
@@ -166,3 +169,5 @@ class WallpaperPluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_WALLPAPER_SRC_WALLPAPER_H */
diff --git a/plugins/water/src/water.h b/plugins/water/src/water.h
index 84ff09c..c5f5fc8 100644
--- a/plugins/water/src/water.h
+++ b/plugins/water/src/water.h
@@ -24,6 +24,9 @@
  *         Frederic Plourde <[e-mail]>
  */
 
+#ifndef _COMPIZ_WATER_SRC_WATER_H
+#define _COMPIZ_WATER_SRC_WATER_H
+
 #include "water_options.h"
 #include <core/screen.h>
 #include <core/pluginclasshandler.h>
@@ -134,3 +137,4 @@ class WaterPluginVTable :
 	bool init ();
 };
 
+#endif /* _COMPIZ_WATER_SRC_WATER_H */
diff --git a/plugins/widget/src/widget.h b/plugins/widget/src/widget.h
index a98d108..bec9cd4 100644
--- a/plugins/widget/src/widget.h
+++ b/plugins/widget/src/widget.h
@@ -30,6 +30,9 @@
  *
  */
 
+#ifndef _COMPIZ_WIDGET_SRC_WIDGET_H
+#define _COMPIZ_WIDGET_SRC_WIDGET_H
+
 #include <core/core.h>
 #include <core/pluginclasshandler.h>
 #include <core/atoms.h>
@@ -179,3 +182,5 @@ class WidgetPluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_WIDGET_SRC_WIDGET_H */
diff --git a/plugins/winrules/src/winrules.h b/plugins/winrules/src/winrules.h
index f5ccf8e..13f475b 100644
--- a/plugins/winrules/src/winrules.h
+++ b/plugins/winrules/src/winrules.h
@@ -21,6 +21,9 @@
  * Boston, MA  02110-1301, USA.
  */
 
+#ifndef _COMPIZ_WINRULES_SRC_WINRULES_H
+#define _COMPIZ_WINRULES_SRC_WINRULES_H
+
 #include <core/core.h>
 #include <core/pluginclasshandler.h>
 #include <core/timer.h>
@@ -123,3 +126,5 @@ class WinrulesPluginVTable:
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_WINRULES_SRC_WINRULES_H */
diff --git a/plugins/wizard/include/wizard.h b/plugins/wizard/include/wizard.h
index 30da3fb..87d5c7e 100644
--- a/plugins/wizard/include/wizard.h
+++ b/plugins/wizard/include/wizard.h
@@ -24,6 +24,9 @@
  *
  */
 
+#ifndef _COMPIZ_WIZARD_INCLUDE_WIZARD_H
+#define _COMPIZ_WIZARD_INCLUDE_WIZARD_H
+
 #include <core/core.h>
 #include <composite/composite.h>
 #include <opengl/opengl.h>
@@ -233,3 +236,5 @@ class WizardPluginVTable :
 };
 
 COMPIZ_PLUGIN_20090315 (wizard, WizardPluginVTable);
+
+#endif /* _COMPIZ_WIZARD_INCLUDE_WIZARD_H */
diff --git a/plugins/wizard/include/wizard_tex.h b/plugins/wizard/include/wizard_tex.h
index f76bf4b..c52c6c0 100644
--- a/plugins/wizard/include/wizard_tex.h
+++ b/plugins/wizard/include/wizard_tex.h
@@ -25,6 +25,9 @@
  *
  */
 
+#ifndef _COMPIZ_WIZARD_INCLUDE_WIZARD_TEX_H
+#define _COMPIZ_WIZARD_INCLUDE_WIZARD_TEX_H
+
 static const unsigned char particleTex[65536] = {
   "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
   "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
@@ -2825,3 +2828,5 @@ static const unsigned char particleTex[65536] = {
   "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
   "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
 };
+
+#endif /* _COMPIZ_WIZARD_INCLUDE_WIZARD_TEX_H */
diff --git a/plugins/wobbly/src/wobbly.h b/plugins/wobbly/src/wobbly.h
index b9805c5..4c33872 100644
--- a/plugins/wobbly/src/wobbly.h
+++ b/plugins/wobbly/src/wobbly.h
@@ -23,6 +23,9 @@
  * Author: David Reveman <[e-mail]>
  */
 
+#ifndef _COMPIZ_WOBBLY_SRC_WOBBLY_H
+#define _COMPIZ_WOBBLY_SRC_WOBBLY_H
+
 /*
  * Spring model implemented by Kristian Hogsberg.
  */
@@ -366,3 +369,5 @@ static int displayPrivateIndex;
 
 #define NUM_OPTIONS(s) (sizeof ((s)->opt) / sizeof (CompOption))
 */
+
+#endif /* _COMPIZ_WOBBLY_SRC_WOBBLY_H */
diff --git a/plugins/workarounds/src/workarounds.h b/plugins/workarounds/src/workarounds.h
index 0c5d067..4c40f2b 100644
--- a/plugins/workarounds/src/workarounds.h
+++ b/plugins/workarounds/src/workarounds.h
@@ -24,6 +24,9 @@
  * This plug-in for Metacity-like workarounds.
  */
 
+#ifndef _COMPIZ_WORKAROUNDS_SRC_WORKAROUNDS_H
+#define _COMPIZ_WORKAROUNDS_SRC_WORKAROUNDS_H
+
 #include <string.h>
 #include <limits.h>
 
@@ -221,3 +224,5 @@ class WorkaroundsPluginVTable :
 
 	bool init ();
 };
+
+#endif /* _COMPIZ_WORKAROUNDS_SRC_WORKAROUNDS_H */
diff --git a/plugins/workspacenames/src/workspacenames.h b/plugins/workspacenames/src/workspacenames.h
index 53744f7..7f834f3 100644
--- a/plugins/workspacenames/src/workspacenames.h
+++ b/plugins/workspacenames/src/workspacenames.h
@@ -22,6 +22,9 @@
  *
  */
 
+#ifndef _COMPIZ_WORKSPACENAMES_SRC_WORKSPACENAMES_H
+#define _COMPIZ_WORKSPACENAMES_SRC_WORKSPACENAMES_H
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
@@ -99,3 +102,5 @@ class WorkspacenamesPluginVTable :
 };
 
 COMPIZ_PLUGIN_20090315 (workspacenames, WorkspacenamesPluginVTable);
+
+#endif /* _COMPIZ_WORKSPACENAMES_SRC_WORKSPACENAMES_H */
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 411ea86..fcf974f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -227,3 +227,9 @@ install (
 )
 
 enable_coverage_report( TARGETS compiz )
+
+set_source_files_properties (
+    outputdevices_x11.cpp
+    PROPERTIES
+    SKIP_UNITY_BUILD_INCLUSION ON
+)
diff --git a/src/outputdevices.h b/src/outputdevices.h
index 34571c6..f75af79 100644
--- a/src/outputdevices.h
+++ b/src/outputdevices.h
@@ -22,6 +22,9 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#ifndef _COMPIZ_OUTPUTDEVICES_H
+#define _COMPIZ_OUTPUTDEVICES_H
+
 #include <core/output.h>
 #include <core/rect.h>
 #include <core/region.h>
@@ -102,3 +105,5 @@ private:
 
 } // namespace core
 } // namespace compiz
+
+#endif /* _COMPIZ_OUTPUTDEVICES_H */
diff --git a/src/pluginclasshandler/tests/test-pluginclasshandler.h b/src/pluginclasshandler/tests/test-pluginclasshandler.h
index 284f637..08abe66 100644
--- a/src/pluginclasshandler/tests/test-pluginclasshandler.h
+++ b/src/pluginclasshandler/tests/test-pluginclasshandler.h
@@ -1,3 +1,6 @@
+#ifndef _COMPIZ_PLUGINCLASSHANDLER_TESTS_TEST_PLUGINCLASSHANDLER_H
+#define _COMPIZ_PLUGINCLASSHANDLER_TESTS_TEST_PLUGINCLASSHANDLER_H
+
 #include <core/pluginclasshandler.h>
 #include <core/pluginclasses.h>
 
@@ -73,3 +76,5 @@ public:
 
      compiz::plugin::internal::PluginKey key;
 };
+
+#endif /* _COMPIZ_PLUGINCLASSHANDLER_TESTS_TEST_PLUGINCLASSHANDLER_H */
diff --git a/src/privatesignalsource.h b/src/privatesignalsource.h
index b1db0f4..2d027b3 100644
--- a/src/privatesignalsource.h
+++ b/src/privatesignalsource.h
@@ -23,6 +23,9 @@
  * Author: Sam Spilsbury <[e-mail]>
  */
 
+#ifndef _COMPIZ_PRIVATESIGNALSOURCE_H
+#define _COMPIZ_PRIVATESIGNALSOURCE_H
+
 #include <boost/function.hpp>
 
 #include <glib.h>
@@ -53,3 +56,5 @@ class CompSignalSource
 	int          mSignal;
 	gint         mSource;
 };
+
+#endif /* _COMPIZ_PRIVATESIGNALSOURCE_H */