Merge ~mitya57/compiz:lp1882792 into compiz:master

Proposed by Dmitry Shachnev on 2020-08-06
Status: Merged
Approved by: Alberts Muktupāvels on 2020-08-13
Approved revision: fec9c07696590784a4056809128634ca24f22718
Merged at revision: 3958554d17ee9b8273399b0f7c2d5db9a5f748f8
Proposed branch: ~mitya57/compiz:lp1882792
Merge into: compiz:master
Diff against target: 1953 lines (+452/-32)
96 files modified
compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt (+6/-0)
compizconfig/libcompizconfig/src/ccs-private.h (+1/-1)
compizconfig/libcompizconfig/src/ccs_backend_loader.c (+2/-2)
compizconfig/libcompizconfig/src/ccs_config_file.c (+2/-2)
compizconfig/mocks/libcompizconfig/compizconfig_ccs_plugin_mock.h (+5/-0)
gtk/window-decorator/decorator.c (+3/-3)
gtk/window-decorator/gwd-settings-xproperty-storage.c (+7/-7)
gtk/window-decorator/gwd-theme.c (+8/-8)
gtk/window-decorator/wnck.c (+3/-3)
include/core/modifierhandler.h (+5/-0)
plugins/addhelper/src/addhelper.h (+5/-0)
plugins/animation/src/private.h (+5/-0)
plugins/animationaddon/src/animation_tex.h (+5/-0)
plugins/animationaddon/src/private.h (+5/-0)
plugins/animationjc/src/private.h (+5/-0)
plugins/animationplus/src/animation_tex.h (+5/-0)
plugins/animationplus/src/private.h (+5/-0)
plugins/annotate/src/annotate.h (+5/-0)
plugins/bench/src/bench.h (+4/-0)
plugins/bench/src/bench_tex.h (+4/-0)
plugins/bicubic/src/bicubic.h (+5/-0)
plugins/blur/src/blur.h (+5/-0)
plugins/ccp/src/ccp.h (+5/-0)
plugins/commands/src/commands.h (+5/-0)
plugins/copytex/src/copytex.h (+5/-0)
plugins/crashhandler/src/crashhandler.h (+5/-0)
plugins/cubeaddon/src/cubeaddon.h (+5/-0)
plugins/dbus/src/dbus.h (+5/-0)
plugins/decor/src/decor.h (+4/-0)
plugins/expo/src/expo.h (+5/-0)
plugins/extrawm/src/extrawm.h (+5/-0)
plugins/ezoom/src/ezoom.h (+5/-0)
plugins/fade/src/fade.h (+5/-0)
plugins/fadedesktop/src/fadedesktop.h (+5/-0)
plugins/firepaint/src/firepaint.h (+5/-0)
plugins/firepaint/src/firepaint_tex.h (+4/-0)
plugins/freewins/src/action.cpp (+0/-6)
plugins/freewins/src/freewins.h (+5/-0)
plugins/gears/src/gears.h (+4/-0)
plugins/gnomecompat/src/gnomecompat.h (+5/-0)
plugins/grid/src/grid.h (+5/-0)
plugins/imgjpeg/src/imgjpeg.h (+5/-0)
plugins/imgsvg/src/imgsvg.h (+5/-0)
plugins/loginout/src/loginout.h (+5/-0)
plugins/mag/src/mag.h (+5/-0)
plugins/matecompat/src/matecompat.h (+5/-0)
plugins/maximumize/src/maximumize.h (+4/-0)
plugins/mblur/src/mblur.h (+5/-0)
plugins/mousepoll/src/private.h (+5/-0)
plugins/move/src/move.h (+4/-0)
plugins/neg/src/neg.h (+5/-0)
plugins/notification/src/notification.h (+5/-0)
plugins/obs/src/obs.h (+5/-0)
plugins/opacify/src/opacify.h (+5/-0)
plugins/place/src/place.h (+5/-0)
plugins/put/src/put.h (+3/-0)
plugins/reflex/src/reflex.h (+5/-0)
plugins/resizeinfo/src/resizeinfo.h (+5/-0)
plugins/ring/src/ring.h (+5/-0)
plugins/scaleaddon/src/scaleaddon.h (+5/-0)
plugins/scalefilter/src/scalefilter.h (+5/-0)
plugins/screenshot/src/screenshot.h (+5/-0)
plugins/session/src/session.h (+5/-0)
plugins/shelf/src/shelf.h (+5/-0)
plugins/shift/src/shift.h (+4/-0)
plugins/showdesktop/src/showdesktop.h (+5/-0)
plugins/showmouse/src/showmouse.h (+5/-0)
plugins/showmouse/src/showmouse_tex.h (+4/-0)
plugins/showrepaint/src/showrepaint.h (+5/-0)
plugins/simple-animations/src/animationsim.h (+5/-0)
plugins/snap/src/snap.h (+4/-0)
plugins/splash/src/splash.h (+5/-0)
plugins/stackswitch/src/stackswitch.h (+5/-0)
plugins/staticswitcher/src/staticswitcher.h (+4/-0)
plugins/switcher/src/switcher.h (+4/-0)
plugins/td/src/3d.h (+5/-0)
plugins/text/src/private.h (+5/-0)
plugins/thumbnail/src/thumbnail.h (+4/-0)
plugins/titleinfo/src/titleinfo.h (+6/-0)
plugins/trailfocus/src/trailfocus.h (+5/-0)
plugins/trip/src/trip.h (+5/-0)
plugins/vpswitch/src/vpswitch.h (+5/-0)
plugins/wall/src/wall.h (+4/-0)
plugins/wallpaper/src/wallpaper.h (+5/-0)
plugins/water/src/water.h (+4/-0)
plugins/widget/src/widget.h (+5/-0)
plugins/winrules/src/winrules.h (+5/-0)
plugins/wizard/include/wizard.h (+5/-0)
plugins/wizard/include/wizard_tex.h (+5/-0)
plugins/wobbly/src/wobbly.h (+5/-0)
plugins/workarounds/src/workarounds.h (+5/-0)
plugins/workspacenames/src/workspacenames.h (+5/-0)
src/CMakeLists.txt (+6/-0)
src/outputdevices.h (+5/-0)
src/pluginclasshandler/tests/test-pluginclasshandler.h (+5/-0)
src/privatesignalsource.h (+5/-0)
Reviewer Review Type Date Requested Status
Alberts Muktupāvels 2020-08-06 Approve on 2020-08-13
tom 2020-08-06 Pending
Review via email: mp+388842@code.launchpad.net

Commit message

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

Description of the change

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).

To post a comment you must log in.
Alberts Muktupāvels (muktupavels) wrote :

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) wrote :

> Can it be fixed so this is not needed?

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

Dmitry Shachnev (mitya57) wrote :

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.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt b/compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt
2index 009f448..3e65f01 100644
3--- a/compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt
4+++ b/compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt
5@@ -68,4 +68,10 @@ if (GSETTINGS_UTIL_FOUND)
6 install (TARGETS compizconfig_gsettings_backend
7 DESTINATION ${libdir})
8
9+ set_source_files_properties (
10+ gsettings_util.c
11+ PROPERTIES
12+ SKIP_UNITY_BUILD_INCLUSION ON
13+ )
14+
15 endif (GSETTINGS_UTIL_FOUND)
16diff --git a/compizconfig/libcompizconfig/src/ccs-private.h b/compizconfig/libcompizconfig/src/ccs-private.h
17index f3caf7b..a6ccc00 100644
18--- a/compizconfig/libcompizconfig/src/ccs-private.h
19+++ b/compizconfig/libcompizconfig/src/ccs-private.h
20@@ -20,7 +20,7 @@
21 */
22
23 #ifndef CCS_PRIVATE_H
24-#define CSS_PRIVATE_H
25+#define CCS_PRIVATE_H
26
27 #include <ccs-defs.h>
28
29diff --git a/compizconfig/libcompizconfig/src/ccs_backend_loader.c b/compizconfig/libcompizconfig/src/ccs_backend_loader.c
30index 0960ea7..9798e4e 100644
31--- a/compizconfig/libcompizconfig/src/ccs_backend_loader.c
32+++ b/compizconfig/libcompizconfig/src/ccs_backend_loader.c
33@@ -210,7 +210,7 @@ allocateLoader (CCSObjectAllocationInterface *ai)
34 }
35
36 static CCSShraedLibBackendLoaderPrivate *
37-allocatePrivate (CCSBackendLoader *loader, CCSObjectAllocationInterface *ai)
38+backendLoaderAllocatePrivate (CCSBackendLoader *loader, CCSObjectAllocationInterface *ai)
39 {
40 CCSShraedLibBackendLoaderPrivate *priv = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSShraedLibBackendLoaderPrivate));
41
42@@ -231,7 +231,7 @@ ccsSharedLibBackendLoaderNew (CCSObjectAllocationInterface *ai)
43 if (!loader)
44 return NULL;
45
46- CCSShraedLibBackendLoaderPrivate *priv = allocatePrivate (loader, ai);
47+ CCSShraedLibBackendLoaderPrivate *priv = backendLoaderAllocatePrivate (loader, ai);
48
49 if (!priv)
50 return NULL;
51diff --git a/compizconfig/libcompizconfig/src/ccs_config_file.c b/compizconfig/libcompizconfig/src/ccs_config_file.c
52index 9a98c5b..9a3cc65 100644
53--- a/compizconfig/libcompizconfig/src/ccs_config_file.c
54+++ b/compizconfig/libcompizconfig/src/ccs_config_file.c
55@@ -394,7 +394,7 @@ allocateConfigFile (CCSObjectAllocationInterface *ai)
56 }
57
58 static CCSIniConfigFilePrivate *
59-allocatePrivate (CCSConfigFile *config, CCSObjectAllocationInterface *ai)
60+configFileAllocatePrivate (CCSConfigFile *config, CCSObjectAllocationInterface *ai)
61 {
62 CCSIniConfigFilePrivate *priv = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSIniConfigFilePrivate));
63
64@@ -415,7 +415,7 @@ ccsInternalConfigFileNew (CCSObjectAllocationInterface *ai)
65 if (!loader)
66 return NULL;
67
68- CCSIniConfigFilePrivate *priv = allocatePrivate (loader, ai);
69+ CCSIniConfigFilePrivate *priv = configFileAllocatePrivate (loader, ai);
70
71 if (!priv)
72 return NULL;
73diff --git a/compizconfig/mocks/libcompizconfig/compizconfig_ccs_plugin_mock.h b/compizconfig/mocks/libcompizconfig/compizconfig_ccs_plugin_mock.h
74index 0c6cc7c..e37b37e 100644
75--- a/compizconfig/mocks/libcompizconfig/compizconfig_ccs_plugin_mock.h
76+++ b/compizconfig/mocks/libcompizconfig/compizconfig_ccs_plugin_mock.h
77@@ -1,3 +1,6 @@
78+#ifndef _COMPIZCONFIG_MOCKS_LIBCOMPIZCONFIG_COMPIZCONFIG_CCS_PLUGIN_MOCK_H
79+#define _COMPIZCONFIG_MOCKS_LIBCOMPIZCONFIG_COMPIZCONFIG_CCS_PLUGIN_MOCK_H
80+
81 #include <gtest/gtest.h>
82 #include <gmock/gmock.h>
83
84@@ -182,3 +185,5 @@ class CCSPluginGMock :
85 };
86
87 extern CCSPluginInterface CCSPluginGMockInterface;
88+
89+#endif /* _COMPIZCONFIG_MOCKS_LIBCOMPIZCONFIG_COMPIZCONFIG_CCS_PLUGIN_MOCK_H */
90diff --git a/gtk/window-decorator/decorator.c b/gtk/window-decorator/decorator.c
91index 3c56880..8f4dc9e 100644
92--- a/gtk/window-decorator/decorator.c
93+++ b/gtk/window-decorator/decorator.c
94@@ -32,7 +32,7 @@
95 #endif
96
97 static void
98-draw_window_decoration (decor_t *decor)
99+decorator_draw_window_decoration (decor_t *decor)
100 {
101 gwd_theme_draw_window_decoration (gwd_theme, decor);
102 }
103@@ -648,7 +648,7 @@ draw_border_shape (Display *xdisplay,
104 d.width = width;
105 d.height = height;
106 d.active = TRUE;
107- d.draw = draw_window_decoration;
108+ d.draw = decorator_draw_window_decoration;
109 d.picture = picture;
110 d.context = c;
111
112@@ -1289,7 +1289,7 @@ update_default_decorations (GdkScreen *screen)
113 default_frames[i].d->frame = frame;
114 default_frames[i].d->active = i < WINDOW_TYPE_FRAMES_NUM ? TRUE : FALSE;
115
116- default_frames[i].d->draw = draw_window_decoration;
117+ default_frames[i].d->draw = decorator_draw_window_decoration;
118 default_frames[i].d->surface = create_native_surface_and_wrap (default_frames[i].d->width,
119 default_frames[i].d->height,
120 style_window);
121diff --git a/gtk/window-decorator/gwd-settings-xproperty-storage.c b/gtk/window-decorator/gwd-settings-xproperty-storage.c
122index e958777..f158c25 100644
123--- a/gtk/window-decorator/gwd-settings-xproperty-storage.c
124+++ b/gtk/window-decorator/gwd-settings-xproperty-storage.c
125@@ -37,14 +37,14 @@ struct _GWDSettingsXPropertyStorage
126
127 enum
128 {
129- PROP_0,
130+ XPROPERTY_STORAGE_PROP_0,
131
132- PROP_SETTINGS,
133+ XPROPERTY_STORAGE_PROP_SETTINGS,
134
135- LAST_PROP
136+ XPROPERTY_STORAGE_LAST_PROP
137 };
138
139-static GParamSpec *storage_properties[LAST_PROP] = { NULL };
140+static GParamSpec *storage_properties[XPROPERTY_STORAGE_LAST_PROP] = { NULL };
141
142 G_DEFINE_TYPE (GWDSettingsXPropertyStorage, gwd_settings_xproperty_storage,
143 G_TYPE_OBJECT)
144@@ -72,7 +72,7 @@ gwd_settings_xproperty_storage_set_property (GObject *object,
145 storage = GWD_SETTINGS_XPROPERTY_STORAGE (object);
146
147 switch (property_id) {
148- case PROP_SETTINGS:
149+ case XPROPERTY_STORAGE_PROP_SETTINGS:
150 g_return_if_fail (!storage->settings);
151 storage->settings = g_value_dup_object (value);
152 break;
153@@ -93,13 +93,13 @@ gwd_settings_xproperty_storage_class_init (GWDSettingsXPropertyStorageClass *kla
154 object_class->dispose = gwd_settings_xproperty_storage_dispose;
155 object_class->set_property = gwd_settings_xproperty_storage_set_property;
156
157- storage_properties[PROP_SETTINGS] =
158+ storage_properties[XPROPERTY_STORAGE_PROP_SETTINGS] =
159 g_param_spec_object ("settings", "GWDSettings", "GWDSettings",
160 GWD_TYPE_SETTINGS,
161 G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE |
162 G_PARAM_STATIC_STRINGS);
163
164- g_object_class_install_properties (object_class, LAST_PROP,
165+ g_object_class_install_properties (object_class, XPROPERTY_STORAGE_LAST_PROP,
166 storage_properties);
167 }
168
169diff --git a/gtk/window-decorator/gwd-theme.c b/gtk/window-decorator/gwd-theme.c
170index b2f5cd4..80b3a12 100644
171--- a/gtk/window-decorator/gwd-theme.c
172+++ b/gtk/window-decorator/gwd-theme.c
173@@ -45,14 +45,14 @@ typedef struct
174
175 enum
176 {
177- PROP_0,
178+ THEME_PROP_0,
179
180- PROP_SETTINGS,
181+ THEME_PROP_SETTINGS,
182
183- LAST_PROP
184+ THEME_LAST_PROP
185 };
186
187-static GParamSpec *properties[LAST_PROP] = { NULL };
188+static GParamSpec *properties[THEME_LAST_PROP] = { NULL };
189
190 G_DEFINE_TYPE_WITH_PRIVATE (GWDTheme, gwd_theme, G_TYPE_OBJECT)
191
192@@ -270,7 +270,7 @@ gwd_theme_get_property (GObject *object,
193 GWDThemePrivate *priv = gwd_theme_get_instance_private (theme);
194
195 switch (property_id) {
196- case PROP_SETTINGS:
197+ case THEME_PROP_SETTINGS:
198 g_value_set_object (value, priv->settings);
199 break;
200
201@@ -290,7 +290,7 @@ gwd_theme_set_property (GObject *object,
202 GWDThemePrivate *priv = gwd_theme_get_instance_private (theme);
203
204 switch (property_id) {
205- case PROP_SETTINGS:
206+ case THEME_PROP_SETTINGS:
207 priv->settings = g_value_dup_object (value);
208 break;
209
210@@ -413,13 +413,13 @@ gwd_theme_class_init (GWDThemeClass *theme_class)
211 theme_class->get_button_position = gwd_theme_real_get_button_position;
212 theme_class->update_titlebar_font = gwd_theme_real_update_titlebar_font;
213
214- properties[PROP_SETTINGS] =
215+ properties[THEME_PROP_SETTINGS] =
216 g_param_spec_object ("settings", "GWDSettings", "GWDSettings",
217 GWD_TYPE_SETTINGS,
218 G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
219 G_PARAM_STATIC_STRINGS);
220
221- g_object_class_install_properties (object_class, LAST_PROP, properties);
222+ g_object_class_install_properties (object_class, THEME_LAST_PROP, properties);
223 }
224
225 static void
226diff --git a/gtk/window-decorator/wnck.c b/gtk/window-decorator/wnck.c
227index 4ac1483..c91ea40 100644
228--- a/gtk/window-decorator/wnck.c
229+++ b/gtk/window-decorator/wnck.c
230@@ -27,7 +27,7 @@
231 #include "gwd-settings.h"
232
233 static void
234-draw_window_decoration (decor_t *decor)
235+wnck_draw_window_decoration (decor_t *decor)
236 {
237 gwd_theme_draw_window_decoration (gwd_theme, decor);
238 }
239@@ -215,7 +215,7 @@ decorations_changed (WnckScreen *screen)
240 decor_t *d = g_object_get_data (G_OBJECT (windows->data), "decor");
241
242 if (d->decorated)
243- d->draw = draw_window_decoration;
244+ d->draw = wnck_draw_window_decoration;
245
246 update_window_decoration (WNCK_WINDOW (windows->data));
247 windows = windows->next;
248@@ -685,7 +685,7 @@ window_opened (WnckScreen *screen,
249 &d->client_width,
250 &d->client_height);
251
252- d->draw = draw_window_decoration;
253+ d->draw = wnck_draw_window_decoration;
254
255 d->created = FALSE;
256 d->surface = NULL;
257diff --git a/include/core/modifierhandler.h b/include/core/modifierhandler.h
258index 7b8161c..7ed8669 100644
259--- a/include/core/modifierhandler.h
260+++ b/include/core/modifierhandler.h
261@@ -26,6 +26,9 @@
262 * Sam Spilsbury <smspillaz@gmail.com>
263 */
264
265+#ifndef _COMPIZ_CORE_MODIFIERHANDLER_H
266+#define _COMPIZ_CORE_MODIFIERHANDLER_H
267+
268 #include <core/core.h>
269
270 /**
271@@ -112,3 +115,5 @@ class ModifierHandler
272 unsigned int mIgnoredModMask;
273 XModifierKeymap *mModMap;
274 };
275+
276+#endif /* _COMPIZ_CORE_MODIFIERHANDLER_H */
277diff --git a/plugins/addhelper/src/addhelper.h b/plugins/addhelper/src/addhelper.h
278index 64d8838..13520ea 100644
279--- a/plugins/addhelper/src/addhelper.h
280+++ b/plugins/addhelper/src/addhelper.h
281@@ -26,6 +26,9 @@
282 *
283 */
284
285+#ifndef _COMPIZ_ADDHELPER_SRC_ADDHELPER_H
286+#define _COMPIZ_ADDHELPER_SRC_ADDHELPER_H
287+
288 #include <core/core.h>
289 #include <composite/composite.h>
290 #include <opengl/opengl.h>
291@@ -100,3 +103,5 @@ class AddPluginVTable :
292
293 #define ADD_WINDOW(w) \
294 AddWindow *aw = AddWindow::get (w)
295+
296+#endif /* _COMPIZ_ADDHELPER_SRC_ADDHELPER_H */
297diff --git a/plugins/animation/src/private.h b/plugins/animation/src/private.h
298index 7d5ae2c..9dd63a2 100644
299--- a/plugins/animation/src/private.h
300+++ b/plugins/animation/src/private.h
301@@ -1,3 +1,6 @@
302+#ifndef _COMPIZ_ANIMATION_SRC_PRIVATE_H
303+#define _COMPIZ_ANIMATION_SRC_PRIVATE_H
304+
305 #include <string.h>
306 #include <stdlib.h>
307 #include <math.h>
308@@ -903,3 +906,5 @@ protected:
309 float foldMaxAmp);
310 bool requiresTransformedWindow () const { return true; }
311 };
312+
313+#endif /* _COMPIZ_ANIMATION_SRC_PRIVATE_H */
314diff --git a/plugins/animationaddon/src/animation_tex.h b/plugins/animationaddon/src/animation_tex.h
315index a34ab58..861bd6f 100644
316--- a/plugins/animationaddon/src/animation_tex.h
317+++ b/plugins/animationaddon/src/animation_tex.h
318@@ -18,6 +18,9 @@
319 *
320 **/
321
322+#ifndef _COMPIZ_ANIMATIONADDON_SRC_ANIMATION_TEX_H
323+#define _COMPIZ_ANIMATIONADDON_SRC_ANIMATION_TEX_H
324+
325 const unsigned char fireTex[4097] = {
326 "\0\0\0\0\377\377\377\3\377\377\377\2\377\377\377\5\377\377\377\7\377\377"
327 "\377\6\377\377\377\6\377\377\377\12\377\377\377\13\377\377\377\11\377\377"
328@@ -220,3 +223,5 @@ const unsigned char fireTex[4097] = {
329 "\377\7\377\377\377\4\377\377\377\5\377\377\377\3\377\377\377\1\0\0\0\0\0"
330 "\0\0\0"
331 };
332+
333+#endif /* _COMPIZ_ANIMATIONADDON_SRC_ANIMATION_TEX_H */
334diff --git a/plugins/animationaddon/src/private.h b/plugins/animationaddon/src/private.h
335index 8fd204a..f60498b 100644
336--- a/plugins/animationaddon/src/private.h
337+++ b/plugins/animationaddon/src/private.h
338@@ -1,3 +1,6 @@
339+#ifndef _COMPIZ_ANIMATIONADDON_SRC_PRIVATE_H
340+#define _COMPIZ_ANIMATIONADDON_SRC_PRIVATE_H
341+
342 #include <string.h>
343 #include <stdlib.h>
344 #include <math.h>
345@@ -369,3 +372,5 @@ public:
346 {
347 }
348 };
349+
350+#endif /* _COMPIZ_ANIMATIONADDON_SRC_PRIVATE_H */
351diff --git a/plugins/animationjc/src/private.h b/plugins/animationjc/src/private.h
352index 28e2804..ef5ce6a 100644
353--- a/plugins/animationjc/src/private.h
354+++ b/plugins/animationjc/src/private.h
355@@ -1,3 +1,6 @@
356+#ifndef _COMPIZ_ANIMATIONJC_SRC_PRIVATE_H
357+#define _COMPIZ_ANIMATIONJC_SRC_PRIVATE_H
358+
359 #include <string.h>
360 #include <stdlib.h>
361 #include <math.h>
362@@ -230,3 +233,5 @@ public:
363 {
364 }
365 };
366+
367+#endif /* _COMPIZ_ANIMATIONJC_SRC_PRIVATE_H */
368diff --git a/plugins/animationplus/src/animation_tex.h b/plugins/animationplus/src/animation_tex.h
369index 7ac34f9..09ff2e4 100644
370--- a/plugins/animationplus/src/animation_tex.h
371+++ b/plugins/animationplus/src/animation_tex.h
372@@ -18,6 +18,9 @@
373 *
374 **/
375
376+#ifndef _COMPIZ_ANIMATIONPLUS_SRC_ANIMATION_TEX_H
377+#define _COMPIZ_ANIMATIONPLUS_SRC_ANIMATION_TEX_H
378+
379 static const unsigned char fireTex[4097] = {
380 "\0\0\0\0\377\377\377\3\377\377\377\2\377\377\377\5\377\377\377\7\377\377"
381 "\377\6\377\377\377\6\377\377\377\12\377\377\377\13\377\377\377\11\377\377"
382@@ -220,3 +223,5 @@ static const unsigned char fireTex[4097] = {
383 "\377\7\377\377\377\4\377\377\377\5\377\377\377\3\377\377\377\1\0\0\0\0\0"
384 "\0\0\0"
385 };
386+
387+#endif /* _COMPIZ_ANIMATIONPLUS_SRC_ANIMATION_TEX_H */
388diff --git a/plugins/animationplus/src/private.h b/plugins/animationplus/src/private.h
389index ff52435..2b5238e 100644
390--- a/plugins/animationplus/src/private.h
391+++ b/plugins/animationplus/src/private.h
392@@ -1,3 +1,6 @@
393+#ifndef _COMPIZ_ANIMATIONPLUS_SRC_PRIVATE_H
394+#define _COMPIZ_ANIMATIONPLUS_SRC_PRIVATE_H
395+
396 #include <string.h>
397 #include <stdlib.h>
398 #include <math.h>
399@@ -194,3 +197,5 @@ class AnimPlusPluginVTable :
400
401 bool init ();
402 };
403+
404+#endif /* _COMPIZ_ANIMATIONPLUS_SRC_PRIVATE_H */
405diff --git a/plugins/annotate/src/annotate.h b/plugins/annotate/src/annotate.h
406index 273557a..e9f8c41 100644
407--- a/plugins/annotate/src/annotate.h
408+++ b/plugins/annotate/src/annotate.h
409@@ -23,6 +23,9 @@
410 * Author: David Reveman <davidr@novell.com>
411 */
412
413+#ifndef _COMPIZ_ANNOTATE_SRC_ANNOTATE_H
414+#define _COMPIZ_ANNOTATE_SRC_ANNOTATE_H
415+
416 #include "annotate_options.h"
417 #include <composite/composite.h>
418
419@@ -196,3 +199,5 @@ class AnnoPluginVTable :
420 public:
421 bool init ();
422 };
423+
424+#endif /* _COMPIZ_ANNOTATE_SRC_ANNOTATE_H */
425diff --git a/plugins/bench/src/bench.h b/plugins/bench/src/bench.h
426index 6582577..069eb6d 100644
427--- a/plugins/bench/src/bench.h
428+++ b/plugins/bench/src/bench.h
429@@ -23,6 +23,9 @@
430 *
431 **/
432
433+#ifndef _COMPIZ_BENCH_SRC_BENCH_H
434+#define _COMPIZ_BENCH_SRC_BENCH_H
435+
436 #include <core/core.h>
437 #include <core/timer.h>
438 #include <core/pluginclasshandler.h>
439@@ -123,3 +126,4 @@ class BenchPluginVTable :
440 bool init ();
441 };
442
443+#endif /* _COMPIZ_BENCH_SRC_BENCH_H */
444diff --git a/plugins/bench/src/bench_tex.h b/plugins/bench/src/bench_tex.h
445index 0d95c65..39a3efb 100644
446--- a/plugins/bench/src/bench_tex.h
447+++ b/plugins/bench/src/bench_tex.h
448@@ -18,6 +18,9 @@
449 *
450 **/
451
452+#ifndef _COMPIZ_BENCH_SRC_BENCH_TEX_H
453+#define _COMPIZ_BENCH_SRC_BENCH_TEX_H
454+
455 unsigned char number_data[10][2049] = {
456 "\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"
457 "\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"
458@@ -21762,3 +21765,4 @@ static unsigned char image_data[512 * 256 * 4 + 1] = {
459 "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
460 };
461
462+#endif /* _COMPIZ_BENCH_SRC_BENCH_TEX_H */
463diff --git a/plugins/bicubic/src/bicubic.h b/plugins/bicubic/src/bicubic.h
464index 4d7e0d5..7af74a2 100644
465--- a/plugins/bicubic/src/bicubic.h
466+++ b/plugins/bicubic/src/bicubic.h
467@@ -24,6 +24,9 @@
468 *
469 */
470
471+#ifndef _COMPIZ_BICUBIC_SRC_BICUBIC_H
472+#define _COMPIZ_BICUBIC_SRC_BICUBIC_H
473+
474 #include <core/core.h>
475 #include <composite/composite.h>
476 #include <opengl/opengl.h>
477@@ -92,3 +95,5 @@ class BicubicPluginVTable :
478
479 bool init ();
480 };
481+
482+#endif /* _COMPIZ_BICUBIC_SRC_BICUBIC_H */
483diff --git a/plugins/blur/src/blur.h b/plugins/blur/src/blur.h
484index 426e9f0..2df38a3 100644
485--- a/plugins/blur/src/blur.h
486+++ b/plugins/blur/src/blur.h
487@@ -23,6 +23,9 @@
488 * Author: David Reveman <davidr@novell.com>
489 */
490
491+#ifndef _COMPIZ_BLUR_SRC_BLUR_H
492+#define _COMPIZ_BLUR_SRC_BLUR_H
493+
494 #include <iosfwd>
495 #include <boost/shared_ptr.hpp>
496
497@@ -261,3 +264,5 @@ class BlurPluginVTable :
498
499 bool init ();
500 };
501+
502+#endif /* _COMPIZ_BLUR_SRC_BLUR_H */
503diff --git a/plugins/ccp/src/ccp.h b/plugins/ccp/src/ccp.h
504index e04cae5..0d9544e 100644
505--- a/plugins/ccp/src/ccp.h
506+++ b/plugins/ccp/src/ccp.h
507@@ -18,6 +18,9 @@
508 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
509 */
510
511+#ifndef _COMPIZ_CCP_SRC_CCP_H
512+#define _COMPIZ_CCP_SRC_CCP_H
513+
514 extern "C"
515 {
516 #include <string.h>
517@@ -73,3 +76,5 @@ class CcpPluginVTable :
518
519 bool init ();
520 };
521+
522+#endif /* _COMPIZ_CCP_SRC_CCP_H */
523diff --git a/plugins/commands/src/commands.h b/plugins/commands/src/commands.h
524index f0f8bcf..4c20a21 100644
525--- a/plugins/commands/src/commands.h
526+++ b/plugins/commands/src/commands.h
527@@ -23,6 +23,9 @@
528 * Author: Danny Baumann <dannybaumann@web.de>
529 */
530
531+#ifndef _COMPIZ_COMMANDS_SRC_COMMANDS_H
532+#define _COMPIZ_COMMANDS_SRC_COMMANDS_H
533+
534 #include "commands_options.h"
535
536 #include "core/plugin.h"
537@@ -49,3 +52,5 @@ class CommandsPluginVTable :
538
539 bool init ();
540 };
541+
542+#endif /* _COMPIZ_COMMANDS_SRC_COMMANDS_H */
543diff --git a/plugins/copytex/src/copytex.h b/plugins/copytex/src/copytex.h
544index 8530c5f..ed0cd5a 100644
545--- a/plugins/copytex/src/copytex.h
546+++ b/plugins/copytex/src/copytex.h
547@@ -17,6 +17,9 @@
548 *
549 */
550
551+#ifndef _COMPIZ_COPYTEX_SRC_COPYTEX_H
552+#define _COMPIZ_COPYTEX_SRC_COPYTEX_H
553+
554 /*
555 * This plugin uses the "copy to texture" taken from Luminocity
556 * http://live.gnome.org/Luminocity
557@@ -123,3 +126,5 @@ class CopytexPluginVTable :
558 bool init ();
559
560 };
561+
562+#endif /* _COMPIZ_COPYTEX_SRC_COPYTEX_H */
563diff --git a/plugins/crashhandler/src/crashhandler.h b/plugins/crashhandler/src/crashhandler.h
564index c0b774f..b45525d 100644
565--- a/plugins/crashhandler/src/crashhandler.h
566+++ b/plugins/crashhandler/src/crashhandler.h
567@@ -20,6 +20,9 @@
568 *
569 */
570
571+#ifndef _COMPIZ_CRASHHANDLER_SRC_CRASHHANDLER_H
572+#define _COMPIZ_CRASHHANDLER_SRC_CRASHHANDLER_H
573+
574 #include <core/core.h>
575 #include <core/pluginclasshandler.h>
576 #include "crashhandler_options.h"
577@@ -46,3 +49,5 @@ class CrashPluginVTable :
578
579 bool init ();
580 };
581+
582+#endif /* _COMPIZ_CRASHHANDLER_SRC_CRASHHANDLER_H */
583diff --git a/plugins/cubeaddon/src/cubeaddon.h b/plugins/cubeaddon/src/cubeaddon.h
584index eb2e124..78b5438 100644
585--- a/plugins/cubeaddon/src/cubeaddon.h
586+++ b/plugins/cubeaddon/src/cubeaddon.h
587@@ -23,6 +23,9 @@
588 *
589 */
590
591+#ifndef _COMPIZ_CUBEADDON_SRC_CUBEADDON_H
592+#define _COMPIZ_CUBEADDON_SRC_CUBEADDON_H
593+
594 #include <stdlib.h>
595 #include <string.h>
596 #include <stdio.h>
597@@ -189,3 +192,5 @@ class CubeaddonPluginVTable :
598 public:
599 bool init ();
600 };
601+
602+#endif /* _COMPIZ_CUBEADDON_SRC_CUBEADDON_H */
603diff --git a/plugins/dbus/src/dbus.h b/plugins/dbus/src/dbus.h
604index eceadb4..a70353b 100644
605--- a/plugins/dbus/src/dbus.h
606+++ b/plugins/dbus/src/dbus.h
607@@ -26,6 +26,9 @@
608 * Copyright (C) 2009 Sam Spilsbury <smspillaz@gmail.com>
609 */
610
611+#ifndef _COMPIZ_DBUS_SRC_DBUS_H
612+#define _COMPIZ_DBUS_SRC_DBUS_H
613+
614 #include <core/screen.h>
615 #include <core/pluginclasshandler.h>
616
617@@ -235,3 +238,5 @@ class DbusPluginVTable :
618
619 #define DBUS_SCREEN(s) \
620 DbusScreen *ds = DbusScreen::get (s)
621+
622+#endif /* _COMPIZ_DBUS_SRC_DBUS_H */
623diff --git a/plugins/decor/src/decor.h b/plugins/decor/src/decor.h
624index 2696c80..4f9be59 100644
625--- a/plugins/decor/src/decor.h
626+++ b/plugins/decor/src/decor.h
627@@ -23,6 +23,9 @@
628 * Author: David Reveman <davidr@novell.com>
629 */
630
631+#ifndef _COMPIZ_DECOR_SRC_DECOR_H
632+#define _COMPIZ_DECOR_SRC_DECOR_H
633+
634 #include <boost/shared_ptr.hpp>
635 #include <boost/shared_array.hpp>
636 #include <boost/make_shared.hpp>
637@@ -401,3 +404,4 @@ class DecorPluginVTable :
638 bool init ();
639 };
640
641+#endif /* _COMPIZ_DECOR_SRC_DECOR_H */
642diff --git a/plugins/expo/src/expo.h b/plugins/expo/src/expo.h
643index 9c337e8..86c9740 100644
644--- a/plugins/expo/src/expo.h
645+++ b/plugins/expo/src/expo.h
646@@ -23,6 +23,9 @@
647 *
648 **/
649
650+#ifndef _COMPIZ_EXPO_SRC_EXPO_H
651+#define _COMPIZ_EXPO_SRC_EXPO_H
652+
653 #include <core/core.h>
654 #include <core/pluginclasshandler.h>
655
656@@ -219,3 +222,5 @@ class ExpoPluginVTable :
657
658 bool init ();
659 };
660+
661+#endif /* _COMPIZ_EXPO_SRC_EXPO_H */
662diff --git a/plugins/extrawm/src/extrawm.h b/plugins/extrawm/src/extrawm.h
663index fa02ddd..5e7e5f6 100644
664--- a/plugins/extrawm/src/extrawm.h
665+++ b/plugins/extrawm/src/extrawm.h
666@@ -19,6 +19,9 @@
667 *
668 */
669
670+#ifndef _COMPIZ_EXTRAWM_SRC_EXTRAWM_H
671+#define _COMPIZ_EXTRAWM_SRC_EXTRAWM_H
672+
673 #include <X11/Xatom.h>
674
675 #include <core/core.h>
676@@ -114,3 +117,5 @@ class ExtraWMPluginVTable :
677
678 bool init ();
679 };
680+
681+#endif /* _COMPIZ_EXTRAWM_SRC_EXTRAWM_H */
682diff --git a/plugins/ezoom/src/ezoom.h b/plugins/ezoom/src/ezoom.h
683index ff79c04..910dde0 100755
684--- a/plugins/ezoom/src/ezoom.h
685+++ b/plugins/ezoom/src/ezoom.h
686@@ -39,6 +39,9 @@
687 *
688 */
689
690+#ifndef _COMPIZ_EZOOM_SRC_EZOOM_H
691+#define _COMPIZ_EZOOM_SRC_EZOOM_H
692+
693 #include <core/core.h>
694 #include <composite/composite.h>
695 #include <opengl/opengl.h>
696@@ -401,3 +404,5 @@ class ZoomPluginVTable :
697
698 bool init ();
699 };
700+
701+#endif /* _COMPIZ_EZOOM_SRC_EZOOM_H */
702diff --git a/plugins/fade/src/fade.h b/plugins/fade/src/fade.h
703index 9cd43af..1635b9d 100644
704--- a/plugins/fade/src/fade.h
705+++ b/plugins/fade/src/fade.h
706@@ -23,6 +23,9 @@
707 * Author: David Reveman <davidr@novell.com>
708 */
709
710+#ifndef _COMPIZ_FADE_SRC_FADE_H
711+#define _COMPIZ_FADE_SRC_FADE_H
712+
713 #include <core/window.h>
714 #include <core/pluginclasshandler.h>
715 #include <composite/composite.h>
716@@ -117,3 +120,5 @@ class FadePluginVTable :
717
718 bool init ();
719 };
720+
721+#endif /* _COMPIZ_FADE_SRC_FADE_H */
722diff --git a/plugins/fadedesktop/src/fadedesktop.h b/plugins/fadedesktop/src/fadedesktop.h
723index 13df35b..4c65f1e 100644
724--- a/plugins/fadedesktop/src/fadedesktop.h
725+++ b/plugins/fadedesktop/src/fadedesktop.h
726@@ -19,6 +19,9 @@
727 *
728 **/
729
730+#ifndef _COMPIZ_FADEDESKTOP_SRC_FADEDESKTOP_H
731+#define _COMPIZ_FADEDESKTOP_SRC_FADEDESKTOP_H
732+
733 #include <core/core.h>
734 #include <core/pluginclasshandler.h>
735
736@@ -100,3 +103,5 @@ class FadedesktopPluginVTable :
737
738 bool init ();
739 };
740+
741+#endif /* _COMPIZ_FADEDESKTOP_SRC_FADEDESKTOP_H */
742diff --git a/plugins/firepaint/src/firepaint.h b/plugins/firepaint/src/firepaint.h
743index 22db853..6092bfe 100644
744--- a/plugins/firepaint/src/firepaint.h
745+++ b/plugins/firepaint/src/firepaint.h
746@@ -23,6 +23,9 @@
747 *
748 */
749
750+#ifndef _COMPIZ_FIREPAINT_SRC_FIREPAINT_H
751+#define _COMPIZ_FIREPAINT_SRC_FIREPAINT_H
752+
753 #include <core/core.h>
754 #include <composite/composite.h>
755 #include <opengl/opengl.h>
756@@ -184,3 +187,5 @@ class FirePluginVTable :
757
758 bool init ();
759 };
760+
761+#endif /* _COMPIZ_FIREPAINT_SRC_FIREPAINT_H */
762diff --git a/plugins/firepaint/src/firepaint_tex.h b/plugins/firepaint/src/firepaint_tex.h
763index 934b622..8e134cc 100644
764--- a/plugins/firepaint/src/firepaint_tex.h
765+++ b/plugins/firepaint/src/firepaint_tex.h
766@@ -18,6 +18,9 @@
767 *
768 **/
769
770+#ifndef _COMPIZ_FIREPAINT_SRC_FIREPAINT_TEX_H
771+#define _COMPIZ_FIREPAINT_SRC_FIREPAINT_TEX_H
772+
773 const unsigned char fireTex[4097] = {
774 "\0\0\0\0\377\377\377\3\377\377\377\2\377\377\377\5\377\377\377\7\377\377"
775 "\377\6\377\377\377\6\377\377\377\12\377\377\377\13\377\377\377\11\377\377"
776@@ -221,3 +224,4 @@ const unsigned char fireTex[4097] = {
777 "\0\0\0"
778 };
779
780+#endif /* _COMPIZ_FIREPAINT_SRC_FIREPAINT_TEX_H */
781diff --git a/plugins/freewins/src/action.cpp b/plugins/freewins/src/action.cpp
782index 42aa23f..2c27daa 100644
783--- a/plugins/freewins/src/action.cpp
784+++ b/plugins/freewins/src/action.cpp
785@@ -504,12 +504,6 @@ FWWindow::setPrepareRotation (float dx,
786 }
787 }
788
789-#define ROTATE_INC freewinsGetRotateIncrementAmount (w->screen)
790-#define NEG_ROTATE_INC freewinsGetRotateIncrementAmount (w->screen) *-1
791-
792-#define SCALE_INC freewinsGetScaleIncrementAmount (w->screen)
793-#define NEG_SCALE_INC freewinsGetScaleIncrementAmount (w->screen) *-1
794-
795 bool
796 FWScreen::rotate (CompAction *action,
797 CompAction::State state,
798diff --git a/plugins/freewins/src/freewins.h b/plugins/freewins/src/freewins.h
799index 18a8d3a..f6ee3c8 100644
800--- a/plugins/freewins/src/freewins.h
801+++ b/plugins/freewins/src/freewins.h
802@@ -50,6 +50,9 @@
803 * - 'Rotate' Button
804 */
805
806+#ifndef _COMPIZ_FREEWINS_SRC_FREEWINS_H
807+#define _COMPIZ_FREEWINS_SRC_FREEWINS_H
808+
809 #include <core/core.h>
810 #include <core/pluginclasshandler.h>
811 #include <composite/composite.h>
812@@ -585,3 +588,5 @@ class FWPluginVTable :
813
814 bool init ();
815 };
816+
817+#endif /* _COMPIZ_FREEWINS_SRC_FREEWINS_H */
818diff --git a/plugins/gears/src/gears.h b/plugins/gears/src/gears.h
819index 6eeae5e..0f8921c 100644
820--- a/plugins/gears/src/gears.h
821+++ b/plugins/gears/src/gears.h
822@@ -24,6 +24,9 @@
823 * http://cvsweb.xfree86.org/cvsweb/xc/programs/glxgears/glxgears.c
824 */
825
826+#ifndef _COMPIZ_GEARS_SRC_GEARS_H
827+#define _COMPIZ_GEARS_SRC_GEARS_H
828+
829 #include <cstdlib>
830 #include <cstring>
831 #include <cstdio>
832@@ -98,3 +101,4 @@ class GearsPluginVTable :
833 };
834
835
836+#endif /* _COMPIZ_GEARS_SRC_GEARS_H */
837diff --git a/plugins/gnomecompat/src/gnomecompat.h b/plugins/gnomecompat/src/gnomecompat.h
838index eb4731a..cd21048 100644
839--- a/plugins/gnomecompat/src/gnomecompat.h
840+++ b/plugins/gnomecompat/src/gnomecompat.h
841@@ -23,6 +23,9 @@
842 * Author: Danny Baumann <dannybaumann@web.de>
843 */
844
845+#ifndef _COMPIZ_GNOMECOMPAT_SRC_GNOMECOMPAT_H
846+#define _COMPIZ_GNOMECOMPAT_SRC_GNOMECOMPAT_H
847+
848 #include <core/screen.h>
849 #include <core/pluginclasshandler.h>
850
851@@ -51,3 +54,5 @@ class GnomeCompatPluginVTable :
852 public:
853 bool init ();
854 };
855+
856+#endif /* _COMPIZ_GNOMECOMPAT_SRC_GNOMECOMPAT_H */
857diff --git a/plugins/grid/src/grid.h b/plugins/grid/src/grid.h
858index 40b1801..8d1bd3e 100644
859--- a/plugins/grid/src/grid.h
860+++ b/plugins/grid/src/grid.h
861@@ -22,6 +22,9 @@
862 * Press the tiling keys several times to cycle through some tiling options.
863 */
864
865+#ifndef _COMPIZ_GRID_SRC_GRID_H
866+#define _COMPIZ_GRID_SRC_GRID_H
867+
868 #include <core/core.h>
869 #include <core/atoms.h>
870 #include <core/pluginclasshandler.h>
871@@ -248,3 +251,5 @@ class GridPluginVTable :
872 };
873
874 COMPIZ_PLUGIN_20090315 (grid, GridPluginVTable);
875+
876+#endif /* _COMPIZ_GRID_SRC_GRID_H */
877diff --git a/plugins/imgjpeg/src/imgjpeg.h b/plugins/imgjpeg/src/imgjpeg.h
878index 5a36bd8..2319e9e 100644
879--- a/plugins/imgjpeg/src/imgjpeg.h
880+++ b/plugins/imgjpeg/src/imgjpeg.h
881@@ -23,6 +23,9 @@
882 * Author: David Reveman <davidr@novell.com>
883 */
884
885+#ifndef _COMPIZ_IMGJPEG_SRC_IMGJPEG_H
886+#define _COMPIZ_IMGJPEG_SRC_IMGJPEG_H
887+
888 #include <string.h>
889 #include <ctype.h>
890 #include <stdio.h>
891@@ -85,3 +88,5 @@ class JpegPluginVTable :
892
893 bool init ();
894 };
895+
896+#endif /* _COMPIZ_IMGJPEG_SRC_IMGJPEG_H */
897diff --git a/plugins/imgsvg/src/imgsvg.h b/plugins/imgsvg/src/imgsvg.h
898index 7475906..46b844c 100644
899--- a/plugins/imgsvg/src/imgsvg.h
900+++ b/plugins/imgsvg/src/imgsvg.h
901@@ -23,6 +23,9 @@
902 * Author: David Reveman <davidr@novell.com>
903 */
904
905+#ifndef _COMPIZ_IMGSVG_SRC_IMGSVG_H
906+#define _COMPIZ_IMGSVG_SRC_IMGSVG_H
907+
908 #include "imgsvg_options.h"
909
910 #include <composite/composite.h>
911@@ -170,3 +173,5 @@ class SvgPluginVTable :
912 bool init ();
913 void fini ();
914 };
915+
916+#endif /* _COMPIZ_IMGSVG_SRC_IMGSVG_H */
917diff --git a/plugins/loginout/src/loginout.h b/plugins/loginout/src/loginout.h
918index d8b8494..e3b91a4 100644
919--- a/plugins/loginout/src/loginout.h
920+++ b/plugins/loginout/src/loginout.h
921@@ -19,6 +19,9 @@
922 *
923 */
924
925+#ifndef _COMPIZ_LOGINOUT_SRC_LOGINOUT_H
926+#define _COMPIZ_LOGINOUT_SRC_LOGINOUT_H
927+
928 #include <core/core.h>
929 #include <core/pluginclasshandler.h>
930
931@@ -113,3 +116,5 @@ class LoginoutPluginVTable :
932
933 bool init ();
934 };
935+
936+#endif /* _COMPIZ_LOGINOUT_SRC_LOGINOUT_H */
937diff --git a/plugins/mag/src/mag.h b/plugins/mag/src/mag.h
938index c13b092..2f33e28 100644
939--- a/plugins/mag/src/mag.h
940+++ b/plugins/mag/src/mag.h
941@@ -20,6 +20,9 @@
942 *
943 */
944
945+#ifndef _COMPIZ_MAG_SRC_MAG_H
946+#define _COMPIZ_MAG_SRC_MAG_H
947+
948 #include <cmath>
949
950 #include <core/core.h>
951@@ -178,3 +181,5 @@ static const char *fisheyeFpString =
952
953 "END";
954 #endif
955+
956+#endif /* _COMPIZ_MAG_SRC_MAG_H */
957diff --git a/plugins/matecompat/src/matecompat.h b/plugins/matecompat/src/matecompat.h
958index b6c66bd..4ba26c7 100644
959--- a/plugins/matecompat/src/matecompat.h
960+++ b/plugins/matecompat/src/matecompat.h
961@@ -23,6 +23,9 @@
962 * Author: Danny Baumann <dannybaumann@web.de>
963 */
964
965+#ifndef _COMPIZ_MATECOMPAT_SRC_MATECOMPAT_H
966+#define _COMPIZ_MATECOMPAT_SRC_MATECOMPAT_H
967+
968 #include <core/screen.h>
969 #include <core/pluginclasshandler.h>
970
971@@ -51,3 +54,5 @@ class MateCompatPluginVTable :
972 public:
973 bool init ();
974 };
975+
976+#endif /* _COMPIZ_MATECOMPAT_SRC_MATECOMPAT_H */
977diff --git a/plugins/maximumize/src/maximumize.h b/plugins/maximumize/src/maximumize.h
978index 9b11733..3cfc3af 100644
979--- a/plugins/maximumize/src/maximumize.h
980+++ b/plugins/maximumize/src/maximumize.h
981@@ -26,6 +26,9 @@
982 * direction as possible without overlapping with other windows.
983 */
984
985+#ifndef _COMPIZ_MAXIMUMIZE_SRC_MAXIMUMIZE_H
986+#define _COMPIZ_MAXIMUMIZE_SRC_MAXIMUMIZE_H
987+
988 #include <core/core.h>
989 #include <core/pluginclasshandler.h>
990
991@@ -158,3 +161,4 @@ class MaximumizePluginVTable :
992
993
994
995+#endif /* _COMPIZ_MAXIMUMIZE_SRC_MAXIMUMIZE_H */
996diff --git a/plugins/mblur/src/mblur.h b/plugins/mblur/src/mblur.h
997index 6b82b23..70f4ba5 100644
998--- a/plugins/mblur/src/mblur.h
999+++ b/plugins/mblur/src/mblur.h
1000@@ -23,6 +23,9 @@
1001 *
1002 */
1003
1004+#ifndef _COMPIZ_MBLUR_SRC_MBLUR_H
1005+#define _COMPIZ_MBLUR_SRC_MBLUR_H
1006+
1007 #include <cmath>
1008
1009 #include <core/core.h>
1010@@ -88,3 +91,5 @@ class MblurPluginVTable :
1011
1012 bool init ();
1013 };
1014+
1015+#endif /* _COMPIZ_MBLUR_SRC_MBLUR_H */
1016diff --git a/plugins/mousepoll/src/private.h b/plugins/mousepoll/src/private.h
1017index c21fb29..03a0909 100644
1018--- a/plugins/mousepoll/src/private.h
1019+++ b/plugins/mousepoll/src/private.h
1020@@ -20,6 +20,9 @@
1021 *
1022 */
1023
1024+#ifndef _COMPIZ_MOUSEPOLL_SRC_PRIVATE_H
1025+#define _COMPIZ_MOUSEPOLL_SRC_PRIVATE_H
1026+
1027 #include <core/core.h>
1028 #include <core/pluginclasshandler.h>
1029 #include <core/timer.h>
1030@@ -78,3 +81,5 @@ class MousepollPluginVTable :
1031 bool init ();
1032 void fini ();
1033 };
1034+
1035+#endif /* _COMPIZ_MOUSEPOLL_SRC_PRIVATE_H */
1036diff --git a/plugins/move/src/move.h b/plugins/move/src/move.h
1037index 3c4677f..493a080 100644
1038--- a/plugins/move/src/move.h
1039+++ b/plugins/move/src/move.h
1040@@ -23,6 +23,9 @@
1041 * Author: David Reveman <davidr@novell.com>
1042 */
1043
1044+#ifndef _COMPIZ_MOVE_SRC_MOVE_H
1045+#define _COMPIZ_MOVE_SRC_MOVE_H
1046+
1047 #include "move_options.h"
1048
1049 #include <core/screen.h>
1050@@ -149,3 +152,4 @@ class MovePluginVTable :
1051 bool init ();
1052 };
1053
1054+#endif /* _COMPIZ_MOVE_SRC_MOVE_H */
1055diff --git a/plugins/neg/src/neg.h b/plugins/neg/src/neg.h
1056index 420cfbc..6be384b 100644
1057--- a/plugins/neg/src/neg.h
1058+++ b/plugins/neg/src/neg.h
1059@@ -21,6 +21,9 @@
1060 *
1061 */
1062
1063+#ifndef _COMPIZ_NEG_SRC_NEG_H
1064+#define _COMPIZ_NEG_SRC_NEG_H
1065+
1066 #include <core/core.h>
1067 #include <core/pluginclasshandler.h>
1068
1069@@ -95,3 +98,5 @@ class NegPluginVTable :
1070
1071 bool init ();
1072 };
1073+
1074+#endif /* _COMPIZ_NEG_SRC_NEG_H */
1075diff --git a/plugins/notification/src/notification.h b/plugins/notification/src/notification.h
1076index bb65902..5e8d4d3 100644
1077--- a/plugins/notification/src/notification.h
1078+++ b/plugins/notification/src/notification.h
1079@@ -22,6 +22,9 @@
1080 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1081 */
1082
1083+#ifndef _COMPIZ_NOTIFICATION_SRC_NOTIFICATION_H
1084+#define _COMPIZ_NOTIFICATION_SRC_NOTIFICATION_H
1085+
1086 #include <core/core.h>
1087 #include <core/pluginclasshandler.h>
1088
1089@@ -55,3 +58,5 @@ class NotificationPluginVTable :
1090
1091 bool init ();
1092 };
1093+
1094+#endif /* _COMPIZ_NOTIFICATION_SRC_NOTIFICATION_H */
1095diff --git a/plugins/obs/src/obs.h b/plugins/obs/src/obs.h
1096index 36cbc62..7fa5553 100644
1097--- a/plugins/obs/src/obs.h
1098+++ b/plugins/obs/src/obs.h
1099@@ -23,6 +23,9 @@
1100 * Author: Danny Baumann <dannybaumann@web.de>
1101 */
1102
1103+#ifndef _COMPIZ_OBS_SRC_OBS_H
1104+#define _COMPIZ_OBS_SRC_OBS_H
1105+
1106 #include <core/screen.h>
1107 #include <core/pluginclasshandler.h>
1108
1109@@ -102,3 +105,5 @@ class ObsPluginVTable :
1110 public:
1111 bool init ();
1112 };
1113+
1114+#endif /* _COMPIZ_OBS_SRC_OBS_H */
1115diff --git a/plugins/opacify/src/opacify.h b/plugins/opacify/src/opacify.h
1116index efb1427..3f2a3f2 100644
1117--- a/plugins/opacify/src/opacify.h
1118+++ b/plugins/opacify/src/opacify.h
1119@@ -24,6 +24,9 @@
1120 *
1121 */
1122
1123+#ifndef _COMPIZ_OPACIFY_SRC_OPACIFY_H
1124+#define _COMPIZ_OPACIFY_SRC_OPACIFY_H
1125+
1126 #include <core/core.h>
1127 #include <composite/composite.h>
1128 #include <opengl/opengl.h>
1129@@ -130,3 +133,5 @@ class OpacifyPluginVTable :
1130
1131 bool init ();
1132 };
1133+
1134+#endif /* _COMPIZ_OPACIFY_SRC_OPACIFY_H */
1135diff --git a/plugins/place/src/place.h b/plugins/place/src/place.h
1136index 7d1d218..cc47b82 100644
1137--- a/plugins/place/src/place.h
1138+++ b/plugins/place/src/place.h
1139@@ -20,6 +20,9 @@
1140 * 02111-1307, USA.
1141 */
1142
1143+#ifndef _COMPIZ_PLACE_SRC_PLACE_H
1144+#define _COMPIZ_PLACE_SRC_PLACE_H
1145+
1146 #include <math.h>
1147 #include <stdlib.h>
1148 #include <string.h>
1149@@ -165,3 +168,5 @@ class PlacePluginVTable :
1150 public:
1151 bool init ();
1152 };
1153+
1154+#endif /* _COMPIZ_PLACE_SRC_PLACE_H */
1155diff --git a/plugins/put/src/put.h b/plugins/put/src/put.h
1156index 202a07f..4949880 100644
1157--- a/plugins/put/src/put.h
1158+++ b/plugins/put/src/put.h
1159@@ -17,6 +17,8 @@
1160 *
1161 */
1162
1163+#ifndef _COMPIZ_PUT_SRC_PUT_H
1164+#define _COMPIZ_PUT_SRC_PUT_H
1165
1166 #include <core/core.h>
1167 #include <core/pluginclasshandler.h>
1168@@ -211,3 +213,4 @@ class PutPluginVTable :
1169 bool init ();
1170 };
1171
1172+#endif /* _COMPIZ_PUT_SRC_PUT_H */
1173diff --git a/plugins/reflex/src/reflex.h b/plugins/reflex/src/reflex.h
1174index 05b7f35..a7b0d32 100644
1175--- a/plugins/reflex/src/reflex.h
1176+++ b/plugins/reflex/src/reflex.h
1177@@ -23,6 +23,9 @@
1178 *
1179 */
1180
1181+#ifndef _COMPIZ_REFLEX_SRC_REFLEX_H
1182+#define _COMPIZ_REFLEX_SRC_REFLEX_H
1183+
1184 #include <core/core.h>
1185 #include <composite/composite.h>
1186 #include <opengl/opengl.h>
1187@@ -110,3 +113,5 @@ class ReflexPluginVTable :
1188
1189 bool init ();
1190 };
1191+
1192+#endif /* _COMPIZ_REFLEX_SRC_REFLEX_H */
1193diff --git a/plugins/resizeinfo/src/resizeinfo.h b/plugins/resizeinfo/src/resizeinfo.h
1194index aff99cf..c21c6c4 100644
1195--- a/plugins/resizeinfo/src/resizeinfo.h
1196+++ b/plugins/resizeinfo/src/resizeinfo.h
1197@@ -21,6 +21,9 @@
1198 *
1199 **/
1200
1201+#ifndef _COMPIZ_RESIZEINFO_SRC_RESIZEINFO_H
1202+#define _COMPIZ_RESIZEINFO_SRC_RESIZEINFO_H
1203+
1204 #include <core/core.h>
1205 #include <core/pluginclasshandler.h>
1206
1207@@ -144,3 +147,5 @@ class InfoPluginVTable :
1208
1209 bool init ();
1210 };
1211+
1212+#endif /* _COMPIZ_RESIZEINFO_SRC_RESIZEINFO_H */
1213diff --git a/plugins/ring/src/ring.h b/plugins/ring/src/ring.h
1214index c275402..999a890 100644
1215--- a/plugins/ring/src/ring.h
1216+++ b/plugins/ring/src/ring.h
1217@@ -27,6 +27,9 @@
1218 *
1219 */
1220
1221+#ifndef _COMPIZ_RING_SRC_RING_H
1222+#define _COMPIZ_RING_SRC_RING_H
1223+
1224 #include <cmath>
1225
1226 #include <core/atoms.h>
1227@@ -264,3 +267,5 @@ class RingPluginVTable :
1228
1229 bool init ();
1230 };
1231+
1232+#endif /* _COMPIZ_RING_SRC_RING_H */
1233diff --git a/plugins/scaleaddon/src/scaleaddon.h b/plugins/scaleaddon/src/scaleaddon.h
1234index 6e73a43..f0a5580 100644
1235--- a/plugins/scaleaddon/src/scaleaddon.h
1236+++ b/plugins/scaleaddon/src/scaleaddon.h
1237@@ -28,6 +28,9 @@
1238 *
1239 */
1240
1241+#ifndef _COMPIZ_SCALEADDON_SRC_SCALEADDON_H
1242+#define _COMPIZ_SCALEADDON_SRC_SCALEADDON_H
1243+
1244 #include <cmath>
1245 #include <cstring>
1246 #include <X11/Xatom.h>
1247@@ -159,3 +162,5 @@ class ScaleAddonPluginVTable :
1248 public:
1249 bool init ();
1250 };
1251+
1252+#endif /* _COMPIZ_SCALEADDON_SRC_SCALEADDON_H */
1253diff --git a/plugins/scalefilter/src/scalefilter.h b/plugins/scalefilter/src/scalefilter.h
1254index 5ab1580..86ec514 100644
1255--- a/plugins/scalefilter/src/scalefilter.h
1256+++ b/plugins/scalefilter/src/scalefilter.h
1257@@ -21,6 +21,9 @@
1258 *
1259 */
1260
1261+#ifndef _COMPIZ_SCALEFILTER_SRC_SCALEFILTER_H
1262+#define _COMPIZ_SCALEFILTER_SRC_SCALEFILTER_H
1263+
1264 #include <core/core.h>
1265 #include <core/pluginclasshandler.h>
1266
1267@@ -156,3 +159,5 @@ class ScalefilterPluginVTable :
1268
1269 bool init ();
1270 };
1271+
1272+#endif /* _COMPIZ_SCALEFILTER_SRC_SCALEFILTER_H */
1273diff --git a/plugins/screenshot/src/screenshot.h b/plugins/screenshot/src/screenshot.h
1274index 25d79e1..553e1fc 100644
1275--- a/plugins/screenshot/src/screenshot.h
1276+++ b/plugins/screenshot/src/screenshot.h
1277@@ -23,6 +23,9 @@
1278 * Author: David Reveman <davidr@novell.com>
1279 */
1280
1281+#ifndef _COMPIZ_SCREENSHOT_SRC_SCREENSHOT_H
1282+#define _COMPIZ_SCREENSHOT_SRC_SCREENSHOT_H
1283+
1284 #include "screenshot_options.h"
1285
1286 #include <core/screen.h>
1287@@ -78,3 +81,5 @@ class ShotPluginVTable :
1288
1289 bool init ();
1290 };
1291+
1292+#endif /* _COMPIZ_SCREENSHOT_SRC_SCREENSHOT_H */
1293diff --git a/plugins/session/src/session.h b/plugins/session/src/session.h
1294index 335aff2..575b9da 100644
1295--- a/plugins/session/src/session.h
1296+++ b/plugins/session/src/session.h
1297@@ -23,6 +23,9 @@
1298 * Patrick Niklaus
1299 **/
1300
1301+#ifndef _COMPIZ_SESSION_SRC_SESSION_H
1302+#define _COMPIZ_SESSION_SRC_SESSION_H
1303+
1304 #include <core/core.h>
1305 #include <core/pluginclasshandler.h>
1306
1307@@ -124,3 +127,5 @@ class SessionPluginVTable :
1308 public:
1309 bool init ();
1310 };
1311+
1312+#endif /* _COMPIZ_SESSION_SRC_SESSION_H */
1313diff --git a/plugins/shelf/src/shelf.h b/plugins/shelf/src/shelf.h
1314index 0d0854a..54cea91 100644
1315--- a/plugins/shelf/src/shelf.h
1316+++ b/plugins/shelf/src/shelf.h
1317@@ -32,6 +32,9 @@
1318 * - Mouse-over?
1319 */
1320
1321+#ifndef _COMPIZ_SHELF_SRC_SHELF_H
1322+#define _COMPIZ_SHELF_SRC_SHELF_H
1323+
1324 #include <X11/extensions/shape.h>
1325 #include <X11/cursorfont.h>
1326
1327@@ -229,3 +232,5 @@ class ShelfPluginVTable :
1328 public:
1329 bool init ();
1330 };
1331+
1332+#endif /* _COMPIZ_SHELF_SRC_SHELF_H */
1333diff --git a/plugins/shift/src/shift.h b/plugins/shift/src/shift.h
1334index 5750ccf..06fa93a 100644
1335--- a/plugins/shift/src/shift.h
1336+++ b/plugins/shift/src/shift.h
1337@@ -32,6 +32,8 @@
1338 *
1339 */
1340
1341+#ifndef _COMPIZ_SHIFT_SRC_SHIFT_H
1342+#define _COMPIZ_SHIFT_SRC_SHIFT_H
1343
1344 #include <core/core.h>
1345 #include <core/pluginclasshandler.h>
1346@@ -323,3 +325,5 @@ class ShiftPluginVTable :
1347
1348 bool init ();
1349 };
1350+
1351+#endif /* _COMPIZ_SHIFT_SRC_SHIFT_H */
1352diff --git a/plugins/showdesktop/src/showdesktop.h b/plugins/showdesktop/src/showdesktop.h
1353index 23e7ae8..50daf13 100644
1354--- a/plugins/showdesktop/src/showdesktop.h
1355+++ b/plugins/showdesktop/src/showdesktop.h
1356@@ -33,6 +33,9 @@
1357 *
1358 * */
1359
1360+#ifndef _COMPIZ_SHOWDESKTOP_SRC_SHOWDESKTOP_H
1361+#define _COMPIZ_SHOWDESKTOP_SRC_SHOWDESKTOP_H
1362+
1363 #include <core/core.h>
1364 #include <composite/composite.h>
1365 #include <opengl/opengl.h>
1366@@ -268,3 +271,5 @@ class ShowdesktopPluginVTable:
1367
1368 bool init ();
1369 };
1370+
1371+#endif /* _COMPIZ_SHOWDESKTOP_SRC_SHOWDESKTOP_H */
1372diff --git a/plugins/showmouse/src/showmouse.h b/plugins/showmouse/src/showmouse.h
1373index b051345..11d79e9 100644
1374--- a/plugins/showmouse/src/showmouse.h
1375+++ b/plugins/showmouse/src/showmouse.h
1376@@ -21,6 +21,9 @@
1377 *
1378 */
1379
1380+#ifndef _COMPIZ_SHOWMOUSE_SRC_SHOWMOUSE_H
1381+#define _COMPIZ_SHOWMOUSE_SRC_SHOWMOUSE_H
1382+
1383 #include <cmath>
1384
1385 #include <core/core.h>
1386@@ -184,3 +187,5 @@ class ShowmousePluginVTable :
1387 {
1388 bool init ();
1389 };
1390+
1391+#endif /* _COMPIZ_SHOWMOUSE_SRC_SHOWMOUSE_H */
1392diff --git a/plugins/showmouse/src/showmouse_tex.h b/plugins/showmouse/src/showmouse_tex.h
1393index 08662a3..6f82c36 100644
1394--- a/plugins/showmouse/src/showmouse_tex.h
1395+++ b/plugins/showmouse/src/showmouse_tex.h
1396@@ -18,6 +18,9 @@
1397 *
1398 */
1399
1400+#ifndef _COMPIZ_SHOWMOUSE_SRC_SHOWMOUSE_TEX_H
1401+#define _COMPIZ_SHOWMOUSE_SRC_SHOWMOUSE_TEX_H
1402+
1403 static const unsigned char starTex[4097] = {
1404 "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\360\360\360\0\15"
1405 "\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"
1406@@ -214,3 +217,4 @@ static const unsigned char starTex[4097] = {
1407 "\377\377\377\0\377\377\377\0"
1408 };
1409
1410+#endif /* _COMPIZ_SHOWMOUSE_SRC_SHOWMOUSE_TEX_H */
1411diff --git a/plugins/showrepaint/src/showrepaint.h b/plugins/showrepaint/src/showrepaint.h
1412index c6ff073..1c7c1ae 100644
1413--- a/plugins/showrepaint/src/showrepaint.h
1414+++ b/plugins/showrepaint/src/showrepaint.h
1415@@ -21,6 +21,9 @@
1416 *
1417 */
1418
1419+#ifndef _COMPIZ_SHOWREPAINT_SRC_SHOWREPAINT_H
1420+#define _COMPIZ_SHOWREPAINT_SRC_SHOWREPAINT_H
1421+
1422 #include <math.h>
1423 #include <string.h>
1424
1425@@ -70,3 +73,5 @@ class ShowrepaintPluginVTable :
1426
1427 bool init ();
1428 };
1429+
1430+#endif /* _COMPIZ_SHOWREPAINT_SRC_SHOWREPAINT_H */
1431diff --git a/plugins/simple-animations/src/animationsim.h b/plugins/simple-animations/src/animationsim.h
1432index 1251125..3c2a460 100644
1433--- a/plugins/simple-animations/src/animationsim.h
1434+++ b/plugins/simple-animations/src/animationsim.h
1435@@ -1,3 +1,6 @@
1436+#ifndef _COMPIZ_SIMPLE_ANIMATIONS_SRC_ANIMATIONSIM_H
1437+#define _COMPIZ_SIMPLE_ANIMATIONS_SRC_ANIMATIONSIM_H
1438+
1439 #include <string.h>
1440 #include <stdlib.h>
1441 #include <math.h>
1442@@ -403,3 +406,5 @@ class AnimSimPluginVTable:
1443 public:
1444 bool init ();
1445 };
1446+
1447+#endif /* _COMPIZ_SIMPLE_ANIMATIONS_SRC_ANIMATIONSIM_H */
1448diff --git a/plugins/snap/src/snap.h b/plugins/snap/src/snap.h
1449index f56dc4a..f454f4b 100644
1450--- a/plugins/snap/src/snap.h
1451+++ b/plugins/snap/src/snap.h
1452@@ -26,6 +26,9 @@
1453 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1454 */
1455
1456+#ifndef _COMPIZ_SNAP_SRC_SNAP_H
1457+#define _COMPIZ_SNAP_SRC_SNAP_H
1458+
1459 #include <vector>
1460
1461 #include <core/core.h>
1462@@ -166,3 +169,4 @@ class SnapPluginVTable :
1463 bool init ();
1464 };
1465
1466+#endif /* _COMPIZ_SNAP_SRC_SNAP_H */
1467diff --git a/plugins/splash/src/splash.h b/plugins/splash/src/splash.h
1468index fcdd240..fa6946a 100644
1469--- a/plugins/splash/src/splash.h
1470+++ b/plugins/splash/src/splash.h
1471@@ -19,6 +19,9 @@
1472 *
1473 */
1474
1475+#ifndef _COMPIZ_SPLASH_SRC_SPLASH_H
1476+#define _COMPIZ_SPLASH_SRC_SPLASH_H
1477+
1478 #include <core/core.h>
1479 #include <core/pluginclasshandler.h>
1480
1481@@ -121,3 +124,5 @@ class SplashPluginVTable :
1482
1483 bool init ();
1484 };
1485+
1486+#endif /* _COMPIZ_SPLASH_SRC_SPLASH_H */
1487diff --git a/plugins/stackswitch/src/stackswitch.h b/plugins/stackswitch/src/stackswitch.h
1488index e2e6325..6da6982 100644
1489--- a/plugins/stackswitch/src/stackswitch.h
1490+++ b/plugins/stackswitch/src/stackswitch.h
1491@@ -23,6 +23,9 @@
1492 *
1493 */
1494
1495+#ifndef _COMPIZ_STACKSWITCH_SRC_STACKSWITCH_H
1496+#define _COMPIZ_STACKSWITCH_SRC_STACKSWITCH_H
1497+
1498 #include <cmath>
1499
1500 #include <X11/Xatom.h>
1501@@ -241,3 +244,5 @@ class StackswitchPluginVTable:
1502
1503 bool init ();
1504 };
1505+
1506+#endif /* _COMPIZ_STACKSWITCH_SRC_STACKSWITCH_H */
1507diff --git a/plugins/staticswitcher/src/staticswitcher.h b/plugins/staticswitcher/src/staticswitcher.h
1508index 54e3cc0..dca18f1 100644
1509--- a/plugins/staticswitcher/src/staticswitcher.h
1510+++ b/plugins/staticswitcher/src/staticswitcher.h
1511@@ -23,6 +23,9 @@
1512 *
1513 */
1514
1515+#ifndef _COMPIZ_STATICSWITCHER_SRC_STATICSWITCHER_H
1516+#define _COMPIZ_STATICSWITCHER_SRC_STATICSWITCHER_H
1517+
1518 #include <stdio.h>
1519 #include <stdlib.h>
1520 #include <string.h>
1521@@ -176,3 +179,4 @@ class StaticSwitchPluginVTable :
1522 bool init ();
1523 };
1524
1525+#endif /* _COMPIZ_STATICSWITCHER_SRC_STATICSWITCHER_H */
1526diff --git a/plugins/switcher/src/switcher.h b/plugins/switcher/src/switcher.h
1527index 3ad7311..56b0c68 100644
1528--- a/plugins/switcher/src/switcher.h
1529+++ b/plugins/switcher/src/switcher.h
1530@@ -25,6 +25,9 @@
1531 * - Auboyneau Vincent <ksamak@riseup.net> (size multiplier for A11Y)
1532 */
1533
1534+#ifndef _COMPIZ_SWITCHER_SRC_SWITCHER_H
1535+#define _COMPIZ_SWITCHER_SRC_SWITCHER_H
1536+
1537 #include <stdio.h>
1538 #include <stdlib.h>
1539 #include <string.h>
1540@@ -187,3 +190,4 @@ class SwitchPluginVTable :
1541 };
1542
1543
1544+#endif /* _COMPIZ_SWITCHER_SRC_SWITCHER_H */
1545diff --git a/plugins/td/src/3d.h b/plugins/td/src/3d.h
1546index 4d28bc9..a005325 100644
1547--- a/plugins/td/src/3d.h
1548+++ b/plugins/td/src/3d.h
1549@@ -25,6 +25,9 @@
1550 *
1551 */
1552
1553+#ifndef _COMPIZ_TD_SRC_3D_H
1554+#define _COMPIZ_TD_SRC_3D_H
1555+
1556 /** TODO:
1557 1. Add 3d shadows / projections.
1558 2. Add an option to select z-order of windows not only by viewports,
1559@@ -154,3 +157,5 @@ class TdPluginVTable :
1560
1561 bool init ();
1562 };
1563+
1564+#endif /* _COMPIZ_TD_SRC_3D_H */
1565diff --git a/plugins/text/src/private.h b/plugins/text/src/private.h
1566index a565fd4..d359f09 100644
1567--- a/plugins/text/src/private.h
1568+++ b/plugins/text/src/private.h
1569@@ -25,6 +25,9 @@
1570 *
1571 */
1572
1573+#ifndef _COMPIZ_TEXT_SRC_PRIVATE_H
1574+#define _COMPIZ_TEXT_SRC_PRIVATE_H
1575+
1576 #include <core/core.h>
1577 #include <core/pluginclasshandler.h>
1578 #include <composite/composite.h>
1579@@ -114,3 +117,5 @@ class TextPluginVTable :
1580 bool init ();
1581 void fini ();
1582 };
1583+
1584+#endif /* _COMPIZ_TEXT_SRC_PRIVATE_H */
1585diff --git a/plugins/thumbnail/src/thumbnail.h b/plugins/thumbnail/src/thumbnail.h
1586index c1cfb07..289f551 100644
1587--- a/plugins/thumbnail/src/thumbnail.h
1588+++ b/plugins/thumbnail/src/thumbnail.h
1589@@ -27,6 +27,8 @@
1590 *
1591 */
1592
1593+#ifndef _COMPIZ_THUMBNAIL_SRC_THUMBNAIL_H
1594+#define _COMPIZ_THUMBNAIL_SRC_THUMBNAIL_H
1595
1596 /* TODO:
1597 * - Make Thumbnail it's own class with methods
1598@@ -200,3 +202,5 @@ class ThumbPluginVTable :
1599 public:
1600 bool init ();
1601 };
1602+
1603+#endif /* _COMPIZ_THUMBNAIL_SRC_THUMBNAIL_H */
1604diff --git a/plugins/titleinfo/src/titleinfo.h b/plugins/titleinfo/src/titleinfo.h
1605index e88a861..acc0ac4 100644
1606--- a/plugins/titleinfo/src/titleinfo.h
1607+++ b/plugins/titleinfo/src/titleinfo.h
1608@@ -22,6 +22,10 @@
1609 * GNU General Public License for more details.
1610 *
1611 */
1612+
1613+#ifndef _COMPIZ_TITLEINFO_SRC_TITLEINFO_H
1614+#define _COMPIZ_TITLEINFO_SRC_TITLEINFO_H
1615+
1616 #ifndef _GNU_SOURCE
1617 #define _GNU_SOURCE
1618 #endif
1619@@ -108,3 +112,5 @@ class TitleinfoPluginVTable :
1620
1621 bool init ();
1622 };
1623+
1624+#endif /* _COMPIZ_TITLEINFO_SRC_TITLEINFO_H */
1625diff --git a/plugins/trailfocus/src/trailfocus.h b/plugins/trailfocus/src/trailfocus.h
1626index 21942b8..1fd637d 100644
1627--- a/plugins/trailfocus/src/trailfocus.h
1628+++ b/plugins/trailfocus/src/trailfocus.h
1629@@ -25,6 +25,9 @@
1630 *
1631 */
1632
1633+#ifndef _COMPIZ_TRAILFOCUS_SRC_TRAILFOCUS_H
1634+#define _COMPIZ_TRAILFOCUS_SRC_TRAILFOCUS_H
1635+
1636 #include <core/core.h>
1637 #include <core/pluginclasshandler.h>
1638
1639@@ -95,3 +98,5 @@ class TrailfocusPluginVTable :
1640 public:
1641 bool init ();
1642 };
1643+
1644+#endif /* _COMPIZ_TRAILFOCUS_SRC_TRAILFOCUS_H */
1645diff --git a/plugins/trip/src/trip.h b/plugins/trip/src/trip.h
1646index d7a895e..e0c719e 100644
1647--- a/plugins/trip/src/trip.h
1648+++ b/plugins/trip/src/trip.h
1649@@ -24,6 +24,9 @@
1650 *
1651 */
1652
1653+#ifndef _COMPIZ_TRIP_SRC_TRIP_H
1654+#define _COMPIZ_TRIP_SRC_TRIP_H
1655+
1656 #include <cmath>
1657
1658 #include <core/core.h>
1659@@ -190,3 +193,5 @@ static const char *rippleFpString =
1660 "TEX result.color, t1, texture[0], %s;"
1661
1662 "END";
1663+
1664+#endif /* _COMPIZ_TRIP_SRC_TRIP_H */
1665diff --git a/plugins/vpswitch/src/vpswitch.h b/plugins/vpswitch/src/vpswitch.h
1666index 7db3e45..cb1d93c 100644
1667--- a/plugins/vpswitch/src/vpswitch.h
1668+++ b/plugins/vpswitch/src/vpswitch.h
1669@@ -26,6 +26,9 @@
1670 *
1671 */
1672
1673+#ifndef _COMPIZ_VPSWITCH_SRC_VPSWITCH_H
1674+#define _COMPIZ_VPSWITCH_SRC_VPSWITCH_H
1675+
1676 #include <core/core.h>
1677 #include <core/pluginclasshandler.h>
1678 #include <core/atoms.h>
1679@@ -134,3 +137,5 @@ class VPSwitchPluginVTable :
1680
1681 bool init ();
1682 };
1683+
1684+#endif /* _COMPIZ_VPSWITCH_SRC_VPSWITCH_H */
1685diff --git a/plugins/wall/src/wall.h b/plugins/wall/src/wall.h
1686index 13e9c31..b925643 100644
1687--- a/plugins/wall/src/wall.h
1688+++ b/plugins/wall/src/wall.h
1689@@ -22,6 +22,9 @@
1690 *
1691 **/
1692
1693+#ifndef _COMPIZ_WALL_SRC_WALL_H
1694+#define _COMPIZ_WALL_SRC_WALL_H
1695+
1696 #include <core/core.h>
1697 #include <core/pluginclasshandler.h>
1698 #include <composite/composite.h>
1699@@ -207,3 +210,4 @@ class WallPluginVTable :
1700 bool init ();
1701 };
1702
1703+#endif /* _COMPIZ_WALL_SRC_WALL_H */
1704diff --git a/plugins/wallpaper/src/wallpaper.h b/plugins/wallpaper/src/wallpaper.h
1705index 265c51e..085c0bf 100644
1706--- a/plugins/wallpaper/src/wallpaper.h
1707+++ b/plugins/wallpaper/src/wallpaper.h
1708@@ -19,6 +19,9 @@
1709 *
1710 */
1711
1712+#ifndef _COMPIZ_WALLPAPER_SRC_WALLPAPER_H
1713+#define _COMPIZ_WALLPAPER_SRC_WALLPAPER_H
1714+
1715 #include <X11/Xatom.h>
1716 #include <X11/extensions/Xrender.h>
1717 #include <X11/extensions/shape.h>
1718@@ -166,3 +169,5 @@ class WallpaperPluginVTable :
1719
1720 bool init ();
1721 };
1722+
1723+#endif /* _COMPIZ_WALLPAPER_SRC_WALLPAPER_H */
1724diff --git a/plugins/water/src/water.h b/plugins/water/src/water.h
1725index 84ff09c..c5f5fc8 100644
1726--- a/plugins/water/src/water.h
1727+++ b/plugins/water/src/water.h
1728@@ -24,6 +24,9 @@
1729 * Frederic Plourde <frederic.plourde@collabora.co.uk>
1730 */
1731
1732+#ifndef _COMPIZ_WATER_SRC_WATER_H
1733+#define _COMPIZ_WATER_SRC_WATER_H
1734+
1735 #include "water_options.h"
1736 #include <core/screen.h>
1737 #include <core/pluginclasshandler.h>
1738@@ -134,3 +137,4 @@ class WaterPluginVTable :
1739 bool init ();
1740 };
1741
1742+#endif /* _COMPIZ_WATER_SRC_WATER_H */
1743diff --git a/plugins/widget/src/widget.h b/plugins/widget/src/widget.h
1744index a98d108..bec9cd4 100644
1745--- a/plugins/widget/src/widget.h
1746+++ b/plugins/widget/src/widget.h
1747@@ -30,6 +30,9 @@
1748 *
1749 */
1750
1751+#ifndef _COMPIZ_WIDGET_SRC_WIDGET_H
1752+#define _COMPIZ_WIDGET_SRC_WIDGET_H
1753+
1754 #include <core/core.h>
1755 #include <core/pluginclasshandler.h>
1756 #include <core/atoms.h>
1757@@ -179,3 +182,5 @@ class WidgetPluginVTable :
1758
1759 bool init ();
1760 };
1761+
1762+#endif /* _COMPIZ_WIDGET_SRC_WIDGET_H */
1763diff --git a/plugins/winrules/src/winrules.h b/plugins/winrules/src/winrules.h
1764index f5ccf8e..13f475b 100644
1765--- a/plugins/winrules/src/winrules.h
1766+++ b/plugins/winrules/src/winrules.h
1767@@ -21,6 +21,9 @@
1768 * Boston, MA 02110-1301, USA.
1769 */
1770
1771+#ifndef _COMPIZ_WINRULES_SRC_WINRULES_H
1772+#define _COMPIZ_WINRULES_SRC_WINRULES_H
1773+
1774 #include <core/core.h>
1775 #include <core/pluginclasshandler.h>
1776 #include <core/timer.h>
1777@@ -123,3 +126,5 @@ class WinrulesPluginVTable:
1778
1779 bool init ();
1780 };
1781+
1782+#endif /* _COMPIZ_WINRULES_SRC_WINRULES_H */
1783diff --git a/plugins/wizard/include/wizard.h b/plugins/wizard/include/wizard.h
1784index 30da3fb..87d5c7e 100644
1785--- a/plugins/wizard/include/wizard.h
1786+++ b/plugins/wizard/include/wizard.h
1787@@ -24,6 +24,9 @@
1788 *
1789 */
1790
1791+#ifndef _COMPIZ_WIZARD_INCLUDE_WIZARD_H
1792+#define _COMPIZ_WIZARD_INCLUDE_WIZARD_H
1793+
1794 #include <core/core.h>
1795 #include <composite/composite.h>
1796 #include <opengl/opengl.h>
1797@@ -233,3 +236,5 @@ class WizardPluginVTable :
1798 };
1799
1800 COMPIZ_PLUGIN_20090315 (wizard, WizardPluginVTable);
1801+
1802+#endif /* _COMPIZ_WIZARD_INCLUDE_WIZARD_H */
1803diff --git a/plugins/wizard/include/wizard_tex.h b/plugins/wizard/include/wizard_tex.h
1804index f76bf4b..c52c6c0 100644
1805--- a/plugins/wizard/include/wizard_tex.h
1806+++ b/plugins/wizard/include/wizard_tex.h
1807@@ -25,6 +25,9 @@
1808 *
1809 */
1810
1811+#ifndef _COMPIZ_WIZARD_INCLUDE_WIZARD_TEX_H
1812+#define _COMPIZ_WIZARD_INCLUDE_WIZARD_TEX_H
1813+
1814 static const unsigned char particleTex[65536] = {
1815 "\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"
1816 "\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"
1817@@ -2825,3 +2828,5 @@ static const unsigned char particleTex[65536] = {
1818 "\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"
1819 "\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"
1820 };
1821+
1822+#endif /* _COMPIZ_WIZARD_INCLUDE_WIZARD_TEX_H */
1823diff --git a/plugins/wobbly/src/wobbly.h b/plugins/wobbly/src/wobbly.h
1824index b9805c5..4c33872 100644
1825--- a/plugins/wobbly/src/wobbly.h
1826+++ b/plugins/wobbly/src/wobbly.h
1827@@ -23,6 +23,9 @@
1828 * Author: David Reveman <davidr@novell.com>
1829 */
1830
1831+#ifndef _COMPIZ_WOBBLY_SRC_WOBBLY_H
1832+#define _COMPIZ_WOBBLY_SRC_WOBBLY_H
1833+
1834 /*
1835 * Spring model implemented by Kristian Hogsberg.
1836 */
1837@@ -366,3 +369,5 @@ static int displayPrivateIndex;
1838
1839 #define NUM_OPTIONS(s) (sizeof ((s)->opt) / sizeof (CompOption))
1840 */
1841+
1842+#endif /* _COMPIZ_WOBBLY_SRC_WOBBLY_H */
1843diff --git a/plugins/workarounds/src/workarounds.h b/plugins/workarounds/src/workarounds.h
1844index 0c5d067..4c40f2b 100644
1845--- a/plugins/workarounds/src/workarounds.h
1846+++ b/plugins/workarounds/src/workarounds.h
1847@@ -24,6 +24,9 @@
1848 * This plug-in for Metacity-like workarounds.
1849 */
1850
1851+#ifndef _COMPIZ_WORKAROUNDS_SRC_WORKAROUNDS_H
1852+#define _COMPIZ_WORKAROUNDS_SRC_WORKAROUNDS_H
1853+
1854 #include <string.h>
1855 #include <limits.h>
1856
1857@@ -221,3 +224,5 @@ class WorkaroundsPluginVTable :
1858
1859 bool init ();
1860 };
1861+
1862+#endif /* _COMPIZ_WORKAROUNDS_SRC_WORKAROUNDS_H */
1863diff --git a/plugins/workspacenames/src/workspacenames.h b/plugins/workspacenames/src/workspacenames.h
1864index 53744f7..7f834f3 100644
1865--- a/plugins/workspacenames/src/workspacenames.h
1866+++ b/plugins/workspacenames/src/workspacenames.h
1867@@ -22,6 +22,9 @@
1868 *
1869 */
1870
1871+#ifndef _COMPIZ_WORKSPACENAMES_SRC_WORKSPACENAMES_H
1872+#define _COMPIZ_WORKSPACENAMES_SRC_WORKSPACENAMES_H
1873+
1874 #include <stdio.h>
1875 #include <stdlib.h>
1876 #include <math.h>
1877@@ -99,3 +102,5 @@ class WorkspacenamesPluginVTable :
1878 };
1879
1880 COMPIZ_PLUGIN_20090315 (workspacenames, WorkspacenamesPluginVTable);
1881+
1882+#endif /* _COMPIZ_WORKSPACENAMES_SRC_WORKSPACENAMES_H */
1883diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
1884index 411ea86..fcf974f 100644
1885--- a/src/CMakeLists.txt
1886+++ b/src/CMakeLists.txt
1887@@ -227,3 +227,9 @@ install (
1888 )
1889
1890 enable_coverage_report( TARGETS compiz )
1891+
1892+set_source_files_properties (
1893+ outputdevices_x11.cpp
1894+ PROPERTIES
1895+ SKIP_UNITY_BUILD_INCLUSION ON
1896+)
1897diff --git a/src/outputdevices.h b/src/outputdevices.h
1898index 34571c6..f75af79 100644
1899--- a/src/outputdevices.h
1900+++ b/src/outputdevices.h
1901@@ -22,6 +22,9 @@
1902 * DEALINGS IN THE SOFTWARE.
1903 */
1904
1905+#ifndef _COMPIZ_OUTPUTDEVICES_H
1906+#define _COMPIZ_OUTPUTDEVICES_H
1907+
1908 #include <core/output.h>
1909 #include <core/rect.h>
1910 #include <core/region.h>
1911@@ -102,3 +105,5 @@ private:
1912
1913 } // namespace core
1914 } // namespace compiz
1915+
1916+#endif /* _COMPIZ_OUTPUTDEVICES_H */
1917diff --git a/src/pluginclasshandler/tests/test-pluginclasshandler.h b/src/pluginclasshandler/tests/test-pluginclasshandler.h
1918index 284f637..08abe66 100644
1919--- a/src/pluginclasshandler/tests/test-pluginclasshandler.h
1920+++ b/src/pluginclasshandler/tests/test-pluginclasshandler.h
1921@@ -1,3 +1,6 @@
1922+#ifndef _COMPIZ_PLUGINCLASSHANDLER_TESTS_TEST_PLUGINCLASSHANDLER_H
1923+#define _COMPIZ_PLUGINCLASSHANDLER_TESTS_TEST_PLUGINCLASSHANDLER_H
1924+
1925 #include <core/pluginclasshandler.h>
1926 #include <core/pluginclasses.h>
1927
1928@@ -73,3 +76,5 @@ public:
1929
1930 compiz::plugin::internal::PluginKey key;
1931 };
1932+
1933+#endif /* _COMPIZ_PLUGINCLASSHANDLER_TESTS_TEST_PLUGINCLASSHANDLER_H */
1934diff --git a/src/privatesignalsource.h b/src/privatesignalsource.h
1935index b1db0f4..2d027b3 100644
1936--- a/src/privatesignalsource.h
1937+++ b/src/privatesignalsource.h
1938@@ -23,6 +23,9 @@
1939 * Author: Sam Spilsbury <sam.spilsbury@canonical.com>
1940 */
1941
1942+#ifndef _COMPIZ_PRIVATESIGNALSOURCE_H
1943+#define _COMPIZ_PRIVATESIGNALSOURCE_H
1944+
1945 #include <boost/function.hpp>
1946
1947 #include <glib.h>
1948@@ -53,3 +56,5 @@ class CompSignalSource
1949 int mSignal;
1950 gint mSource;
1951 };
1952+
1953+#endif /* _COMPIZ_PRIVATESIGNALSOURCE_H */

Subscribers

People subscribed via source and target branches