Merge lp:~compiz-team/compiz/fix-1060804 into lp:compiz/0.9.9

[Daniel van Vugt]

Fix numerous problems with invalid C/C++ code that prevent us from building
with clang/clang++.
(LP: #1060804)

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:3417
http://jenkins.qa.ubuntu.com/job/compiz-ci/161/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/161/console

review: Needs Fixing (continuous-integration)

[Sam Spilsbury (smspillaz)]

I have a few questions:

 1. Is there any way that we can forward declare some of the structs? I'd like to avoid over-using #include if we can, especially if we are just operating on pointer types.
 2. What is __attribute__((unused)) necessary for in the gsettings tests? Those functions are definitely used

review: Needs Information

[Sam Spilsbury (smspillaz)]

Fixing the tests was fairly straightforward, it seems that clang does not like this:

static const Foo foo;

bar (&foo);

void bar (void *data)
{
    Foo *foo = (Foo *) data;
    foo->blah = 0;
}

Instead the const needs to be cast away at the call site or you just need to drop the const. Since this data is not really writable from elsewhere anyways and we return a const *, I just dropped the const on the static variable. I'm going to see if we can get forward declarations working - it should be possible.

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:3418
http://jenkins.qa.ubuntu.com/job/compiz-ci/163/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/163/console

review: Needs Fixing (continuous-integration)

[Sam Spilsbury (smspillaz)]

Okay, looking better.

The fact that C does not let you forward-declare typedef's is a bit of a pain. Right now in order to avoid massive header proliferation, I've just moved all of the typedefs to one header file per logical "package". This means that any time you add a new type, lots of stuff is going to be recompiled, which sucks, but its better than pulling in headers for types and functions and then lots of stuff recompiling when a function changes (even when that function isn't used).

It turns out that the stuff marked __attribute__((unusued)) was meant to be deleted ages ago. Its effectively duplicated in the .cpp files.

I'm still not sure if it even runs with clang. Last time I ran it, I had trouble with a bug similar to this one: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44059 . Maybe we should add a testcase to check if that bug exists?

review: Approve

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:3420
http://jenkins.qa.ubuntu.com/job/compiz-ci/164/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/164/console

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Verified still builds. And test cases pass too. Clang and GCC.

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-compiz-core/310/console reported an error when processing this lp:~compiz-team/compiz/fix-1060804 branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-compiz-core/311/console reported an error when processing this lp:~compiz-team/compiz/fix-1060804 branch.
Not merging it.

[Martin Mrazik (mrazik)]

Maybe the last failures were due to low disk space. Trying to re-approve.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-compiz-core/312/console reported an error when processing this lp:~compiz-team/compiz/fix-1060804 branch.
Not merging it.

[Martin Mrazik (mrazik)]

Oh. The -j4 confused me. Its actually the same error as for the CI failures above:

/tmp/buildd/compiz-0.9.8.4+bzr3412stagingubuntu0+3315/gtk/window-decorator/gwd-cairo-window-decoration-util.h:24:31: fatal error: compiz/decoration.h: No such file or directorymake[3]: Leaving directory `/tmp/buildd/compiz-0.9.8.4+bzr3412stagingubuntu0+3315/obj-x86_64-linux-gnu'

Is this something that needs to be fixed on the jenkins side?

[Daniel van Vugt (vanvugt)]

Needs fixing as above

review: Needs Fixing

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:3421
http://jenkins.qa.ubuntu.com/job/compiz-ci/165/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/165/console

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-compiz-core/312/console reported an error when processing this lp:~compiz-team/compiz/fix-1060804 branch.
Not merging it.

[Daniel van Vugt (vanvugt)]

What? Same error still?...

[ 0%] In file included from /tmp/buildd/compiz-0.9.8.4+bzr3412stagingubuntu0+3315/gtk/window-decorator/gwd-cairo-window-decoration-util.c:21:0:
/tmp/buildd/compiz-0.9.8.4+bzr3412stagingubuntu0+3315/gtk/window-decorator/gwd-cairo-window-decoration-util.h:24:31: fatal error: compiz/decoration.h: No such file or directorymake[3]: Leaving directory `/tmp/buildd/compiz-0.9.8.4+bzr3412stagingubuntu0+3315/obj-x86_64-linux-gnu'

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

Yeah, that's weird because CI is compiling it just fine. Maybe the automerger got the wrong revision?

[Daniel van Vugt (vanvugt)]

review: Approve

[Daniel van Vugt (vanvugt)]

OK, merged.

Seems that I had to resubmit before Jenkins would use the latest revision.

=== modified file 'cmake/CompizCommon.cmake'
--- cmake/CompizCommon.cmake	2012-09-12 10:19:47 +0000
+++ cmake/CompizCommon.cmake	2012-10-09 03:07:19 +0000
@@ -40,7 +40,7 @@
 )
 
 # Almost everything is a shared library now, so almost everything needs -fPIC
-set (COMMON_FLAGS "-fPIC -Wall -Wl,-zdefs")
+set (COMMON_FLAGS "-fPIC -Wall")
 
 option (COMPIZ_DEPRECATED_WARNINGS "Warn about declarations marked deprecated" OFF)
 if (NOT COMPIZ_DEPRECATED_WARNINGS)
@@ -65,6 +65,11 @@
 set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}")
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS}")
 
+set (COMMON_LINKER_FLAGS "-Wl,-zdefs")
+set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${COMMON_LINKER_FLAGS}")
+set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${COMMON_LINKER_FLAGS}")
+set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${COMMON_LINKER_FLAGS}")
+
 if (IS_DIRECTORY ${CMAKE_SOURCE_DIR}/.bzr)
     set(IS_BZR_REPO 1)
 elseif (IS_DIRECTORY ${CMAKE_SOURCE_DIR}/.bzr)

=== modified file 'compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt'
--- compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt	2012-09-12 08:35:51 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt	2012-10-09 03:07:19 +0000
@@ -5,6 +5,7 @@
 if (GSETTINGS_UTIL_FOUND)
 
     set (GSETTINGS_UTIL_LIB_INCLUDES
+         ${CMAKE_CURRENT_SOURCE_DIR}
          ${CMAKE_SOURCE_DIR}/compizconfig/integration/gnome/include
          ${CMAKE_SOURCE_DIR}/compizconfig/integration/gnome/gconf/include
          ${CMAKE_SOURCE_DIR}/compizconfig/integration/gnome/gsettings/include

=== modified file 'compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.h'
--- compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.h	2012-08-11 07:03:00 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.h	2012-10-09 03:07:19 +0000
@@ -3,13 +3,11 @@
 
 #include <ccs-defs.h>
 #include <ccs-backend.h>
+#include <ccs_gsettings_backend_fwd.h>
 #include <glib.h>
 
 COMPIZCONFIG_BEGIN_DECLS
 
-typedef struct _CCSBackend CCSBackend;
-typedef struct _CCSGSettingsWrapper CCSGSettingsWrapper;
-
 Bool
 ccsGSettingsBackendAttachNewToBackend (CCSBackend *backend, CCSContext *context);
 

=== added file 'compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend_fwd.h'
--- compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend_fwd.h	1970-01-01 00:00:00 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend_fwd.h	2012-10-09 03:07:19 +0000
@@ -0,0 +1,13 @@
+#ifndef _COMPIZCONFIG_CCS_GSETTINGS_BACKEND_FWD_H
+#define _COMPIZCONFIG_CCS_GSETTINGS_BACKEND_FWD_H
+
+#include <ccs-defs.h>
+
+COMPIZCONFIG_BEGIN_DECLS
+
+typedef struct _CCSGSettingsWrapper CCSGSettingsWrapper;
+typedef struct _CCSGSettingsBackend CCSGSettingsBackend;
+
+COMPIZCONFIG_END_DECLS
+
+#endif

=== modified file 'compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend_interface.h'
--- compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend_interface.h	2012-08-17 01:39:34 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend_interface.h	2012-10-09 03:07:19 +0000
@@ -3,17 +3,13 @@
 
 #include <ccs-defs.h>
 #include <ccs-object.h>
+#include <ccs-fwd.h>
+#include <ccs_gsettings_backend_fwd.h>
 #include <glib.h>
 
 COMPIZCONFIG_BEGIN_DECLS
 
-typedef struct _CCSBackend		     CCSBackend;
-typedef struct _CCSGSettingsBackend          CCSGSettingsBackend;
-typedef struct _CCSGSettingsWrapper	     CCSGSettingsWrapper;
 typedef struct _CCSGSettingsBackendInterface CCSGSettingsBackendInterface;
-typedef struct _CCSSetting		     CCSSetting;
-typedef struct _CCSIntegratedSetting	     CCSIntegratedSetting;
-typedef struct _CCSContext		     CCSContext;
 
 typedef CCSContext * (*CCSGSettingsBackendGetContext) (CCSBackend *);
 typedef void (*CCSGSettingsBackendConnectToChangedSignal) (CCSBackend *, CCSGSettingsWrapper *);

=== modified file 'compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_interface.h'
--- compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_interface.h	2012-08-17 01:30:57 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_interface.h	2012-10-09 03:07:19 +0000
@@ -5,11 +5,12 @@
 
 COMPIZCONFIG_BEGIN_DECLS
 
+#include <ccs-object.h>
+#include <ccs_gsettings_backend_fwd.h>
+
 #include <glib.h>
 #include <gio/gio.h>
-#include <ccs-object.h>
 
-typedef struct _CCSGSettingsWrapper	      CCSGSettingsWrapper;
 typedef struct _CCSGSettingsWrapperInterface  CCSGSettingsWrapperInterface;
 
 typedef void (*CCSGSettingsWrapperSetValue) (CCSGSettingsWrapper *, const char *, GVariant *);

=== modified file 'compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_interface_wrapper.c'
--- compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_interface_wrapper.c	2012-08-11 06:58:30 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_interface_wrapper.c	2012-10-09 03:07:19 +0000
@@ -1,5 +1,7 @@
 #include <gio/gio.h>
+#include <ccs-object.h>
 #include "ccs_gsettings_interface_wrapper.h"
+#include "ccs_gsettings_interface.h"
 
 typedef struct _CCSGSettingsWrapperPrivate CCSGSettingsWrapperPrivate;
 

=== modified file 'compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_interface_wrapper.h'
--- compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_interface_wrapper.h	2012-08-11 06:58:30 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_interface_wrapper.h	2012-10-09 03:07:19 +0000
@@ -2,11 +2,11 @@
 #define _CCS_GSETTINGS_INTERFACE_WRAPPER_H
 
 #include <ccs-defs.h>
+#include <ccs-fwd.h>
+#include <ccs_gsettings_backend_fwd.h>
 
 COMPIZCONFIG_BEGIN_DECLS
 
-#include "ccs_gsettings_interface.h"
-
 CCSGSettingsWrapper *
 ccsGSettingsWrapperNewForSchemaWithPath (const char *schema,
 					 const char *path,

=== modified file 'compizconfig/gsettings/gsettings_backend_shared/gsettings_util.h'
--- compizconfig/gsettings/gsettings_backend_shared/gsettings_util.h	2012-08-10 14:42:53 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/gsettings_util.h	2012-10-09 03:07:19 +0000
@@ -2,7 +2,7 @@
 #define _COMPIZ_GSETTINGS_UTIL_H
 
 #include <ccs.h>
-#include <ccs-backend.h>
+#include <ccs_gsettings_backend_fwd.h>
 
 COMPIZCONFIG_BEGIN_DECLS
 
@@ -10,8 +10,6 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
-#include "ccs_gsettings_interface.h"
-
 /* some forward declarations */
 void
 ccsGSettingsValueChanged (GSettings   *settings,
@@ -30,12 +28,9 @@
 ccsGSettingsSetIntegration (CCSBackend *backend, CCSIntegration *integration);
 
 typedef struct _CCSGSettingsBackendPrivate CCSGSettingsBackendPrivate;
-typedef struct _CCSGSettingsBackendInterface CCSGSettingsBackendInterface;
 
 extern const CCSBackendInfo gsettingsBackendInfo;
 
-typedef struct _CCSGSettingsWrapper CCSGSettingsWrapper;
-
 gchar *
 getSchemaNameForPlugin (const char *plugin);
 

=== modified file 'compizconfig/gsettings/tests/test_gsettings_conformance.cpp'
--- compizconfig/gsettings/tests/test_gsettings_conformance.cpp	2012-09-25 06:12:24 +0000
+++ compizconfig/gsettings/tests/test_gsettings_conformance.cpp	2012-10-09 03:07:19 +0000
@@ -77,7 +77,7 @@
 	    return &gsettingsBackendInfo;
 	}
 
-	CCSBackend * SetUp (CCSContext *context, CCSContextGMock *gmockContext)
+	CCSBackend * BackendSetUp (CCSContext *context, CCSContextGMock *gmockContext)
 	{
 	    CCSGSettingsBackendInterface *overloadedInterface = NULL;
 
@@ -123,7 +123,7 @@
 	    return (CCSBackend *) mBackend;
 	}
 
-	void TearDown (CCSBackend *)
+	void BackendTearDown (CCSBackend *)
 	{
 	    GVariantBuilder noProfilesBuilder;
 	    g_variant_builder_init (&noProfilesBuilder, G_VARIANT_TYPE ("as"));

=== modified file 'compizconfig/gsettings/tests/test_gsettings_tests.cpp'
--- compizconfig/gsettings/tests/test_gsettings_tests.cpp	2012-08-21 02:00:52 +0000
+++ compizconfig/gsettings/tests/test_gsettings_tests.cpp	2012-10-09 03:07:19 +0000
@@ -996,23 +996,8 @@
 	    {
 		return !(*this == l);
 	    }
-
-	    friend bool operator== (GList *lhs, const GListContainerEqualityInterface &rhs);
-	    friend bool operator!= (GList *lhs, const GListContainerEqualityInterface &rhs);
     };
 
-    bool
-    operator== (GList *lhs, const GListContainerEqualityInterface &rhs)
-    {
-	return rhs == lhs;
-    }
-
-    bool
-    operator!= (GList *lhs, const GListContainerEqualityInterface &rhs)
-    {
-	return !(rhs == lhs);
-    }
-
     class GListContainerEqualityBase :
 	public GListContainerEqualityInterface
     {

=== modified file 'compizconfig/gsettings/tests/test_gsettings_wrapper.cpp'
--- compizconfig/gsettings/tests/test_gsettings_wrapper.cpp	2012-08-11 07:49:19 +0000
+++ compizconfig/gsettings/tests/test_gsettings_wrapper.cpp	2012-10-09 03:07:19 +0000
@@ -8,9 +8,13 @@
 #include <boost/bind.hpp>
 
 #include <glib-object.h>
+#include <gio/gio.h>
+
+#include <ccs-object.h>
+#include <ccs_gsettings_interface_wrapper.h>
+#include <ccs_gsettings_interface.h>
 
 #include "test_gsettings_tests.h"
-#include <ccs_gsettings_interface_wrapper.h>
 
 using ::testing::NotNull;
 using ::testing::Eq;

=== modified file 'compizconfig/integration/gnome/gconf/include/ccs_gnome_integration_gconf_integrated_setting.h'
--- compizconfig/integration/gnome/gconf/include/ccs_gnome_integration_gconf_integrated_setting.h	2012-08-17 06:38:07 +0000
+++ compizconfig/integration/gnome/gconf/include/ccs_gnome_integration_gconf_integrated_setting.h	2012-10-09 03:07:19 +0000
@@ -2,15 +2,12 @@
 #define _CCS_GNOME_GCONF_INTEGRATED_SETTING_H
 
 #include <ccs-defs.h>
-#include <ccs-object.h>
+#include <ccs-fwd.h>
+#include <ccs_gnome_fwd.h>
+#include <gconf/gconf-client.h>
 
 COMPIZCONFIG_BEGIN_DECLS
 
-typedef struct _CCSIntegratedSetting      CCSIntegratedSetting;
-typedef struct _CCSIntegratedSettingInfo      CCSIntegratedSettingInfo;
-typedef struct _CCSGNOMEIntegratedSettingInfo CCSGNOMEIntegratedSettingInfo;
-typedef struct _GConfClient		   GConfClient;
-
 /**
  * @brief ccsGConfIntegratedSettingNew
  * @param base a CCSGNOMEIntegratedSetting

=== modified file 'compizconfig/integration/gnome/gconf/include/ccs_gnome_integration_gconf_integrated_setting_factory.h'
--- compizconfig/integration/gnome/gconf/include/ccs_gnome_integration_gconf_integrated_setting_factory.h	2012-08-17 01:59:41 +0000
+++ compizconfig/integration/gnome/gconf/include/ccs_gnome_integration_gconf_integrated_setting_factory.h	2012-10-09 03:07:19 +0000
@@ -3,13 +3,12 @@
 
 #include <ccs-defs.h>
 #include <ccs-object.h>
+#include <ccs-fwd.h>
+#include <ccs_gnome_fwd.h>
+#include <gconf/gconf-client.h>
 
 COMPIZCONFIG_BEGIN_DECLS
 
-typedef struct _CCSIntegratedSettingFactory CCSIntegratedSettingFactory;
-typedef struct _CCSGNOMEValueChangeData CCSGNOMEValueChangeData;
-typedef struct _GConfClient GConfClient;
-
 /**
  * @brief ccsGConfIntegratedSettingFactoryNew
  * @param client an existing GConfClient or NULL

=== added file 'compizconfig/integration/gnome/gsettings/include/ccs_gnome_gsettings_fwd.h'
--- compizconfig/integration/gnome/gsettings/include/ccs_gnome_gsettings_fwd.h	1970-01-01 00:00:00 +0000
+++ compizconfig/integration/gnome/gsettings/include/ccs_gnome_gsettings_fwd.h	2012-10-09 03:07:19 +0000
@@ -0,0 +1,12 @@
+#ifndef _CCS_GNOME_INTEGRATION_GSETTINGS_FWD_H
+#define _CCS_GNOME_INTEGRATION_GSETTINGS_FWD_H
+
+#include <ccs-defs.h>
+
+COMPIZCONFIG_BEGIN_DECLS
+
+typedef struct _CCSGNOMEIntegrationGSettingsWrapperFactory CCSGNOMEIntegrationGSettingsWrapperFactory;
+
+COMPIZCONFIG_END_DECLS
+
+#endif

=== modified file 'compizconfig/integration/gnome/gsettings/include/ccs_gnome_integration_gsettings_integrated_setting.h'
--- compizconfig/integration/gnome/gsettings/include/ccs_gnome_integration_gsettings_integrated_setting.h	2012-09-25 01:23:51 +0000
+++ compizconfig/integration/gnome/gsettings/include/ccs_gnome_integration_gsettings_integrated_setting.h	2012-10-09 03:07:19 +0000
@@ -2,14 +2,12 @@
 #define _CCS_GNOME_GSETTINGS_INTEGRATED_SETTING_H
 
 #include <ccs-defs.h>
-#include <ccs-object.h>
+#include <ccs-fwd.h>
+#include <ccs_gnome_fwd.h>
+#include <ccs_gsettings_backend_fwd.h>
 
 COMPIZCONFIG_BEGIN_DECLS
 
-typedef struct _CCSIntegratedSetting      CCSIntegratedSetting;
-typedef struct _CCSGNOMEIntegratedSettingInfo CCSGNOMEIntegratedSettingInfo;
-typedef struct _CCSGSettingsWrapper       CCSGSettingsWrapper;
-
 /**
  * @brief ccsGSettingsIntegratedSettingNew
  * @param base

=== modified file 'compizconfig/integration/gnome/gsettings/include/ccs_gnome_integration_gsettings_integrated_setting_factory.h'
--- compizconfig/integration/gnome/gsettings/include/ccs_gnome_integration_gsettings_integrated_setting_factory.h	2012-09-25 06:12:24 +0000
+++ compizconfig/integration/gnome/gsettings/include/ccs_gnome_integration_gsettings_integrated_setting_factory.h	2012-10-09 03:07:19 +0000
@@ -2,20 +2,17 @@
 #define _CCS_GNOME_GCONF_INTEGRATED_SETTING_FACTORY_H
 
 #include <ccs-defs.h>
-#include <ccs-object.h>
+#include <ccs-fwd.h>
+#include <ccs_gnome_fwd.h>
+#include <ccs_gnome_gsettings_fwd.h>
+#include <gio/gio.h>
 
 COMPIZCONFIG_BEGIN_DECLS
 
-typedef struct _CCSIntegratedSettingFactory CCSIntegratedSettingFactory;
-typedef struct _CCSGNOMEValueChangeData CCSGNOMEValueChangeData;
-typedef struct _CCSGSettingsWrapper CCSGSettingsWrapper;
-typedef struct _GSettings	    GSettings;
+typedef struct _CCSGNOMEIntegrationGSettingsWrapperFactoryInterface CCSGNOMEIntegrationGSettingsWrapperFactoryInterface;
 
 typedef void (*CCSGNOMEIntegrationGSettingsChangedCallback) (GSettings *, gchar *, gpointer);
 
-typedef struct _CCSGNOMEIntegrationGSettingsWrapperFactory CCSGNOMEIntegrationGSettingsWrapperFactory;
-typedef struct _CCSGNOMEIntegrationGSettingsWrapperFactoryInterface CCSGNOMEIntegrationGSettingsWrapperFactoryInterface;
-
 typedef CCSGSettingsWrapper * (*CCSGNOMEIntegrationGSettingsWrapperFactoryNewGSettingsWrapper) (CCSGNOMEIntegrationGSettingsWrapperFactory *,
 												const gchar				   *schema,
 												CCSGNOMEIntegrationGSettingsChangedCallback callback,

=== added file 'compizconfig/integration/gnome/include/ccs_gnome_fwd.h'
--- compizconfig/integration/gnome/include/ccs_gnome_fwd.h	1970-01-01 00:00:00 +0000
+++ compizconfig/integration/gnome/include/ccs_gnome_fwd.h	2012-10-09 03:07:19 +0000
@@ -0,0 +1,13 @@
+#ifndef _CCS_GNOME_INTEGRATION_FWD_H
+#define _CCS_GNOME_INTEGRATION_FWD_H
+
+#include <ccs-defs.h>
+
+COMPIZCONFIG_BEGIN_DECLS
+
+typedef struct _CCSGNOMEIntegratedSettingInfo CCSGNOMEIntegratedSettingInfo;
+typedef struct _CCSGNOMEValueChangeData CCSGNOMEValueChangeData;
+
+COMPIZCONFIG_END_DECLS
+
+#endif

=== modified file 'compizconfig/integration/gnome/include/ccs_gnome_integrated_setting.h'
--- compizconfig/integration/gnome/include/ccs_gnome_integrated_setting.h	2012-09-23 07:33:11 +0000
+++ compizconfig/integration/gnome/include/ccs_gnome_integrated_setting.h	2012-10-09 03:07:19 +0000
@@ -2,15 +2,13 @@
 #define _CCS_GNOME_INTEGRATED_SETTING_H
 
 #include <ccs-defs.h>
-#include <ccs-object.h>
+#include <ccs-fwd.h>
+#include <ccs_gnome_fwd.h>
 
 #include "ccs_gnome_integration_types.h"
 
 COMPIZCONFIG_BEGIN_DECLS
 
-typedef struct _CCSIntegratedSettingInfo      CCSIntegratedSettingInfo;
-
-typedef struct _CCSGNOMEIntegratedSettingInfo CCSGNOMEIntegratedSettingInfo;
 typedef struct _CCSGNOMEIntegratedSettingInfoInterface CCSGNOMEIntegratedSettingInfoInterface;
 
 typedef SpecialOptionType (*CCSGNOMEIntegratedSettingInfoGetSpecialOptionType) (CCSGNOMEIntegratedSettingInfo *);

=== modified file 'compizconfig/integration/gnome/include/ccs_gnome_integration.h'
--- compizconfig/integration/gnome/include/ccs_gnome_integration.h	2012-08-17 01:59:49 +0000
+++ compizconfig/integration/gnome/include/ccs_gnome_integration.h	2012-10-09 03:07:19 +0000
@@ -2,17 +2,19 @@
 #define _CCS_COMPIZCONFIG_GNOME_GCONF_INTEGRATION
 
 #include <ccs-defs.h>
+#include <ccs-fwd.h>
+#include <ccs_gnome_fwd.h>
 #include "ccs_gnome_integration_types.h"
 
 COMPIZCONFIG_BEGIN_DECLS
 
-typedef struct _CCSGNOMEValueChangeData
+struct _CCSGNOMEValueChangeData
 {
     CCSIntegration *integration;
     CCSIntegratedSettingsStorage *storage;
     CCSIntegratedSettingFactory *factory;
     CCSContext     *context;
-} CCSGNOMEValueChangeData;
+};
 
 /**
  * @brief ccsGNOMEIntegrationBackendNew

=== modified file 'compizconfig/integration/gnome/include/ccs_gnome_integration_types.h'
--- compizconfig/integration/gnome/include/ccs_gnome_integration_types.h	2012-09-23 04:35:00 +0000
+++ compizconfig/integration/gnome/include/ccs_gnome_integration_types.h	2012-10-09 03:07:19 +0000
@@ -5,15 +5,6 @@
 
 COMPIZCONFIG_BEGIN_DECLS
 
-typedef struct _CCSBackend CCSBackend;
-typedef struct _CCSContext CCSContext;
-typedef struct _CCSObjectAllocationInterface CCSObjectAllocationInterface;
-typedef struct _CCSIntegration CCSIntegration;
-typedef struct _CCSIntegratedSetting CCSIntegratedSetting;
-typedef struct _CCSIntegratedSettingFactory CCSIntegratedSettingFactory;
-typedef struct _CCSIntegratedSettingsStorage CCSIntegratedSettingsStorage;
-typedef struct _GConfClient GConfClient;
-
 typedef enum {
     OptionInt,
     OptionBool,

=== modified file 'compizconfig/integration/gnome/src/ccs_gnome_integration_constants.c'
--- compizconfig/integration/gnome/src/ccs_gnome_integration_constants.c	2012-09-25 01:23:51 +0000
+++ compizconfig/integration/gnome/src/ccs_gnome_integration_constants.c	2012-10-09 03:07:19 +0000
@@ -447,7 +447,7 @@
 ccsGNOMEGSettingsWrapperQuarks ()
 {
     static GOnce initIntegratedSchemaQuarks = G_ONCE_INIT;
-    static const CCSGSettingsWrapperIntegratedSchemasQuarks quarks;
+    static CCSGSettingsWrapperIntegratedSchemasQuarks quarks;
 
     g_once (&initIntegratedSchemaQuarks, ccsGNOMEGSettingsIntegrationInitializeIntegratedSchemasQuarks, (gpointer) &quarks);
 

=== modified file 'compizconfig/integration/gnome/tests/compizconfig_ccs_mock_gnome_integrated_setting_composition.h'
--- compizconfig/integration/gnome/tests/compizconfig_ccs_mock_gnome_integrated_setting_composition.h	2012-09-23 07:33:11 +0000
+++ compizconfig/integration/gnome/tests/compizconfig_ccs_mock_gnome_integrated_setting_composition.h	2012-10-09 03:07:19 +0000
@@ -23,13 +23,12 @@
 #ifndef _COMPIZCONFIG_CCS_MOCK_GNOME_INTEGRATED_SETTING_COMPOSITION_H
 #define _COMPIZCONFIG_CCS_MOCK_GNOME_INTEGRATED_SETTING_COMPOSITION_H
 
+#include <ccs-defs.h>
+#include <ccs-fwd.h>
+#include <ccs_gnome_fwd.h>
+
 COMPIZCONFIG_BEGIN_DECLS
 
-typedef struct _CCSIntegratedSetting CCSIntegratedSetting;
-typedef struct _CCSGNOMEIntegratedSettingInfo CCSGNOMEIntegratedSettingInfo;
-typedef struct _CCSIntegratedSettingInfo CCSIntegratedSettingInfo;
-typedef struct _CCSObjectAllocationInterface CCSObjectAllocationInterface;
-
 CCSIntegratedSetting *
 ccsMockCompositionIntegratedSettingNew (CCSIntegratedSetting          *integratedSetting,
 					CCSGNOMEIntegratedSettingInfo *gnomeInfo,

=== modified file 'compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp'
--- compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp	2012-09-25 03:42:20 +0000
+++ compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp	2012-10-09 03:07:19 +0000
@@ -176,24 +176,12 @@
 	return std::tr1::get <0> (integrationWithMocks);
     }
 
-    CCSBackendGMock &
-    MockBackend (CCSGNOMEIntegrationWithMocks &integrationWithMocks)
-    {
-	return std::tr1::get <1> (integrationWithMocks);
-    }
-
     CCSIntegratedSettingsStorageGMock &
     MockStorage (CCSGNOMEIntegrationWithMocks &integrationWithMocks)
     {
 	return std::tr1::get <2> (integrationWithMocks);
     }
 
-    CCSIntegratedSettingFactoryGMock &
-    MockFactory (CCSGNOMEIntegrationWithMocks &integrationWithMocks)
-    {
-	return std::tr1::get <3> (integrationWithMocks);
-    }
-
     void
     IgnoreRegistration (CCSIntegratedSettingsStorageGMock &storage)
     {
@@ -519,7 +507,7 @@
 	    mButtonValue.edgeMask      = 0;
 	}
 
-	virtual void SetUp (CCSGNOMEIntegrationWithMocks &integration)
+	virtual void GnomeSetUp (CCSGNOMEIntegrationWithMocks &integration)
 	{
 	    CCSIntegratedSettingList integratedSettingsMBM =
 		    *mIntegratedSettingsMBM;
@@ -562,7 +550,7 @@
 	    vMBM->value.asString = strdup (GNOME_MOUSE_BUTTON_MODIFIERS_STRING.c_str ());
 
 	    CCSGNOMEIntegrationTestReadIntegrated::SetUp ();
-	    CCSGNOMEIntegrationTestWithMocksIntegratedMouseButtonModifiers::SetUp (mIntegration);
+	    CCSGNOMEIntegrationTestWithMocksIntegratedMouseButtonModifiers::GnomeSetUp (mIntegration);
 
 	    EXPECT_CALL (mSettingMock, getButton (_))
 		    .WillOnce (DoAll (
@@ -619,7 +607,7 @@
 	virtual void SetUp ()
 	{
 	    CCSGNOMEIntegrationTestWriteIntegrated::SetUp ();
-	    CCSGNOMEIntegrationTestWithMocksIntegratedMouseButtonModifiers::SetUp (mIntegration);
+	    CCSGNOMEIntegrationTestWithMocksIntegratedMouseButtonModifiers::GnomeSetUp (mIntegration);
 	}
 
     protected:

=== modified file 'compizconfig/libcompizconfig/include/CMakeLists.txt'
--- compizconfig/libcompizconfig/include/CMakeLists.txt	2012-09-03 07:19:30 +0000
+++ compizconfig/libcompizconfig/include/CMakeLists.txt	2012-10-09 03:07:19 +0000
@@ -1,6 +1,7 @@
 set (_headers
     ccs-backend.h
     ccs-defs.h
+    ccs-fwd.h
     ccs-list.h
     ccs-object.h
     ccs-string.h

=== modified file 'compizconfig/libcompizconfig/include/ccs-backend.h'
--- compizconfig/libcompizconfig/include/ccs-backend.h	2012-08-17 07:33:02 +0000
+++ compizconfig/libcompizconfig/include/ccs-backend.h	2012-10-09 03:07:19 +0000
@@ -22,6 +22,7 @@
 #ifndef CCS_BACKEND_H
 #define CCS_BACKEND_H
 
+#include <ccs-fwd.h>
 #include <ccs-object.h>
 #include <ccs-string.h>
 #include <ccs-list.h>
@@ -29,19 +30,6 @@
 
 COMPIZCONFIG_BEGIN_DECLS
 
-typedef struct _CCSSetting	  CCSSetting;
-typedef struct _CCSPlugin         CCSPlugin;
-typedef struct _CCSContext	  CCSContext;
-typedef struct _CCSBackend	  CCSBackend;
-typedef struct _CCSBackendInfo    CCSBackendInfo;
-typedef struct _CCSBackendPrivate CCSBackendPrivate;
-typedef struct _CCSBackendInterface  CCSBackendInterface;
-typedef struct _CCSIntegration    CCSIntegration;
-
-typedef struct _CCSSettingValue CCSSettingValue;
-typedef enum _CCSSettingType CCSSettingType;
-
-typedef struct _CCSIntegratedSettingInfo CCSIntegratedSettingInfo;
 typedef struct _CCSIntegratedSettingInfoInterface CCSIntegratedSettingInfoInterface;
 
 typedef const char * (*CCSIntegratedSettingInfoPluginName) (CCSIntegratedSettingInfo *);
@@ -68,8 +56,7 @@
     CCSObject object;
 };
 
-typedef struct _CCSIntegratedSetting CCSIntegratedSetting;
-typedef struct _CCSIntegratedSettingInterface CCSIntegratedSettingInterface;
+typedef struct _CCSIntegratedSettingInterface     CCSIntegratedSettingInterface;
 
 typedef CCSSettingValue * (*CCSIntegratedSettingReadValue) (CCSIntegratedSetting *, CCSSettingType);
 typedef void (*CCSIntegratedSettingWriteValue) (CCSIntegratedSetting *, CCSSettingValue *, CCSSettingType);
@@ -131,7 +118,6 @@
 				   CCSSettingType type,
 				   CCSObjectAllocationInterface *ai);
 
-typedef struct _CCSIntegratedSettingsStorage CCSIntegratedSettingsStorage;
 typedef struct _CCSIntegratedSettingsStorageInterface CCSIntegratedSettingsStorageInterface;
 
 /**
@@ -219,7 +205,7 @@
 CCSIntegratedSettingsStorage *
 ccsIntegratedSettingsStorageDefaultImplNew (CCSObjectAllocationInterface *ai);
 
-typedef struct _CCSIntegratedSettingFactory CCSIntegratedSettingFactory;
+
 typedef struct _CCSIntegratedSettingFactoryInterface CCSIntegratedSettingFactoryInterface;
 
 typedef CCSIntegratedSetting * (*CCSIntegratedSettingFactoryCreateIntegratedSettingForCCSSettingNameAndType) (CCSIntegratedSettingFactory *factory,
@@ -265,8 +251,7 @@
 void
 ccsFreeIntegratedSettingFactory (CCSIntegratedSettingFactory *factory);
 
-typedef struct _CCSIntegration CCSIntegration;
-typedef struct _CCSIntegrationInterface CCSIntegrationInterface;
+typedef struct _CCSIntegrationInterface           CCSIntegrationInterface;
 
 typedef CCSIntegratedSetting * (*CCSIntegrationGetIntegratedSetting) (CCSIntegration *integration,
 								      const char *pluginName,
@@ -338,6 +323,8 @@
 CCSIntegration *
 ccsNullIntegrationBackendNew (CCSObjectAllocationInterface *ai);
 
+typedef struct _CCSBackendInterface               CCSBackendInterface;
+
 /**
  * @brief CCSBackend
  *
@@ -497,10 +484,7 @@
 void ccsBackendSetIntegration (CCSBackend *backend, CCSIntegration *integration);
 void ccsFreeBackend (CCSBackend *backend);
 
-typedef struct _CCSDynamicBackend	  CCSDynamicBackend;
-typedef struct _CCSDynamicBackendPrivate CCSDynamicBackendPrivate;
 typedef struct _CCSDynamicBackendInterface  CCSDynamicBackendInterface;
-typedef struct _CCSInterfaceTable         CCSInterfaceTable;
 
 /**
  * @brief The _CCSDynamicBackend struct

=== added file 'compizconfig/libcompizconfig/include/ccs-fwd.h'
--- compizconfig/libcompizconfig/include/ccs-fwd.h	1970-01-01 00:00:00 +0000
+++ compizconfig/libcompizconfig/include/ccs-fwd.h	2012-10-09 03:07:19 +0000
@@ -0,0 +1,48 @@
+/*
+ * Compiz configuration system library
+ *
+ * Copyright (C) 2007  Dennis Kasprzyk <[e-mail]>
+ * Copyright (C) 2007  Danny Baumann <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <ccs-defs.h>
+
+#ifndef _CSS_FWD_H
+#define _CSS_FWD_H
+
+COMPIZCONFIG_BEGIN_DECLS
+
+typedef struct _CCSObject                    CCSObject;
+typedef struct _CCSObjectAllocationInterface CCSObjectAllocationInterface;
+typedef struct _CCSSetting	             CCSSetting;
+typedef struct _CCSPlugin                    CCSPlugin;
+typedef struct _CCSContext	             CCSContext;
+typedef struct _CCSBackend	             CCSBackend;
+typedef struct _CCSBackendInfo               CCSBackendInfo;
+typedef struct _CCSDynamicBackend	     CCSDynamicBackend;
+typedef struct _CCSIntegration               CCSIntegration;
+typedef struct _CCSSettingValue              CCSSettingValue;
+typedef struct _CCSIntegratedSettingInfo     CCSIntegratedSettingInfo;
+typedef struct _CCSIntegratedSetting         CCSIntegratedSetting;
+typedef struct _CCSIntegratedSettingFactory  CCSIntegratedSettingFactory;
+typedef struct _CCSIntegratedSettingsStorage CCSIntegratedSettingsStorage;
+typedef struct _CCSInterfaceTable            CCSInterfaceTable;
+
+COMPIZCONFIG_END_DECLS
+
+#endif
+

=== modified file 'compizconfig/libcompizconfig/include/ccs-object.h'
--- compizconfig/libcompizconfig/include/ccs-object.h	2012-08-16 04:13:30 +0000
+++ compizconfig/libcompizconfig/include/ccs-object.h	2012-10-09 03:07:19 +0000
@@ -24,12 +24,12 @@
 #define _CCS_OBJECT_H
 
 #include <ccs-defs.h>
+#include <ccs-fwd.h>
 
 COMPIZCONFIG_BEGIN_DECLS
 
 typedef struct _CCSInterface CCSInterface; /* Dummy typedef */
 typedef struct _CCSPrivate CCSPrivate; /* Dummy typedef */
-typedef struct _CCSObject CCSObject;
 
 typedef void * (*reallocObjectProc) (void *, void *, size_t);
 typedef void * (*mallocObjectProc) (void *, size_t);
@@ -50,14 +50,14 @@
  * use this interface as a means to allocate their own data so
  * that tests for those objects can test allocation failures
  */
-typedef struct _CCSObjectAllocationInterface
+struct _CCSObjectAllocationInterface
 {
     reallocObjectProc realloc_;
     mallocObjectProc  malloc_;
     callocObjectProc  calloc_;
     freeObjectProc    free_;
     void              *allocator;
-} CCSObjectAllocationInterface;
+};
 
 extern CCSObjectAllocationInterface ccsDefaultObjectAllocator;
 

=== modified file 'compizconfig/libcompizconfig/include/ccs.h'
--- compizconfig/libcompizconfig/include/ccs.h	2012-09-25 01:26:54 +0000
+++ compizconfig/libcompizconfig/include/ccs.h	2012-10-09 03:07:19 +0000
@@ -69,15 +69,10 @@
 
 void ccsLog (const char *domain, CCSLogLevel level, const char *fmt, ...);
 
-typedef struct _CCSContext	  CCSContext;
-typedef struct _CCSPlugin	  CCSPlugin;
-typedef struct _CCSSetting	  CCSSetting;
 typedef struct _CCSGroup	  CCSGroup;
 typedef struct _CCSSubGroup	  CCSSubGroup;
 typedef struct _CCSPluginCategory CCSPluginCategory;
-typedef struct _CCSSettingValue	  CCSSettingValue;
 typedef struct _CCSPluginConflict CCSPluginConflict;
-typedef struct _CCSBackendInfo	  CCSBackendInfo;
 typedef struct _CCSIntDesc	  CCSIntDesc;
 typedef struct _CCSStrRestriction CCSStrRestriction;
 typedef struct _CCSStrExtension   CCSStrExtension;
@@ -106,11 +101,9 @@
 CCSREF_HDR (StrRestriction, CCSStrRestriction)
 CCSREF_HDR (StrExtension, CCSStrExtension)
 
-typedef struct _CCSInterfaceTable CCSInterfaceTable;
 typedef struct _CCSContextInterface CCSContextInterface;
 typedef struct _CCSPluginInterface CCSPluginInterface;
 typedef struct _CCSSettingInterface CCSSettingInterface;
-typedef struct _CCSDynamicBackendInterface CCSDynamicBackendInterface;
 
 struct _CCSInterfaceTable
 {

=== modified file 'compizconfig/libcompizconfig/src/ccs_settings_upgrade_internal.h'
--- compizconfig/libcompizconfig/src/ccs_settings_upgrade_internal.h	2012-09-10 01:06:55 +0000
+++ compizconfig/libcompizconfig/src/ccs_settings_upgrade_internal.h	2012-10-09 03:07:19 +0000
@@ -23,12 +23,11 @@
 #ifndef _COMPIZCONFIG_CCS_SETTINGS_UPGRADE_INTERNAL_H
 #define _COMPIZCONFIG_CCS_SETTINGS_UPGRADE_INTERNAL_H
 
-#include "ccs-defs.h"
+#include <ccs-defs.h>
+#include <ccs.h>
 
 COMPIZCONFIG_BEGIN_DECLS
 
-typedef struct _CCSSettingList * CCSSettingList;
-
 Bool
 ccsUpgradeGetDomainNumAndProfile (const char   *name,
 				  char         **domain,

=== modified file 'compizconfig/libcompizconfig/src/ccs_text_file.h'
--- compizconfig/libcompizconfig/src/ccs_text_file.h	2012-09-10 01:26:26 +0000
+++ compizconfig/libcompizconfig/src/ccs_text_file.h	2012-10-09 03:07:19 +0000
@@ -26,12 +26,11 @@
 #define CCS_TEXT_FILE_H
 
 #include <ccs-defs.h>
+#include <ccs-object.h>
+#include "ccs_text_file_interface.h"
 
 COMPIZCONFIG_BEGIN_DECLS
 
-typedef struct _CCSTextFile CCSTextFile;
-typedef struct _CCSObjectAllocationInterface CCSObjectAllocationInterface;
-
 typedef enum _CCSTextFileOpenMode
 {
     ReadOnly = 1,

=== modified file 'compizconfig/libcompizconfig/tests/compizconfig_test_ccs_mock_backend_conformance.cpp'
--- compizconfig/libcompizconfig/tests/compizconfig_test_ccs_mock_backend_conformance.cpp	2012-09-22 03:59:35 +0000
+++ compizconfig/libcompizconfig/tests/compizconfig_test_ccs_mock_backend_conformance.cpp	2012-10-09 03:07:19 +0000
@@ -251,7 +251,7 @@
 
     public:
 
-	CCSBackend * SetUp (CCSContext *context, CCSContextGMock *gmockContext)
+	CCSBackend * BackendSetUp (CCSContext *context, CCSContextGMock *gmockContext)
 	{
 	    mContext = context;
 	    mBackend = ccsMockBackendNew ();
@@ -295,7 +295,7 @@
 	    return &mockBackendInfo;
 	}
 
-	void TearDown (CCSBackend *backend)
+	void BackendTearDown (CCSBackend *backend)
 	{
 	    ccsFreeMockBackend (backend);
 	}

=== modified file 'compizconfig/libcompizconfig/tests/compizconfig_test_ccs_settings_upgrade_internal.cpp'
--- compizconfig/libcompizconfig/tests/compizconfig_test_ccs_settings_upgrade_internal.cpp	2012-09-23 16:46:19 +0000
+++ compizconfig/libcompizconfig/tests/compizconfig_test_ccs_settings_upgrade_internal.cpp	2012-10-09 03:07:19 +0000
@@ -568,23 +568,11 @@
     }
 
     void
-    ccsStringListDeepFree (CCSStringList list)
-    {
-	ccsStringListFree (list, TRUE);
-    }
-
-    void
     ccsSettingValueListDeepFree (CCSSettingValueList list)
     {
 	ccsSettingValueListFree (list, TRUE);
     }
 
-    void
-    ccsSettingValueListShallowFree (CCSSettingValueList list)
-    {
-	ccsSettingValueListFree (list, FALSE);
-    }
-
     typedef boost::shared_ptr <cc::ListWrapper <CCSStringList, CCSString *> > CCSStringListWrapperPtr;
 
     CCSStringListWrapperPtr

=== modified file 'compizconfig/tests/compizconfig_backend_concept_test.h'
--- compizconfig/tests/compizconfig_backend_concept_test.h	2012-09-22 03:59:35 +0000
+++ compizconfig/tests/compizconfig_backend_concept_test.h	2012-10-09 03:07:19 +0000
@@ -23,6 +23,18 @@
 #ifndef _COMPIZCONFIG_CCS_BACKEND_CONCEPT_TEST
 #define _COMPIZCONFIG_CCS_BACKEND_CONCEPT_TEST
 
+#ifdef __clang__
+#include <boost/version.hpp>
+#if BOOST_VERSION < 104700
+#error "Boost 1.47 or later is required (http://clang.llvm.org/compatibility.html#deleted-special-func)"
+#endif
+/* Work around a bug in clang which marks functions used by
+ * uninstantiated templates as unused */
+#define COMPIZ_TEMPLATE_EXPECTATION_CHECK COMPIZ_TEMPLATE_EXPECTATION_CHECK
+#else
+#define COMPIZ_TEMPLATE_EXPECTATION_CHECK
+#endif
+
 #include <list>
 
 #include <boost/variant.hpp>
@@ -188,14 +200,6 @@
 using ::testing::AtLeast;
 using ::testing::NiceMock;
 
-namespace
-{
-    bool ccsStringCmp (const CCSString &a, const CCSString &b)
-    {
-	return std::string (a.value) == b.value;
-    }
-}
-
 namespace cci = compiz::config::impl;
 namespace cc  = compiz::config;
 
@@ -209,294 +213,6 @@
 			unsigned int,
 			cci::SettingValueListWrapper::Ptr> VariantTypes;
 
-namespace
-{
-
-typedef boost::function <void ()> WriteFunc;
-
-Bool boolToBool (bool v) { return v ? TRUE : FALSE; }
-
-CCSSettingGMock * getSettingGMockFromSetting (const boost::shared_ptr <CCSSetting> &setting) { return (CCSSettingGMock *) ccsObjectGetPrivate (setting.get ()); }
-
-void SetIntWriteExpectation (const std::string &plugin,
-			     const std::string &key,
-			     const VariantTypes &value,
-			     const boost::shared_ptr <CCSSetting> &setting,
-			     const WriteFunc &write,
-			     const CCSBackendConceptTestEnvironmentInterface::Ptr &env)
-{
-    CCSSettingGMock *gmock (getSettingGMockFromSetting (setting));
-    EXPECT_CALL (*gmock, getInt (_)).WillRepeatedly (DoAll (
-							 SetArgPointee <0> (
-							     boost::get <int> (value)),
-							 Return (TRUE)));
-    write ();
-    EXPECT_EQ (env->ReadIntegerAtKey (plugin, key), boost::get <int> (value));
-}
-
-void SetBoolWriteExpectation (const std::string &plugin,
-			      const std::string &key,
-			      const VariantTypes &value,
-			      const boost::shared_ptr <CCSSetting> &setting,
-			      const WriteFunc &write,
-			      const CCSBackendConceptTestEnvironmentInterface::Ptr &env)
-{
-    CCSSettingGMock *gmock (getSettingGMockFromSetting (setting));
-    EXPECT_CALL (*gmock, getBool (_)).WillRepeatedly (DoAll (
-							 SetArgPointee <0> (
-							     boolToBool (boost::get <bool> (value))),
-							 Return (TRUE)));
-    write ();
-
-    bool v (boost::get <bool> (value));
-
-    if (v)
-	EXPECT_THAT (env->ReadBoolAtKey (plugin, key), IsTrue ());
-    else
-	EXPECT_THAT (env->ReadBoolAtKey (plugin, key), IsFalse ());
-}
-
-void SetFloatWriteExpectation (const std::string &plugin,
-			       const std::string &key,
-			       const VariantTypes &value,
-			       const boost::shared_ptr <CCSSetting> &setting,
-			       const WriteFunc &write,
-			       const CCSBackendConceptTestEnvironmentInterface::Ptr &env)
-{
-    CCSSettingGMock *gmock (getSettingGMockFromSetting (setting));
-    EXPECT_CALL (*gmock, getFloat (_)).WillRepeatedly (DoAll (
-							 SetArgPointee <0> (
-							     boost::get <float> (value)),
-							 Return (TRUE)));
-    write ();
-    EXPECT_EQ (env->ReadFloatAtKey (plugin, key), boost::get <float> (value));
-}
-
-void SetStringWriteExpectation (const std::string &plugin,
-				const std::string &key,
-				const VariantTypes &value,
-				const boost::shared_ptr <CCSSetting> &setting,
-				const WriteFunc &write,
-				const CCSBackendConceptTestEnvironmentInterface::Ptr &env)
-{
-    CCSSettingGMock *gmock (getSettingGMockFromSetting (setting));
-    EXPECT_CALL (*gmock, getString (_)).WillRepeatedly (DoAll (
-							 SetArgPointee <0> (
-							     const_cast <char *> (boost::get <const char *> (value))),
-							 Return (TRUE)));
-    write ();
-    EXPECT_EQ (std::string (env->ReadStringAtKey (plugin, key)), std::string (boost::get <const char *> (value)));
-}
-
-void SetColorWriteExpectation (const std::string &plugin,
-			       const std::string &key,
-			       const VariantTypes &value,
-			       const boost::shared_ptr <CCSSetting> &setting,
-			       const WriteFunc &write,
-			       const CCSBackendConceptTestEnvironmentInterface::Ptr &env)
-{
-    CCSSettingGMock *gmock (getSettingGMockFromSetting (setting));
-    EXPECT_CALL (*gmock, getColor (_)).WillRepeatedly (DoAll (
-							 SetArgPointee <0> (
-							     boost::get <CCSSettingColorValue> (value)),
-							 Return (TRUE)));
-    write ();
-
-    EXPECT_EQ (env->ReadColorAtKey (plugin, key), boost::get <CCSSettingColorValue> (value));
-}
-
-void SetKeyWriteExpectation (const std::string &plugin,
-			     const std::string &key,
-			     const VariantTypes &value,
-			     const boost::shared_ptr <CCSSetting> &setting,
-			     const WriteFunc &write,
-			     const CCSBackendConceptTestEnvironmentInterface::Ptr &env)
-{
-    CCSSettingGMock *gmock (getSettingGMockFromSetting (setting));
-    EXPECT_CALL (*gmock, getKey (_)).WillRepeatedly (DoAll (
-							 SetArgPointee <0> (
-							     boost::get <CCSSettingKeyValue> (value)),
-							 Return (TRUE)));
-    write ();
-    EXPECT_EQ (env->ReadKeyAtKey (plugin, key), boost::get <CCSSettingKeyValue> (value));
-}
-
-void SetButtonWriteExpectation (const std::string &plugin,
-				const std::string &key,
-				const VariantTypes &value,
-				const boost::shared_ptr <CCSSetting> &setting,
-				const WriteFunc &write,
-				const CCSBackendConceptTestEnvironmentInterface::Ptr &env)
-{
-    CCSSettingGMock *gmock (getSettingGMockFromSetting (setting));
-    EXPECT_CALL (*gmock, getButton (_)).WillRepeatedly (DoAll (
-							 SetArgPointee <0> (
-							     boost::get <CCSSettingButtonValue> (value)),
-							 Return (TRUE)));
-    write ();
-    EXPECT_EQ (env->ReadButtonAtKey (plugin, key), boost::get <CCSSettingButtonValue> (value));
-}
-
-void SetEdgeWriteExpectation (const std::string &plugin,
-			      const std::string &key,
-			      const VariantTypes &value,
-			      const boost::shared_ptr <CCSSetting> &setting,
-			      const WriteFunc &write,
-			      const CCSBackendConceptTestEnvironmentInterface::Ptr &env)
-{
-    CCSSettingGMock *gmock (getSettingGMockFromSetting (setting));
-    EXPECT_CALL (*gmock, getEdge (_)).WillRepeatedly (DoAll (
-							 SetArgPointee <0> (
-							     boost::get <unsigned int> (value)),
-							 Return (TRUE)));
-    write ();
-    EXPECT_EQ (env->ReadEdgeAtKey (plugin, key), boost::get <unsigned int> (value));
-}
-
-void SetBellWriteExpectation (const std::string &plugin,
-			      const std::string &key,
-			      const VariantTypes &value,
-			      const boost::shared_ptr <CCSSetting> &setting,
-			      const WriteFunc &write,
-			      const CCSBackendConceptTestEnvironmentInterface::Ptr &env)
-{
-    CCSSettingGMock *gmock (getSettingGMockFromSetting (setting));
-    EXPECT_CALL (*gmock, getBell (_)).WillRepeatedly (DoAll (
-							 SetArgPointee <0> (
-							     boolToBool (boost::get <bool> (value))),
-							 Return (TRUE)));
-    write ();
-    bool v (boost::get <bool> (value));
-
-    if (v)
-	EXPECT_THAT (env->ReadBellAtKey (plugin, key), IsTrue ());
-    else
-	EXPECT_THAT (env->ReadBellAtKey (plugin, key), IsFalse ());
-}
-
-void SetMatchWriteExpectation (const std::string &plugin,
-			       const std::string &key,
-			       const VariantTypes &value,
-			       const boost::shared_ptr <CCSSetting> &setting,
-			       const WriteFunc &write,
-			       const CCSBackendConceptTestEnvironmentInterface::Ptr &env)
-{
-    CCSSettingGMock *gmock (getSettingGMockFromSetting (setting));
-    EXPECT_CALL (*gmock, getMatch (_)).WillRepeatedly (DoAll (
-							 SetArgPointee <0> (
-							     const_cast <char *> (boost::get <const char *> (value))),
-							 Return (TRUE)));
-    write ();
-    EXPECT_EQ (std::string (env->ReadMatchAtKey (plugin, key)), std::string (boost::get <const char *> (value)));
-}
-
-void SetListWriteExpectation (const std::string &plugin,
-			      const std::string &key,
-			      const VariantTypes &value,
-			      const boost::shared_ptr <CCSSetting> &setting,
-			      const WriteFunc &write,
-			      const CCSBackendConceptTestEnvironmentInterface::Ptr &env)
-{
-    CCSSettingGMock *gmock (getSettingGMockFromSetting (setting));
-    CCSSettingValueList list = *(boost::get <boost::shared_ptr <cci::SettingValueListWrapper> > (value));
-
-    EXPECT_CALL (*gmock, getInfo ());
-
-    CCSSettingInfo      *info = ccsSettingGetInfo (setting.get ());
-
-    info->forList.listType = (boost::get <boost::shared_ptr <cci::SettingValueListWrapper> > (value))->type ();
-
-    EXPECT_CALL (*gmock, getInfo ()).Times (AtLeast (1));
-    EXPECT_CALL (*gmock, getList (_)).WillRepeatedly (DoAll (
-							 SetArgPointee <0> (
-							     list),
-							 Return (TRUE)));
-    write ();
-
-    EXPECT_THAT (cci::SettingValueListWrapper (env->ReadListAtKey (plugin, key, setting.get ()),
-								   cci::Deep,
-								   info->forList.listType,
-								   boost::shared_ptr <CCSSettingInfo> (),
-								   setting),
-		 ListEqual (&info->forList, list));
-}
-
-void SetIntReadExpectation (CCSSettingGMock *gmock, const VariantTypes &value)
-{
-    EXPECT_CALL (*gmock, setInt (boost::get <int> (value), _));
-}
-
-void SetBoolReadExpectation (CCSSettingGMock *gmock, const VariantTypes &value)
-{
-    bool v (boost::get <bool> (value));
-
-    if (v)
-	EXPECT_CALL (*gmock, setBool (IsTrue (), _));
-    else
-	EXPECT_CALL (*gmock, setBool (IsFalse (), _));
-}
-
-void SetBellReadExpectation (CCSSettingGMock *gmock, const VariantTypes &value)
-{
-    bool v (boost::get <bool> (value));
-
-    if (v)
-	EXPECT_CALL (*gmock, setBell (IsTrue (), _));
-    else
-	EXPECT_CALL (*gmock, setBell (IsFalse (), _));
-}
-
-void SetFloatReadExpectation (CCSSettingGMock *gmock, const VariantTypes &value)
-{
-    EXPECT_CALL (*gmock, setFloat (boost::get <float> (value), _));
-}
-
-void SetStringReadExpectation (CCSSettingGMock *gmock, const VariantTypes &value)
-{
-    EXPECT_CALL (*gmock, setString (Eq (std::string (boost::get <const char *> (value))), _));
-}
-
-void SetMatchReadExpectation (CCSSettingGMock *gmock, const VariantTypes &value)
-{
-    EXPECT_CALL (*gmock, setMatch (Eq (std::string (boost::get <const char *> (value))), _));
-}
-
-void SetColorReadExpectation (CCSSettingGMock *gmock, const VariantTypes &value)
-{
-    EXPECT_CALL (*gmock, setColor (boost::get <CCSSettingColorValue> (value), _));
-}
-
-void SetKeyReadExpectation (CCSSettingGMock *gmock, const VariantTypes &value)
-{
-    EXPECT_CALL (*gmock, setKey (boost::get <CCSSettingKeyValue> (value), _));
-}
-
-void SetButtonReadExpectation (CCSSettingGMock *gmock, const VariantTypes &value)
-{
-    EXPECT_CALL (*gmock, setButton (boost::get <CCSSettingButtonValue> (value), _));
-}
-
-void SetEdgeReadExpectation (CCSSettingGMock *gmock, const VariantTypes &value)
-{
-    EXPECT_CALL (*gmock, setEdge (boost::get <unsigned int> (value), _));
-}
-
-CCSSettingInfo globalListInfo;
-
-void SetListReadExpectation (CCSSettingGMock *gmock, const VariantTypes &value)
-{
-    globalListInfo.forList.listType = (boost::get <boost::shared_ptr <cci::SettingValueListWrapper> > (value))->type ();
-    globalListInfo.forList.listInfo = NULL;
-
-    ON_CALL (*gmock, getInfo ()).WillByDefault (Return (&globalListInfo));
-    EXPECT_CALL (*gmock, setList (
-			    ListEqual (
-				&globalListInfo.forList,
-				*(boost::get <boost::shared_ptr <cci::SettingValueListWrapper> > (value))), _));
-}
-
-}
-
 class CCSBackendConceptTestParamInterface
 {
     public:
@@ -516,7 +232,7 @@
 				       const compizconfig::test::WriteFunc                  &,
 				       const CCSBackendConceptTestEnvironmentInterface::Ptr &)> SetWriteExpectation;
 
-	virtual void TearDown (CCSBackend *) = 0;
+	virtual void BackendTearDown (CCSBackend *) = 0;
 
 	virtual CCSBackendConceptTestEnvironmentInterface::Ptr testEnv () = 0;
 	virtual VariantTypes & value () = 0;
@@ -559,10 +275,10 @@
 	{
 	}
 
-	void TearDown (CCSBackend *b)
+	void BackendTearDown (CCSBackend *b)
 	{
 	    if (mTestEnv)
-		mTestEnv->TearDown (b);
+		mTestEnv->BackendTearDown (b);
 
 	    mTestEnv.reset ();
 	}
@@ -699,13 +415,13 @@
 	virtual void SetUp ()
 	{
 	    SetupContext ();
-	    mBackend = mTestEnv->SetUp (context.get (), gmockContext);
+	    mBackend = mTestEnv->BackendSetUp (context.get (), gmockContext);
 	}
 
 	virtual void TearDown ()
 	{
 	    if (mTestEnv)
-		mTestEnv->TearDown (mBackend);
+		mTestEnv->BackendTearDown (mBackend);
 
 	    mTestEnv.reset ();
 	}
@@ -726,12 +442,12 @@
 	virtual void SetUp ()
 	{
 	    SetupContext ();
-	    mBackend = GetParam ()->testEnv ()->SetUp (context.get (), gmockContext);
+	    mBackend = GetParam ()->testEnv ()->BackendSetUp (context.get (), gmockContext);
 	}
 
 	virtual void TearDown ()
 	{
-	    CCSBackendConformanceTestParameterized::GetParam ()->TearDown (mBackend);
+	    CCSBackendConformanceTestParameterized::GetParam ()->BackendTearDown (mBackend);
 	}
 };
 

=== modified file 'compizconfig/tests/compizconfig_backend_concept_test_environment_interface.h'
--- compizconfig/tests/compizconfig_backend_concept_test_environment_interface.h	2012-09-12 08:35:51 +0000
+++ compizconfig/tests/compizconfig_backend_concept_test_environment_interface.h	2012-10-09 03:07:19 +0000
@@ -42,9 +42,9 @@
 	typedef boost::shared_ptr <CCSBackendConceptTestEnvironmentInterface> Ptr;
 
 	virtual ~CCSBackendConceptTestEnvironmentInterface () {};
-	virtual CCSBackend * SetUp (CCSContext *context,
+	virtual CCSBackend * BackendSetUp (CCSContext *context,
 				    CCSContextGMock *gmockContext) = 0;
-	virtual void TearDown (CCSBackend *) = 0;
+	virtual void BackendTearDown (CCSBackend *) = 0;
 
 	virtual void AddProfile (const std::string &profile) = 0;
 	virtual void SetGetExistingProfilesExpectation (CCSContext *,

=== modified file 'gtk/window-decorator/CMakeLists.txt'
--- gtk/window-decorator/CMakeLists.txt	2012-09-05 14:25:35 +0000
+++ gtk/window-decorator/CMakeLists.txt	2012-10-09 03:07:19 +0000
@@ -5,6 +5,7 @@
     endif (COMPIZ_BUILD_WITH_RPATH)
 
     include_directories (
+        ${CMAKE_CURRENT_SOURCE_DIR}
 	${compiz_SOURCE_DIR}/include
 	${CMAKE_BINARY_DIR}/gtk
 	${GTK_WINDOW_DECORATOR_INCLUDE_DIRS}

=== modified file 'gtk/window-decorator/blurprops.c'
--- gtk/window-decorator/blurprops.c	2012-08-27 15:40:30 +0000
+++ gtk/window-decorator/blurprops.c	2012-10-09 03:07:19 +0000
@@ -20,6 +20,7 @@
  */
 
 #include "gtk-window-decorator.h"
+#include "gwd-settings-interface.h"
 
 void
 decor_update_blur_property (decor_t *d,

=== modified file 'gtk/window-decorator/events.c'
--- gtk/window-decorator/events.c	2012-09-27 09:03:24 +0000
+++ gtk/window-decorator/events.c	2012-10-09 03:07:19 +0000
@@ -23,7 +23,8 @@
  *        Authored By: Sam Spilsbury <[e-mail]>
  */
 
-#include "gtk-window-decorator.h" 
+#include "gtk-window-decorator.h"
+#include "gwd-settings-interface.h"
 
 void
 move_resize_window (WnckWindow *win,

=== modified file 'gtk/window-decorator/gtk-window-decorator.c'
--- gtk/window-decorator/gtk-window-decorator.c	2012-09-27 09:03:24 +0000
+++ gtk/window-decorator/gtk-window-decorator.c	2012-10-09 03:07:19 +0000
@@ -26,6 +26,7 @@
 #include "gtk-window-decorator.h"
 #include "gwd-settings-writable-interface.h"
 #include "gwd-settings.h"
+#include "gwd-settings-interface.h"
 #include "gwd-settings-notified-interface.h"
 #include "gwd-settings-notified.h"
 

=== modified file 'gtk/window-decorator/gtk-window-decorator.h'
--- gtk/window-decorator/gtk-window-decorator.h	2012-09-27 09:03:24 +0000
+++ gtk/window-decorator/gtk-window-decorator.h	2012-10-09 03:07:19 +0000
@@ -109,7 +109,7 @@
 #include <metacity-private/theme.h>
 #endif
 
-#include "gwd-settings-interface.h"
+#include <gwd-fwd.h>
 
 #define METACITY_GCONF_DIR "/apps/metacity/general"
 #define MUTTER_GCONF_DIR "/apps/mutter/general"
@@ -225,9 +225,6 @@
 
 #define PROP_MOTIF_WM_HINT_ELEMENTS 3
 
-typedef struct _GWDSettingsWritable GWDSettingsWritable;
-typedef struct _GWDSettingsNotified GWDSettingsNotified;
-
 typedef struct {
 unsigned long flags;
 unsigned long functions;

=== modified file 'gtk/window-decorator/gwd-cairo-window-decoration-util.h'
--- gtk/window-decorator/gwd-cairo-window-decoration-util.h	2012-09-07 00:30:48 +0000
+++ gtk/window-decorator/gwd-cairo-window-decoration-util.h	2012-10-09 03:07:19 +0000
@@ -21,11 +21,10 @@
 #define _GWD_CAIRO_WINDOW_DECORATION_UTIL_H
 
 #include <glib.h>
+#include <decoration.h>
 
 G_BEGIN_DECLS
 
-typedef struct _decor_extents decor_extents_t;
-
 const decor_extents_t * gwd_cairo_window_decoration_get_default_max_win_extents ();
 const decor_extents_t * gwd_cairo_window_decoration_get_default_win_extents ();
 

=== added file 'gtk/window-decorator/gwd-fwd.h'
--- gtk/window-decorator/gwd-fwd.h	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/gwd-fwd.h	2012-10-09 03:07:19 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2012 Canonical Ltd
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
+ */
+#ifndef _COMPIZ_GWD_FWD_H
+#define _COMPIZ_GWD_FWD_H
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+typedef struct _GWDSettings                 GWDSettings;
+typedef struct _GWDSettingsWritable         GWDSettingsWritable;
+typedef struct _GWDSettingsNotified         GWDSettingsNotified;
+typedef struct _GWDSettingsStorage          GWDSettingsStorage;
+typedef struct _GWDSettingsXPropertyStorage GWDSettingsXPropertyStorage;
+
+G_END_DECLS
+
+#endif

=== modified file 'gtk/window-decorator/gwd-metacity-window-decoration-util.h'
--- gtk/window-decorator/gwd-metacity-window-decoration-util.h	2012-09-07 00:30:48 +0000
+++ gtk/window-decorator/gwd-metacity-window-decoration-util.h	2012-10-09 03:07:19 +0000
@@ -21,10 +21,10 @@
 #define _GWD_METACITY_WINDOW_DECORATION_UTIL_H
 
 #include <glib.h>
+#include <metacity-1/metacity-private/theme.h>
 
 G_BEGIN_DECLS
 
-typedef struct _MetaTheme MetaTheme;
 typedef MetaTheme * (*GWDMetaThemeGetCurrentProc) ();
 typedef void (*GWDMetaThemeSetProc) (const gchar *theme,
 				     gboolean    force_update);

=== modified file 'gtk/window-decorator/gwd-settings-interface.h'
--- gtk/window-decorator/gwd-settings-interface.h	2012-09-06 10:08:25 +0000
+++ gtk/window-decorator/gwd-settings-interface.h	2012-10-09 03:07:19 +0000
@@ -21,6 +21,7 @@
 #define _COMPIZ_GWD_SETTINGS_INTERFACE_H
 
 #include <glib-object.h>
+#include <gwd-fwd.h>
 
 G_BEGIN_DECLS
 
@@ -32,7 +33,6 @@
 								       GWDSettingsInterface))
 #define GWD_TYPE_SETTINGS_INTERFACE (gwd_settings_interface_get_type ())
 
-typedef struct _GWDSettings GWDSettings;
 typedef struct _GWDSettingsInterface GWDSettingsInterface;
 
 struct _GWDSettingsInterface

=== modified file 'gtk/window-decorator/gwd-settings-notified-interface.h'
--- gtk/window-decorator/gwd-settings-notified-interface.h	2012-09-06 10:08:25 +0000
+++ gtk/window-decorator/gwd-settings-notified-interface.h	2012-10-09 03:07:19 +0000
@@ -21,6 +21,7 @@
 #define _COMPIZ_GWD_SETTINGS_NOTIFIED_INTERFACE_H
 
 #include <glib-object.h>
+#include <gwd-fwd.h>
 
 G_BEGIN_DECLS
 
@@ -32,7 +33,6 @@
 										GWDSettingsNotifiedInterface))
 #define GWD_TYPE_SETTINGS_NOTIFIED_INTERFACE (gwd_settings_notified_interface_get_type ())
 
-typedef struct _GWDSettingsNotified GWDSettingsNotified;
 typedef struct _GWDSettingsNotifiedInterface GWDSettingsNotifiedInterface;
 
 struct _GWDSettingsNotifiedInterface

=== modified file 'gtk/window-decorator/gwd-settings-notified.h'
--- gtk/window-decorator/gwd-settings-notified.h	2012-09-06 10:08:25 +0000
+++ gtk/window-decorator/gwd-settings-notified.h	2012-10-09 03:07:19 +0000
@@ -21,9 +21,8 @@
 #define _COMPIZ_GWD_SETTINGS_NOTIFIED_H
 
 #include <glib-object.h>
-
-typedef struct _GWDSettingsNotified GWDSettingsNotified;
-typedef struct _WnckScreen	    WnckScreen;
+#include <libwnck/screen.h>
+#include <gwd-fwd.h>
 
 G_BEGIN_DECLS
 

=== modified file 'gtk/window-decorator/gwd-settings-storage-gconf.h'
--- gtk/window-decorator/gwd-settings-storage-gconf.h	2012-09-06 10:08:25 +0000
+++ gtk/window-decorator/gwd-settings-storage-gconf.h	2012-10-09 03:07:19 +0000
@@ -21,9 +21,7 @@
 #define _COMPIZ_GWD_SETTINGS_STORAGE_GCONF_H
 
 #include <glib-object.h>
-
-typedef struct _GWDSettingsWritable GWDSettingsWritable;
-typedef struct _GWDSettingsStorage  GWDSettingsStorage;
+#include <gwd-fwd.h>
 
 G_BEGIN_DECLS
 

=== modified file 'gtk/window-decorator/gwd-settings-storage-gsettings.h'
--- gtk/window-decorator/gwd-settings-storage-gsettings.h	2012-09-06 10:08:25 +0000
+++ gtk/window-decorator/gwd-settings-storage-gsettings.h	2012-10-09 03:07:19 +0000
@@ -21,10 +21,7 @@
 #define _COMPIZ_GWD_SETTINGS_STORAGE_GSETTINGS_H
 
 #include <glib-object.h>
-
-typedef struct _GWDSettingsWritable GWDSettingsWritable;
-typedef struct _GWDSettingsStorage  GWDSettingsStorage;
-typedef struct _GSettings	    GSettings;
+#include <gwd-fwd.h>
 
 G_BEGIN_DECLS
 

=== modified file 'gtk/window-decorator/gwd-settings-storage-interface.h'
--- gtk/window-decorator/gwd-settings-storage-interface.h	2012-09-06 10:08:25 +0000
+++ gtk/window-decorator/gwd-settings-storage-interface.h	2012-10-09 03:07:19 +0000
@@ -21,6 +21,7 @@
 #define _COMPIZ_GWD_SETTINGS_STORAGE_INTERFACE_H
 
 #include <glib-object.h>
+#include <gwd-fwd.h>
 
 G_BEGIN_DECLS
 
@@ -32,7 +33,6 @@
 										GWDSettingsStorageInterface))
 #define GWD_TYPE_SETTINGS_STORAGE_INTERFACE (gwd_settings_storage_interface_get_type ())
 
-typedef struct _GWDSettingsStorage GWDSettingsStorage;
 typedef struct _GWDSettingsStorageInterface GWDSettingsStorageInterface;
 
 struct _GWDSettingsStorageInterface

=== modified file 'gtk/window-decorator/gwd-settings-writable-interface.h'
--- gtk/window-decorator/gwd-settings-writable-interface.h	2012-09-06 10:08:25 +0000
+++ gtk/window-decorator/gwd-settings-writable-interface.h	2012-10-09 03:07:19 +0000
@@ -21,6 +21,7 @@
 #define _COMPIZ_GWD_SETTINGS_WRITABLE_INTERFACE_H
 
 #include <glib-object.h>
+#include <gwd-fwd.h>
 
 G_BEGIN_DECLS
 
@@ -32,7 +33,6 @@
 										 GWDSettingsWritableInterface))
 #define GWD_TYPE_WRITABLE_SETTINGS_INTERFACE (gwd_settings_writable_interface_get_type ())
 
-typedef struct _GWDSettingsWritable GWDSettingsWritable;
 typedef struct _GWDSettingsWritableInterface GWDSettingsWritableInterface;
 
 struct _GWDSettingsWritableInterface

=== modified file 'gtk/window-decorator/gwd-settings-xproperty-interface.h'
--- gtk/window-decorator/gwd-settings-xproperty-interface.h	2012-09-06 10:08:25 +0000
+++ gtk/window-decorator/gwd-settings-xproperty-interface.h	2012-10-09 03:07:19 +0000
@@ -21,6 +21,7 @@
 #define _COMPIZ_GWD_SETTINGS_XPROPERTY_STORAGE_INTERFACE_H
 
 #include <glib-object.h>
+#include <gwd-fwd.h>
 
 G_BEGIN_DECLS
 
@@ -32,7 +33,6 @@
 											 GWDSettingsXPropertyStorageInterface))
 #define GWD_TYPE_XPROPERTY_SETTINGS_STORAGE_INTERFACE (gwd_settings_xproperty_storage_interface_get_type ())
 
-typedef struct _GWDSettingsXPropertyStorage GWDSettingsXPropertyStorage;
 typedef struct _GWDSettingsXPropertyStorageInterface GWDSettingsXPropertyStorageInterface;
 
 struct _GWDSettingsXPropertyStorageInterface

=== modified file 'gtk/window-decorator/gwd-settings-xproperty-storage.h'
--- gtk/window-decorator/gwd-settings-xproperty-storage.h	2012-09-06 10:08:25 +0000
+++ gtk/window-decorator/gwd-settings-xproperty-storage.h	2012-10-09 03:07:19 +0000
@@ -21,9 +21,8 @@
 #define _COMPIZ_GWD_SETTINGS_STORAGE_XPROP_H
 
 #include <glib-object.h>
+#include <gwd-fwd.h>
 
-typedef struct _GWDSettingsWritable GWDSettingsWritable;
-typedef struct _GWDSettingsXPropertyStorage GWDSettingsXPropertyStorage;
 typedef struct _XDisplay Display;
 typedef unsigned long Window;
 

=== modified file 'gtk/window-decorator/gwd-settings.h'
--- gtk/window-decorator/gwd-settings.h	2012-09-06 10:08:25 +0000
+++ gtk/window-decorator/gwd-settings.h	2012-10-09 03:07:19 +0000
@@ -21,9 +21,7 @@
 #define _COMPIZ_GWD_SETTINGS_H
 
 #include <glib-object.h>
-
-typedef struct _GWDSettings GWDSettings;
-typedef struct _GWDSettingsNotified GWDSettingsNotified;
+#include <gwd-fwd.h>
 
 G_BEGIN_DECLS
 

=== modified file 'gtk/window-decorator/tests/test_gwd_settings.cpp'
--- gtk/window-decorator/tests/test_gwd_settings.cpp	2012-09-12 08:35:51 +0000
+++ gtk/window-decorator/tests/test_gwd_settings.cpp	2012-10-09 03:07:19 +0000
@@ -262,11 +262,6 @@
 
 namespace
 {
-    void gwd_settings_notified_unref (GWDSettingsNotified *notified)
-    {
-	g_object_unref (G_OBJECT (notified));
-    }
-
     void gwd_settings_storage_unref (GWDSettingsStorage *storage)
     {
 	g_object_unref (G_OBJECT (storage));

=== modified file 'plugins/opengl/src/paint.cpp'
--- plugins/opengl/src/paint.cpp	2012-09-21 06:05:27 +0000
+++ plugins/opengl/src/paint.cpp	2012-10-09 03:07:19 +0000
@@ -657,8 +657,6 @@
     WRAPABLE_HND_FUNCTN (glPaintCompositedOutput, region, fbo, mask)
 
     GLMatrix sTransform;
-    std::vector<GLfloat> vertexData;
-    std::vector<GLfloat> textureData;
     const GLTexture::Matrix & texmatrix = fbo->tex ()->matrix ();
     GLVertexBuffer *streamingBuffer = GLVertexBuffer::streamingBuffer ();
 
@@ -671,7 +669,7 @@
 	GLfloat ty1 = 1.0 - COMP_TEX_COORD_Y (texmatrix, 0.0f);
 	GLfloat ty2 = 1.0 - COMP_TEX_COORD_Y (texmatrix, screen->height ());
 
-	vertexData = {
+	const GLfloat vertexData[] = {
 	    0.0f,                    0.0f,                     0.0f,
 	    0.0f,                    (float)screen->height (), 0.0f,
 	    (float)screen->width (), 0.0f,                     0.0f,
@@ -681,7 +679,7 @@
 	    (float)screen->width (), 0.0f,                     0.0f,
 	};
 
-	textureData = {
+	const GLfloat textureData[] = {
 	    tx1, ty1,
 	    tx1, ty2,
 	    tx2, ty1,
@@ -705,7 +703,7 @@
 	    GLfloat ty1 = 1.0 - COMP_TEX_COORD_Y (texmatrix, pBox->y1);
 	    GLfloat ty2 = 1.0 - COMP_TEX_COORD_Y (texmatrix, pBox->y2);
 
-	    vertexData = {
+	    const GLfloat vertexData[] = {
 		(float)pBox->x1, (float)pBox->y1, 0.0f,
 		(float)pBox->x1, (float)pBox->y2, 0.0f,
 		(float)pBox->x2, (float)pBox->y1, 0.0f,
@@ -715,7 +713,7 @@
 		(float)pBox->x2, (float)pBox->y1, 0.0f,
 	    };
 
-	    textureData = {
+	    const GLfloat textureData[] = {
 		tx1, ty1,
 		tx1, ty2,
 		tx2, ty1,