Merge compiz:build-fixes into compiz:master

[Alberts Muktupāvels]

Fix build errors and warnings

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26df7b8..0c1a425 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,6 +13,10 @@ if (POLICY CMP0077)
     cmake_policy (SET CMP0077 NEW)
 endif ()
 
+if (POLICY CMP0121)
+    cmake_policy (SET CMP0121 NEW)
+endif ()
+
 set (CMAKE_MODULE_PATH_ORIG ${CMAKE_MODULE_PATH})
 set (COMPIZ_CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${COMPIZ_CMAKE_MODULE_PATH})
diff --git a/cmake/CompizCommon.cmake b/cmake/CompizCommon.cmake
index 766b22f..5bfb19c 100644
--- a/cmake/CompizCommon.cmake
+++ b/cmake/CompizCommon.cmake
@@ -8,6 +8,10 @@ if (POLICY CMP0077)
     cmake_policy (SET CMP0077 NEW)
 endif ()
 
+if (POLICY CMP0121)
+    cmake_policy (SET CMP0121 NEW)
+endif ()
+
 find_package (PkgConfig 0.29.1 REQUIRED)
 
 if ("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
diff --git a/cmake/CompizGSettings.cmake b/cmake/CompizGSettings.cmake
index 76bbb01..1cf7c8f 100644
--- a/cmake/CompizGSettings.cmake
+++ b/cmake/CompizGSettings.cmake
@@ -23,7 +23,7 @@ if (PKG_CONFIG_TOOL AND NOT GSETTINGS_GLOBAL_INSTALL_DIR_SET)
 
     # find out where schemas need to go if we are installing them systemwide
     execute_process (COMMAND ${PKG_CONFIG_TOOL} glib-2.0 --variable prefix  OUTPUT_VARIABLE GSETTINGS_GLIB_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
-    set (GSETTINGS_GLOBAL_INSTALL_DIR "${GSETTINGS_GLIB_PREFIX}/share/glib-2.0/schemas/")
+    set (GSETTINGS_GLOBAL_INSTALL_DIR "${GSETTINGS_GLIB_PREFIX}/share/glib-2.0/schemas")
 
     set_property (GLOBAL
 		  PROPERTY GSETTINGS_GLOBAL_INSTALL_DIR
@@ -64,7 +64,7 @@ function (compiz_install_gsettings_schema _src _dst)
 
     # find out where schemas need to go if we are installing them systemwide
     execute_process (COMMAND ${PKG_CONFIG_TOOL} glib-2.0 --variable prefix  OUTPUT_VARIABLE GSETTINGS_GLIB_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
-    SET (GSETTINGS_GLOBAL_INSTALL_DIR "${GSETTINGS_GLIB_PREFIX}/share/glib-2.0/schemas/")
+    SET (GSETTINGS_GLOBAL_INSTALL_DIR "${GSETTINGS_GLIB_PREFIX}/share/glib-2.0/schemas")
 
     if (PKG_CONFIG_TOOL AND
 	GLIB_COMPILE_SCHEMAS AND NOT
diff --git a/cmake/copy_file_install_user_env.cmake b/cmake/copy_file_install_user_env.cmake
index 3a87982..1c6cf8c 100644
--- a/cmake/copy_file_install_user_env.cmake
+++ b/cmake/copy_file_install_user_env.cmake
@@ -1,10 +1,6 @@
-set (FILE "" CACHE FORCE "File to Install")
-set (INSTALLDIR_USER "" CACHE FORCE "Installation dir if user")
-set (INSTALLDIR_ROOT "" CACHE FORCE "Installation dir if root")
-
 if (ENV{USER})
     set (USERNAME $ENV{USER})
-else (ENV${USER})
+else (ENV{USER})
     set (USERNAME "user")
 endif (ENV{USER})
 
diff --git a/cmake/plugin_extensions/CompizGenGSettings.cmake b/cmake/plugin_extensions/CompizGenGSettings.cmake
index b9853fd..c769c44 100644
--- a/cmake/plugin_extensions/CompizGenGSettings.cmake
+++ b/cmake/plugin_extensions/CompizGenGSettings.cmake
@@ -4,7 +4,7 @@ macro (compiz_gsettings_prepare_install_dirs)
     # package
     if ("${COMPIZ_PLUGIN_INSTALL_TYPE}" STREQUAL "package")
 	if (NOT COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR)
-            set (PLUGIN_SCHEMADIR "${datadir}/glib-2.0/schemas/")
+            set (PLUGIN_SCHEMADIR "${datadir}/glib-2.0/schemas")
         else (NOT COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR)
 	    set (PLUGIN_SCHEMADIR "${COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR}")
 	endif (NOT COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR)
@@ -12,7 +12,7 @@ macro (compiz_gsettings_prepare_install_dirs)
     elseif ("${COMPIZ_PLUGIN_INSTALL_TYPE}" STREQUAL "compiz" OR
 	    "$ENV{BUILD_GLOBAL}" STREQUAL "true")
 	if (NOT COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR)
-            set (PLUGIN_SCHEMADIR "${COMPIZ_PREFIX}/share/glib-2.0/schemas/")
+            set (PLUGIN_SCHEMADIR "${COMPIZ_PREFIX}/share/glib-2.0/schemas")
         else (NOT COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR)
 	    set (PLUGIN_SCHEMADIR "${COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR}")
 	endif (NOT COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR)
diff --git a/cmake/recompile_gsettings_schemas_in_dir_user_env.cmake b/cmake/recompile_gsettings_schemas_in_dir_user_env.cmake
index de26d64..971e90c 100644
--- a/cmake/recompile_gsettings_schemas_in_dir_user_env.cmake
+++ b/cmake/recompile_gsettings_schemas_in_dir_user_env.cmake
@@ -1,9 +1,6 @@
-set (SCHEMADIR_USER "" CACHE FORCE "Installation dir if user")
-set (SCHEMADIR_ROOT "" CACHE FORCE "Installation dir if root")
-
 if (ENV{USER})
     set (USERNAME $ENV{USER})
-else (ENV${USER})
+else (ENV{USER})
     set (USERNAME "user")
 endif (ENV{USER})
 
diff --git a/compizconfig/cmake/exec_setup_py_with_destdir.cmake b/compizconfig/cmake/exec_setup_py_with_destdir.cmake
index fc03188..da69c83 100644
--- a/compizconfig/cmake/exec_setup_py_with_destdir.cmake
+++ b/compizconfig/cmake/exec_setup_py_with_destdir.cmake
@@ -1,9 +1,3 @@
-set (PY_EXECUTABLE "" CACHE FORCE "Python executable")
-set (WDIR "" CACHE FORCE "Working Directory")
-set (PREFIX "" CACHE FORCE "Prefix")
-set (SETUP "" CACHE FORCE "Path to setup.py")
-set (VERSION "" CACHE FORCE "Version")
-
 set (EXTRAARGS "")
 set (BUILD_DEB $ENV{COMPIZ_DEB_BUILD})
 
diff --git a/compizconfig/compizconfig-python/setup.py b/compizconfig/compizconfig-python/setup.py
index db60746..f971423 100644
--- a/compizconfig/compizconfig-python/setup.py
+++ b/compizconfig/compizconfig-python/setup.py
@@ -16,7 +16,7 @@ pkg_config_environ["PKG_CONFIG_PATH"] = os.getcwd () + "/../libcompizconfig:" + 
 
 pkgconfig_libs = subprocess.Popen (["pkg-config", "--libs", "libcompizconfig_internal"], stdout=subprocess.PIPE, env=pkg_config_environ, stderr=open(os.devnull, 'w')).communicate ()[0]
 
-if len (pkgconfig_libs) is 0:
+if len (pkgconfig_libs) == 0:
   print ("CompizConfig Python [ERROR]: No libcompizconfig_internal.pc found in the pkg-config search path")
   print ("Ensure that libcompizonfig is installed or libcompizconfig.pc is in your $PKG_CONFIG_PATH")
   exit (1);
diff --git a/compizconfig/gsettings/tests/test_gsettings_conformance.cpp b/compizconfig/gsettings/tests/test_gsettings_conformance.cpp
index 9373736..75b1fb7 100644
--- a/compizconfig/gsettings/tests/test_gsettings_conformance.cpp
+++ b/compizconfig/gsettings/tests/test_gsettings_conformance.cpp
@@ -42,6 +42,7 @@
 #include "compizconfig_ccs_gsettings_settings_env_test.h"
 #include "compizconfig_ccs_integration_mock.h"
 
+using namespace boost::placeholders;
 using ::testing::AtLeast;
 using ::testing::Pointee;
 using ::testing::ReturnNull;
diff --git a/compizconfig/gsettings/tests/test_gsettings_tests.cpp b/compizconfig/gsettings/tests/test_gsettings_tests.cpp
index f7385cb..c780368 100644
--- a/compizconfig/gsettings/tests/test_gsettings_tests.cpp
+++ b/compizconfig/gsettings/tests/test_gsettings_tests.cpp
@@ -1,7 +1,7 @@
 #include <tr1/tuple>
 
 #include <boost/function.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/shared_ptr.hpp>
 
 #include <boost/shared_ptr.hpp>
diff --git a/compizconfig/gsettings/tests/test_gsettings_wrapper.cpp b/compizconfig/gsettings/tests/test_gsettings_wrapper.cpp
index 2dbfe4a..642b456 100644
--- a/compizconfig/gsettings/tests/test_gsettings_wrapper.cpp
+++ b/compizconfig/gsettings/tests/test_gsettings_wrapper.cpp
@@ -5,7 +5,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -16,6 +16,7 @@
 
 #include "test_gsettings_tests.h"
 
+using namespace boost::placeholders;
 using ::testing::NotNull;
 using ::testing::IsNull;
 using ::testing::Eq;
diff --git a/compizconfig/libcompizconfig/tests/compizconfig_test_ccs_context.cpp b/compizconfig/libcompizconfig/tests/compizconfig_test_ccs_context.cpp
index fcdb90f..7701e38 100644
--- a/compizconfig/libcompizconfig/tests/compizconfig_test_ccs_context.cpp
+++ b/compizconfig/libcompizconfig/tests/compizconfig_test_ccs_context.cpp
@@ -20,6 +20,7 @@
 #include "compizconfig_ccs_backend_mock.h"
 #include "compizconfig_ccs_context_mock.h"
 
+using namespace boost::placeholders;
 using ::testing::_;
 using ::testing::AtLeast;
 using ::testing::SetArgPointee;
diff --git a/compizconfig/libcompizconfig/tests/compizconfig_test_ccs_settings_upgrade_internal.cpp b/compizconfig/libcompizconfig/tests/compizconfig_test_ccs_settings_upgrade_internal.cpp
index 747e121..202c986 100644
--- a/compizconfig/libcompizconfig/tests/compizconfig_test_ccs_settings_upgrade_internal.cpp
+++ b/compizconfig/libcompizconfig/tests/compizconfig_test_ccs_settings_upgrade_internal.cpp
@@ -27,7 +27,7 @@
 
 #include <boost/make_shared.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <ccs.h>
 
diff --git a/compizconfig/libcompizconfig/tests/compizconfig_test_ccs_text_file.cpp b/compizconfig/libcompizconfig/tests/compizconfig_test_ccs_text_file.cpp
index 2f23a02..7edb64b 100644
--- a/compizconfig/libcompizconfig/tests/compizconfig_test_ccs_text_file.cpp
+++ b/compizconfig/libcompizconfig/tests/compizconfig_test_ccs_text_file.cpp
@@ -4,7 +4,7 @@
 #include <gmock/gmock.h>
 
 #include <boost/shared_ptr.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <ccs.h>
 
@@ -14,6 +14,7 @@
 #include <gtest_shared_characterwrapper.h>
 #include <gtest_shared_autodestroy.h>
 
+using namespace boost::placeholders;
 using ::testing::_;
 using ::testing::Return;
 using ::testing::Eq;
diff --git a/compizconfig/tests/compizconfig_backend_concept_test.cpp b/compizconfig/tests/compizconfig_backend_concept_test.cpp
index b7c51d5..553e4fb 100644
--- a/compizconfig/tests/compizconfig_backend_concept_test.cpp
+++ b/compizconfig/tests/compizconfig_backend_concept_test.cpp
@@ -29,13 +29,14 @@
 #include <compizconfig_ccs_setting_stub.h>
 
 #include <boost/function.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/make_shared.hpp>
 
 #include <compizconfig_backend_concept_test_internal.h>
 #include <compizconfig_backend_concept_test_environment_interface.h>
 
+using namespace boost::placeholders;
 using ::testing::NiceMock;
 using ::testing::Return;
 using ::testing::ReturnNull;
diff --git a/compizconfig/tests/compizconfig_backend_concept_test.h b/compizconfig/tests/compizconfig_backend_concept_test.h
index 5b5c346..abd7707 100644
--- a/compizconfig/tests/compizconfig_backend_concept_test.h
+++ b/compizconfig/tests/compizconfig_backend_concept_test.h
@@ -41,7 +41,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/function.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/noncopyable.hpp>
 
 #include <gtest/gtest.h>
@@ -67,6 +67,8 @@
 #include "compizconfig_backend_concept_test_internal.h"
 #include "compizconfig_backend_concept_test_environment_interface.h"
 
+using namespace boost::placeholders;
+
 namespace cci = compiz::config::impl;
 namespace cc  = compiz::config;
 
diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt
index ad2c9d8..7985de7 100644
--- a/gtk/CMakeLists.txt
+++ b/gtk/CMakeLists.txt
@@ -14,16 +14,6 @@ if (USE_GTK)
 	pangocairo
     )
     if (GTK_WINDOW_DECORATOR_FOUND)
-        set (CMAKE_REQUIRED_FLAGS ${GTK_WINDOW_DECORATOR_CFLAGS})
-        set (CMAKE_REQUIRED_LIBRARIES ${GTK_WINDOW_DECORATOR_LIBRARIES})
-        list (FIND CMAKE_REQUIRED_FLAGS "-D_REENTRANT" REENTRANT_INDEX)
-        if (REENTRANT_INDEX)
-          list (REMOVE_AT CMAKE_REQUIRED_FLAGS REENTRANT_INDEX)
-          list (APPEND CMAKE_REQUIRED_FLAGS "-D_REENTRANT=1")
-        endif (REENTRANT_INDEX)
-        set (CMAKE_REQUIRED_FLAGS "")
-        set (CMAKE_REQUIRED_LIBRARIES "")
-
         if (USE_METACITY)
             pkg_check_modules (LIBMETACITY libmetacity>=3.22.0)
 
diff --git a/gtk/window-decorator/gwd-theme-cairo.c b/gtk/window-decorator/gwd-theme-cairo.c
index 85f4202..a14aee3 100644
--- a/gtk/window-decorator/gwd-theme-cairo.c
+++ b/gtk/window-decorator/gwd-theme-cairo.c
@@ -1036,7 +1036,7 @@ gwd_theme_cairo_get_button_position (GWDTheme *theme,
         gint position = 0;
         gint button = 0;
 
-        while (button != i) {
+        while (button < i) {
             if (button_present (decor, button))
                 position++;
             button++;
diff --git a/gtk/window-decorator/tests/test_gwd_settings.cpp b/gtk/window-decorator/tests/test_gwd_settings.cpp
index efd0904..504bd14 100644
--- a/gtk/window-decorator/tests/test_gwd_settings.cpp
+++ b/gtk/window-decorator/tests/test_gwd_settings.cpp
@@ -24,7 +24,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/make_shared.hpp>
@@ -41,6 +41,7 @@
 
 #include "gwd-settings.h"
 
+using namespace boost::placeholders;
 using ::testing::Eq;
 using ::testing::Action;
 using ::testing::Values;
diff --git a/include/core/core.h b/include/core/core.h
index 3cfe748..915385d 100644
--- a/include/core/core.h
+++ b/include/core/core.h
@@ -52,7 +52,7 @@ typedef XBool Bool;
 #endif
 
 #include <boost/function.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/foreach.hpp>
 #define foreach BOOST_FOREACH
 
diff --git a/plugins/addhelper/src/addhelper.cpp b/plugins/addhelper/src/addhelper.cpp
index 90771e0..3c658e9 100644
--- a/plugins/addhelper/src/addhelper.cpp
+++ b/plugins/addhelper/src/addhelper.cpp
@@ -28,6 +28,8 @@
 
 #include "addhelper.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (addhelper, AddPluginVTable);
 
 /* Walk through all windows of the screen and adjust them if they
diff --git a/plugins/animation/src/animation.cpp b/plugins/animation/src/animation.cpp
index e6eb809..0087cc5 100644
--- a/plugins/animation/src/animation.cpp
+++ b/plugins/animation/src/animation.cpp
@@ -91,6 +91,7 @@
 #include <assert.h>
 #include "private.h"
 
+using namespace boost::placeholders;
 using namespace compiz::core;
 
 class AnimPluginVTable :
diff --git a/plugins/animation/src/options.cpp b/plugins/animation/src/options.cpp
index ce1a98b..a2a8e89 100644
--- a/plugins/animation/src/options.cpp
+++ b/plugins/animation/src/options.cpp
@@ -27,6 +27,8 @@
 
 #include "private.h"
 
+using namespace boost::placeholders;
+
 // =================  Option Related Functions  =================
 
 AnimEvent win2AnimEventMap[WindowEventNum] =
diff --git a/plugins/annotate/src/annotate.cpp b/plugins/annotate/src/annotate.cpp
index 4f8285f..b80bfe5 100644
--- a/plugins/annotate/src/annotate.cpp
+++ b/plugins/annotate/src/annotate.cpp
@@ -25,6 +25,8 @@
 
 #include "annotate.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (annotate, AnnoPluginVTable)
 
 #define DEG2RAD (M_PI / 180.0f)
diff --git a/plugins/bench/src/bench.cpp b/plugins/bench/src/bench.cpp
index 57e7909..819f5d9 100644
--- a/plugins/bench/src/bench.cpp
+++ b/plugins/bench/src/bench.cpp
@@ -25,6 +25,7 @@
 
 #include "bench.h"
 
+using namespace boost::placeholders;
 using namespace compiz::core;
 
 COMPIZ_PLUGIN_20090315 (bench, BenchPluginVTable)
diff --git a/plugins/blur/src/blur.cpp b/plugins/blur/src/blur.cpp
index 916d1f0..3533985 100644
--- a/plugins/blur/src/blur.cpp
+++ b/plugins/blur/src/blur.cpp
@@ -32,6 +32,8 @@
  */
 #define INDEPENDENT_TEX_SUPPORTED 0
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (blur, BlurPluginVTable)
 
 /* pascal triangle based kernel generator */
diff --git a/plugins/clone/src/clone.cpp b/plugins/clone/src/clone.cpp
index 1b5eb97..967323a 100644
--- a/plugins/clone/src/clone.cpp
+++ b/plugins/clone/src/clone.cpp
@@ -30,6 +30,8 @@
 
 #include "clone.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (clone, ClonePluginVTable);
 
 static void togglePaintFunctions (CloneScreen *cs, bool enabled)
diff --git a/plugins/colorfilter/src/colorfilter.cpp b/plugins/colorfilter/src/colorfilter.cpp
index 4dd9cde..e2711fa 100644
--- a/plugins/colorfilter/src/colorfilter.cpp
+++ b/plugins/colorfilter/src/colorfilter.cpp
@@ -25,6 +25,8 @@
 #include <algorithm>
 #include <boost/algorithm/string.hpp>
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (colorfilter, ColorfilterPluginVTable);
 
 /* Actions handling functions ----------------------------------------------- */
diff --git a/plugins/commands/src/commands.cpp b/plugins/commands/src/commands.cpp
index 1075775..a253efc 100644
--- a/plugins/commands/src/commands.cpp
+++ b/plugins/commands/src/commands.cpp
@@ -28,6 +28,7 @@
 #include "core/abiversion.h"
 #include "core/screen.h"
 
+using namespace boost::placeholders;
 
 COMPIZ_PLUGIN_20090315 (commands, CommandsPluginVTable);
 
diff --git a/plugins/composite/src/backbuffertracking/tests/test-composite-backbuffertracking.cpp b/plugins/composite/src/backbuffertracking/tests/test-composite-backbuffertracking.cpp
index 2003a63..015fb9c 100644
--- a/plugins/composite/src/backbuffertracking/tests/test-composite-backbuffertracking.cpp
+++ b/plugins/composite/src/backbuffertracking/tests/test-composite-backbuffertracking.cpp
@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
@@ -32,6 +32,7 @@
 
 #include "backbuffertracking.h"
 
+using namespace boost::placeholders;
 using ::testing::NiceMock;
 using ::testing::_;
 using ::testing::AtLeast;
diff --git a/plugins/composite/src/pixmapbinding/include/pixmapbinding.h b/plugins/composite/src/pixmapbinding/include/pixmapbinding.h
index feb3040..fe43611 100644
--- a/plugins/composite/src/pixmapbinding/include/pixmapbinding.h
+++ b/plugins/composite/src/pixmapbinding/include/pixmapbinding.h
@@ -33,7 +33,7 @@
 #include <memory>
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <core/size.h>
 
diff --git a/plugins/crashhandler/src/crashhandler.cpp b/plugins/crashhandler/src/crashhandler.cpp
index a67c749..a2174d9 100644
--- a/plugins/crashhandler/src/crashhandler.cpp
+++ b/plugins/crashhandler/src/crashhandler.cpp
@@ -29,6 +29,7 @@
 
 #include "crashhandler.h"
 
+using namespace boost::placeholders;
 
 COMPIZ_PLUGIN_20090315 (crashhandler, CrashPluginVTable)
 
diff --git a/plugins/dbus/src/dbus.cpp b/plugins/dbus/src/dbus.cpp
index e390534..50abc10 100644
--- a/plugins/dbus/src/dbus.cpp
+++ b/plugins/dbus/src/dbus.cpp
@@ -29,6 +29,8 @@
 
 #include "dbus.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (dbus, DbusPluginVTable);
 
 CompOption::Vector emptyList;
diff --git a/plugins/decor/src/decor.cpp b/plugins/decor/src/decor.cpp
index 5f01d5a..65ed6e4 100644
--- a/plugins/decor/src/decor.cpp
+++ b/plugins/decor/src/decor.cpp
@@ -40,6 +40,8 @@
 #include <X11/Xatom.h>
 #include <X11/extensions/shape.h>
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (decor, DecorPluginVTable)
 
 namespace cwe = compiz::window::extents;
diff --git a/plugins/decor/src/pixmap-requests/tests/compiz_decor_pixmap_requests_mock.h b/plugins/decor/src/pixmap-requests/tests/compiz_decor_pixmap_requests_mock.h
index e522bb3..4a49235 100644
--- a/plugins/decor/src/pixmap-requests/tests/compiz_decor_pixmap_requests_mock.h
+++ b/plugins/decor/src/pixmap-requests/tests/compiz_decor_pixmap_requests_mock.h
@@ -28,7 +28,7 @@
 #define _COMPIZ_DECOR_PIXMAP_REQUESTS_MOCK_H
 
 #include <gmock/gmock.h>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <X11/Xlib.h>
 #include "pixmap-requests.h"
diff --git a/plugins/decor/src/pixmap-requests/tests/integration/xorg-gtest/compiz_test_decor_pixmap_protocol_integration.cpp b/plugins/decor/src/pixmap-requests/tests/integration/xorg-gtest/compiz_test_decor_pixmap_protocol_integration.cpp
index d9b2e16..efc8baa 100644
--- a/plugins/decor/src/pixmap-requests/tests/integration/xorg-gtest/compiz_test_decor_pixmap_protocol_integration.cpp
+++ b/plugins/decor/src/pixmap-requests/tests/integration/xorg-gtest/compiz_test_decor_pixmap_protocol_integration.cpp
@@ -24,7 +24,7 @@
 #include <gmock/gmock.h>
 
 #include <boost/function.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <boost/shared_ptr.hpp>
 #include <boost/make_shared.hpp>
@@ -45,6 +45,7 @@ namespace ct = compiz::testing;
 namespace cd = compiz::decor;
 namespace cdp = compiz::decor::protocol;
 
+using namespace boost::placeholders;
 using ::testing::AtLeast;
 using ::testing::ReturnNull;
 using ::testing::Return;
diff --git a/plugins/decor/src/pixmap-requests/tests/test-decor-pixmap-requests.cpp b/plugins/decor/src/pixmap-requests/tests/test-decor-pixmap-requests.cpp
index 53dfbb1..ba9504a 100644
--- a/plugins/decor/src/pixmap-requests/tests/test-decor-pixmap-requests.cpp
+++ b/plugins/decor/src/pixmap-requests/tests/test-decor-pixmap-requests.cpp
@@ -25,13 +25,14 @@
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <iostream>
 
 #include <X11/Xlib.h>
 #include "pixmap-requests.h"
 #include "compiz_decor_pixmap_requests_mock.h"
 
+using namespace boost::placeholders;
 using ::testing::AtLeast;
 using ::testing::Pointee;
 using ::testing::Return;
diff --git a/plugins/decor/tests/acceptance/xorg-gtest/compiz_decor_acceptance_tests.cpp b/plugins/decor/tests/acceptance/xorg-gtest/compiz_decor_acceptance_tests.cpp
index 9b14385..be7f99c 100644
--- a/plugins/decor/tests/acceptance/xorg-gtest/compiz_decor_acceptance_tests.cpp
+++ b/plugins/decor/tests/acceptance/xorg-gtest/compiz_decor_acceptance_tests.cpp
@@ -29,7 +29,7 @@
 #include <boost/shared_array.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
@@ -49,6 +49,7 @@
 namespace xt = xorg::testing;
 namespace ct = compiz::testing;
 
+using namespace boost::placeholders;
 using ::testing::AllOf;
 using ::testing::AtLeast;
 using ::testing::Eq;
diff --git a/plugins/expo/src/expo.cpp b/plugins/expo/src/expo.cpp
index 802071b..bb310a5 100644
--- a/plugins/expo/src/expo.cpp
+++ b/plugins/expo/src/expo.cpp
@@ -35,6 +35,8 @@
 #endif
 #include <X11/cursorfont.h>
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (expo, ExpoPluginVTable);
 
 #define sigmoid(x) (1.0f / (1.0f + exp (-11.0f * ((x) - 0.5f))))
diff --git a/plugins/ezoom/src/ezoom.cpp b/plugins/ezoom/src/ezoom.cpp
index c9a071f..12f2842 100755
--- a/plugins/ezoom/src/ezoom.cpp
+++ b/plugins/ezoom/src/ezoom.cpp
@@ -74,6 +74,8 @@
 
 #include "ezoom.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (ezoom, ZoomPluginVTable)
 
 
diff --git a/plugins/fade/src/fade.cpp b/plugins/fade/src/fade.cpp
index 21c3d68..c150a2f 100644
--- a/plugins/fade/src/fade.cpp
+++ b/plugins/fade/src/fade.cpp
@@ -26,6 +26,8 @@
 #include "fade.h"
 #include <core/atoms.h>
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (fade, FadePluginVTable);
 
 bool
diff --git a/plugins/firepaint/src/firepaint.cpp b/plugins/firepaint/src/firepaint.cpp
index 863a4d7..39c986d 100644
--- a/plugins/firepaint/src/firepaint.cpp
+++ b/plugins/firepaint/src/firepaint.cpp
@@ -21,6 +21,8 @@
 
 #include "firepaint.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (firepaint, FirePluginVTable);
 
 /* 3 vertices per triangle, 2 triangles per particle */
diff --git a/plugins/freewins/src/freewins.cpp b/plugins/freewins/src/freewins.cpp
index 8f0a652..edab457 100644
--- a/plugins/freewins/src/freewins.cpp
+++ b/plugins/freewins/src/freewins.cpp
@@ -50,6 +50,8 @@
 
 #include "freewins.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (freewins, FWPluginVTable);
 
 /* Information on window resize */
diff --git a/plugins/gnomecompat/src/gnomecompat.cpp b/plugins/gnomecompat/src/gnomecompat.cpp
index ba85607..f0445c5 100644
--- a/plugins/gnomecompat/src/gnomecompat.cpp
+++ b/plugins/gnomecompat/src/gnomecompat.cpp
@@ -25,6 +25,8 @@
 
 #include "gnomecompat.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (gnomecompat, GnomeCompatPluginVTable);
 
 static bool
diff --git a/plugins/grid/src/grabhandler/tests/test-grid-grab-handler.cpp b/plugins/grid/src/grabhandler/tests/test-grid-grab-handler.cpp
index 9abddd2..a160ad1 100644
--- a/plugins/grid/src/grabhandler/tests/test-grid-grab-handler.cpp
+++ b/plugins/grid/src/grabhandler/tests/test-grid-grab-handler.cpp
@@ -26,7 +26,7 @@
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <grabhandler.h>
 
@@ -40,6 +40,7 @@
 #define CompWindowGrabResizeMask      (1 << 3)
 #define CompWindowGrabExternalAppMask (1 << 4)
 
+using namespace boost::placeholders;
 using testing::Eq;
 using testing::Return;
 
diff --git a/plugins/grid/src/grid.cpp b/plugins/grid/src/grid.cpp
index d5afc21..6a4b7dc 100755
--- a/plugins/grid/src/grid.cpp
+++ b/plugins/grid/src/grid.cpp
@@ -22,12 +22,13 @@
  * Press the tiling keys several times to cycle through some tiling options.
  */
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <cmath>
 #include <cassert>
 #include "grid.h"
 #include "grabhandler.h"
 
+using namespace boost::placeholders;
 using namespace GridWindowType;
 namespace cgw = compiz::grid::window;
 
diff --git a/plugins/mag/src/mag.cpp b/plugins/mag/src/mag.cpp
index ca2e00a..0b8894e 100644
--- a/plugins/mag/src/mag.cpp
+++ b/plugins/mag/src/mag.cpp
@@ -22,6 +22,8 @@
 
 #include "mag.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (mag, MagPluginVTable);
 
 void
diff --git a/plugins/matecompat/src/matecompat.cpp b/plugins/matecompat/src/matecompat.cpp
index 888284f..78f9381 100644
--- a/plugins/matecompat/src/matecompat.cpp
+++ b/plugins/matecompat/src/matecompat.cpp
@@ -25,6 +25,8 @@
 
 #include "matecompat.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (matecompat, MateCompatPluginVTable);
 
 static bool
diff --git a/plugins/maximumize/src/maximumize.cpp b/plugins/maximumize/src/maximumize.cpp
index 942b89c..0cd9231 100644
--- a/plugins/maximumize/src/maximumize.cpp
+++ b/plugins/maximumize/src/maximumize.cpp
@@ -29,6 +29,8 @@
 
 #include "maximumize.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (maximumize, MaximumizePluginVTable);
 
 /* Convenience constants to make the code more readable (hopefully) */
diff --git a/plugins/mblur/src/mblur.cpp b/plugins/mblur/src/mblur.cpp
index b921fce..090c6e1 100644
--- a/plugins/mblur/src/mblur.cpp
+++ b/plugins/mblur/src/mblur.cpp
@@ -24,6 +24,8 @@
 
 #include "mblur.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (mblur, MblurPluginVTable);
 
 static void
diff --git a/plugins/neg/src/neg.cpp b/plugins/neg/src/neg.cpp
index 7776e24..8dbc136 100644
--- a/plugins/neg/src/neg.cpp
+++ b/plugins/neg/src/neg.cpp
@@ -22,6 +22,8 @@
 
 #include "neg.h"
 
+using namespace boost::placeholders;
+
 static std::string fragment_function = "                 \n\
 void neg_fragment () {                                   \n\
     vec3 color = vec3(1.0, 1.0, 1.0) - gl_FragColor.rgb; \n\
diff --git a/plugins/obs/src/obs.cpp b/plugins/obs/src/obs.cpp
index 1867b46..dd16e3b 100644
--- a/plugins/obs/src/obs.cpp
+++ b/plugins/obs/src/obs.cpp
@@ -26,6 +26,8 @@
 #include "obs.h"
 #include "obs_options.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (obs, ObsPluginVTable);
 
 const unsigned short MODIFIER_OPACITY    = 0;
diff --git a/plugins/opacify/src/opacify.cpp b/plugins/opacify/src/opacify.cpp
index 94c3af7..3de725a 100644
--- a/plugins/opacify/src/opacify.cpp
+++ b/plugins/opacify/src/opacify.cpp
@@ -26,6 +26,8 @@
 
 #include "opacify.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (opacify, OpacifyPluginVTable);
 
 const unsigned short MAX_WINDOWS = 64;
diff --git a/plugins/opengl/include/opengl/programcache.h b/plugins/opengl/include/opengl/programcache.h
index e2765c8..be3ec3c 100644
--- a/plugins/opengl/include/opengl/programcache.h
+++ b/plugins/opengl/include/opengl/programcache.h
@@ -29,7 +29,7 @@
 #include <string>
 #include <list>
 #include <map>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <opengl/program.h>
 
 class PrivateProgramCache;
diff --git a/plugins/opengl/src/doublebuffer/tests/test-opengl-double-buffer.cpp b/plugins/opengl/src/doublebuffer/tests/test-opengl-double-buffer.cpp
index 5c4bcb3..709c816 100644
--- a/plugins/opengl/src/doublebuffer/tests/test-opengl-double-buffer.cpp
+++ b/plugins/opengl/src/doublebuffer/tests/test-opengl-double-buffer.cpp
@@ -2,10 +2,11 @@
 #include <gmock/gmock.h>
 
 #include <boost/function.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <opengl/doublebuffer.h>
 
+using namespace boost::placeholders;
 using namespace compiz::opengl;
 using testing::_;
 using testing::StrictMock;
diff --git a/plugins/opengl/src/glxtfpbind/tests/test-opengl-glx-tfp-bind.cpp b/plugins/opengl/src/glxtfpbind/tests/test-opengl-glx-tfp-bind.cpp
index 08f5cb8..c0bf9b7 100644
--- a/plugins/opengl/src/glxtfpbind/tests/test-opengl-glx-tfp-bind.cpp
+++ b/plugins/opengl/src/glxtfpbind/tests/test-opengl-glx-tfp-bind.cpp
@@ -1,4 +1,4 @@
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
@@ -6,6 +6,7 @@
 #include <core/servergrab.h>
 #include "glx-tfp-bind.h"
 
+using namespace boost::placeholders;
 using ::testing::InSequence;
 using ::testing::NiceMock;
 using ::testing::StrictMock;
diff --git a/plugins/opengl/src/screen.cpp b/plugins/opengl/src/screen.cpp
index ef645aa..fcf19ca 100644
--- a/plugins/opengl/src/screen.cpp
+++ b/plugins/opengl/src/screen.cpp
@@ -32,7 +32,7 @@
 #endif
 #include <errno.h>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/make_shared.hpp>
 
 #include "privates.h"
@@ -41,6 +41,8 @@
 #include <dlfcn.h>
 #include <math.h>
 
+using namespace boost::placeholders;
+
 template class WrapableInterface<GLScreen, GLScreenInterface>;
 
 #ifndef USE_GLES
diff --git a/plugins/opengl/src/texture.cpp b/plugins/opengl/src/texture.cpp
index 3b5389e..9772f9c 100644
--- a/plugins/opengl/src/texture.cpp
+++ b/plugins/opengl/src/texture.cpp
@@ -41,6 +41,8 @@
 
 #include "glx-tfp-bind.h"
 
+using namespace boost::placeholders;
+
 namespace cgl = compiz::opengl;
 
 #ifdef USE_GLES
diff --git a/plugins/put/src/put.cpp b/plugins/put/src/put.cpp
index 2ac1667..cf9138d 100644
--- a/plugins/put/src/put.cpp
+++ b/plugins/put/src/put.cpp
@@ -21,6 +21,8 @@
 
 #include <cmath>
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (put, PutPluginVTable);
 
 #define PUT_ONLY_EMPTY(type) (type >= PutEmptyBottomLeft && \
diff --git a/plugins/resize/src/resize.cpp b/plugins/resize/src/resize.cpp
index 71c4179..d66a8be 100644
--- a/plugins/resize/src/resize.cpp
+++ b/plugins/resize/src/resize.cpp
@@ -41,6 +41,8 @@
 #include "gl-screen-impl.h"
 #include "composite-screen-impl.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (resize, ResizePluginVTable)
 
 void ResizeScreen::handleEvent (XEvent *event)
diff --git a/plugins/ring/src/ring.cpp b/plugins/ring/src/ring.cpp
index 7be912d..b3507fb 100644
--- a/plugins/ring/src/ring.cpp
+++ b/plugins/ring/src/ring.cpp
@@ -29,6 +29,8 @@
 
 #include "ring.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (ring, RingPluginVTable);
 
 const double PI = 3.14159265359f;
diff --git a/plugins/rotate/src/rotate.cpp b/plugins/rotate/src/rotate.cpp
index c740388..cf83afa 100644
--- a/plugins/rotate/src/rotate.cpp
+++ b/plugins/rotate/src/rotate.cpp
@@ -28,6 +28,8 @@
 
 #include <math.h>
 
+using namespace boost::placeholders;
+
 static const float ROTATE_POINTER_SENSITIVITY_FACTOR = 0.05f;
 
 COMPIZ_PLUGIN_20090315 (rotate, RotatePluginVTable)
diff --git a/plugins/scale/src/scale.cpp b/plugins/scale/src/scale.cpp
index 1c6ea92..17b375e 100644
--- a/plugins/scale/src/scale.cpp
+++ b/plugins/scale/src/scale.cpp
@@ -38,6 +38,8 @@
 
 #define EDGE_STATE (CompAction::StateInitEdge)
 
+using namespace boost::placeholders;
+
 class ScalePluginVTable :
     public CompPlugin::VTableForScreenAndWindow<ScaleScreen, ScaleWindow, COMPIZ_SCALE_ABI>
 {
diff --git a/plugins/scaleaddon/src/scaleaddon.cpp b/plugins/scaleaddon/src/scaleaddon.cpp
index 3b6a84a..92efa43 100644
--- a/plugins/scaleaddon/src/scaleaddon.cpp
+++ b/plugins/scaleaddon/src/scaleaddon.cpp
@@ -31,6 +31,8 @@
 #include "scaleaddon.h"
 #include <iostream>
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (scaleaddon, ScaleAddonPluginVTable);
 
 bool textAvailable;
diff --git a/plugins/scalefilter/src/scalefilter.cpp b/plugins/scalefilter/src/scalefilter.cpp
index 194f2ed..63b4377 100644
--- a/plugins/scalefilter/src/scalefilter.cpp
+++ b/plugins/scalefilter/src/scalefilter.cpp
@@ -33,6 +33,8 @@
 
 #include "scalefilter.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (scalefilter, ScalefilterPluginVTable);
 
 FilterInfo::FilterInfo (ScalefilterScreen *fs, const CompOutput& output) :
diff --git a/plugins/screenshot/src/screenshot.cpp b/plugins/screenshot/src/screenshot.cpp
index 5ac6067..a7db6e4 100644
--- a/plugins/screenshot/src/screenshot.cpp
+++ b/plugins/screenshot/src/screenshot.cpp
@@ -37,6 +37,8 @@
   #define scandir(a,b,c,d) scandir((a), (b), (c), (int(*)(const void*,const void*))(d));
 #endif
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (screenshot, ShotPluginVTable)
 
 bool
diff --git a/plugins/shelf/src/shelf.cpp b/plugins/shelf/src/shelf.cpp
index 116a018..0e80967 100644
--- a/plugins/shelf/src/shelf.cpp
+++ b/plugins/shelf/src/shelf.cpp
@@ -34,6 +34,8 @@
 
 #include "shelf.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (shelf, ShelfPluginVTable);
 
 const float SHELF_MIN_SIZE = 50.0f; // Minimum pixelsize a window can be scaled to
diff --git a/plugins/shift/src/shift.cpp b/plugins/shift/src/shift.cpp
index 8245240..d86f6d2 100644
--- a/plugins/shift/src/shift.cpp
+++ b/plugins/shift/src/shift.cpp
@@ -35,6 +35,8 @@
 
 #include "shift.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (shift, ShiftPluginVTable);
 
 const double PI = 3.14159265359f;
diff --git a/plugins/showmouse/src/showmouse.cpp b/plugins/showmouse/src/showmouse.cpp
index 0dd3825..091f9ca 100644
--- a/plugins/showmouse/src/showmouse.cpp
+++ b/plugins/showmouse/src/showmouse.cpp
@@ -29,6 +29,8 @@
 
 #include "showmouse.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (showmouse, ShowmousePluginVTable);
 
 /* 3 vertices per triangle, 2 triangles per particle */
diff --git a/plugins/showrepaint/src/showrepaint.cpp b/plugins/showrepaint/src/showrepaint.cpp
index 67080f6..a97f12e 100644
--- a/plugins/showrepaint/src/showrepaint.cpp
+++ b/plugins/showrepaint/src/showrepaint.cpp
@@ -22,6 +22,8 @@
 
 #include "showrepaint.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (showrepaint, ShowrepaintPluginVTable);
 
 bool
diff --git a/plugins/snap/src/snap.cpp b/plugins/snap/src/snap.cpp
index 24f8e45..de16c71 100644
--- a/plugins/snap/src/snap.cpp
+++ b/plugins/snap/src/snap.cpp
@@ -37,6 +37,7 @@
 
 #include "snap.h"
 
+using namespace boost::placeholders;
 
 COMPIZ_PLUGIN_20090315 (snap, SnapPluginVTable);
 
diff --git a/plugins/splash/src/splash.cpp b/plugins/splash/src/splash.cpp
index 1e4ebbb..94bd9d8 100644
--- a/plugins/splash/src/splash.cpp
+++ b/plugins/splash/src/splash.cpp
@@ -21,6 +21,8 @@
 
 #include "splash.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (splash, SplashPluginVTable);
 
 const std::string SPLASH_BACKGROUND_DEFAULT("");
diff --git a/plugins/staticswitcher/src/staticswitcher.cpp b/plugins/staticswitcher/src/staticswitcher.cpp
index 452e1be..d15af7e 100644
--- a/plugins/staticswitcher/src/staticswitcher.cpp
+++ b/plugins/staticswitcher/src/staticswitcher.cpp
@@ -25,6 +25,8 @@
 
 #include "staticswitcher.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (staticswitcher, StaticSwitchPluginVTable)
 
 const unsigned short ICON_SIZE = 48;
diff --git a/plugins/switcher/src/switcher.cpp b/plugins/switcher/src/switcher.cpp
index 122f367..ecd479d 100644
--- a/plugins/switcher/src/switcher.cpp
+++ b/plugins/switcher/src/switcher.cpp
@@ -27,6 +27,8 @@
 
 #include "switcher.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (switcher, SwitchPluginVTable)
 
 const unsigned short WIDTH  = 212;
diff --git a/plugins/thumbnail/src/thumbnail.cpp b/plugins/thumbnail/src/thumbnail.cpp
index 5a8303d..07d4202 100644
--- a/plugins/thumbnail/src/thumbnail.cpp
+++ b/plugins/thumbnail/src/thumbnail.cpp
@@ -30,6 +30,8 @@
 #include "thumbnail.h"
 #include "thumbnail_tex.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (thumbnail, ThumbPluginVTable);
 
 void
diff --git a/plugins/trailfocus/src/trailfocus.cpp b/plugins/trailfocus/src/trailfocus.cpp
index 99276f2..0e99951 100644
--- a/plugins/trailfocus/src/trailfocus.cpp
+++ b/plugins/trailfocus/src/trailfocus.cpp
@@ -28,6 +28,8 @@
 #include "trailfocus.h"
 #include <core/atoms.h>
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (trailfocus, TrailfocusPluginVTable);
 
 /* Determines if a window should be handled by trailfocus or not */
diff --git a/plugins/vpswitch/src/vpswitch.cpp b/plugins/vpswitch/src/vpswitch.cpp
index e46f479..bac156e 100644
--- a/plugins/vpswitch/src/vpswitch.cpp
+++ b/plugins/vpswitch/src/vpswitch.cpp
@@ -28,6 +28,8 @@
 
 #include "vpswitch.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (vpswitch, VPSwitchPluginVTable);
 
 bool
diff --git a/plugins/wall/src/wall.cpp b/plugins/wall/src/wall.cpp
index 9057977..9295f44 100644
--- a/plugins/wall/src/wall.cpp
+++ b/plugins/wall/src/wall.cpp
@@ -37,6 +37,8 @@
 
 #include "wall.h"
 
+using namespace boost::placeholders;
+
 static const double PI = 3.14159265359f;
 static const unsigned short VIEWPORT_SWITCHER_SIZE = 100;
 static const unsigned short ARROW_SIZE = 33;
diff --git a/plugins/wallpaper/src/wallpaper.cpp b/plugins/wallpaper/src/wallpaper.cpp
index 24265ab..840ca05 100644
--- a/plugins/wallpaper/src/wallpaper.cpp
+++ b/plugins/wallpaper/src/wallpaper.cpp
@@ -22,6 +22,8 @@
 
 #include "wallpaper.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (wallpaper, WallpaperPluginVTable);
 
 static Visual *
@@ -431,7 +433,7 @@ WallpaperWindow::drawBackgrounds (const GLMatrix            &transform,
     WALLPAPER_SCREEN (screen);
 
     CompRect              tmpRect;
-    GLTexture::Matrix     matrix;
+    GLTexture::Matrix     matrix = GLTexture::Matrix();
     GLTexture::MatrixList tmpMatrixList;
     WallpaperBackground   *back     = ws->getBackgroundForViewport (bg);
     GLWindowPaintAttrib   tmpAttrib = attrib;
diff --git a/plugins/water/src/water.cpp b/plugins/water/src/water.cpp
index ded8d4f..0186ab6 100644
--- a/plugins/water/src/water.cpp
+++ b/plugins/water/src/water.cpp
@@ -28,6 +28,7 @@
 
 #include <math.h>
 
+using namespace boost::placeholders;
 
 COMPIZ_PLUGIN_20090315 (water, WaterPluginVTable)
 
diff --git a/plugins/widget/src/widget.cpp b/plugins/widget/src/widget.cpp
index f6bee51..df194c4 100644
--- a/plugins/widget/src/widget.cpp
+++ b/plugins/widget/src/widget.cpp
@@ -32,6 +32,8 @@
 
 #include "widget.h"
 
+using namespace boost::placeholders;
+
 class WidgetExp :
     public CompMatch::Expression
 {
diff --git a/plugins/winrules/src/winrules.cpp b/plugins/winrules/src/winrules.cpp
index 8ed059d..26c4cf9 100644
--- a/plugins/winrules/src/winrules.cpp
+++ b/plugins/winrules/src/winrules.cpp
@@ -21,6 +21,8 @@
 
 #include "winrules.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (winrules, WinrulesPluginVTable);
 
 void
diff --git a/plugins/wizard/src/wizard.cpp b/plugins/wizard/src/wizard.cpp
index 3fa5f7f..c685aab 100644
--- a/plugins/wizard/src/wizard.cpp
+++ b/plugins/wizard/src/wizard.cpp
@@ -29,6 +29,8 @@
 
 #include "wizard.h"
 
+using namespace boost::placeholders;
+
 /* 3 vertices per triangle, 2 triangles per particle */
 const unsigned short CACHESIZE_FACTOR = 3 * 2;
 
diff --git a/plugins/wobbly/src/wobbly.cpp b/plugins/wobbly/src/wobbly.cpp
index 8b50839..44edaa5 100644
--- a/plugins/wobbly/src/wobbly.cpp
+++ b/plugins/wobbly/src/wobbly.cpp
@@ -27,6 +27,8 @@
 
 #include "wobbly.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (wobbly, WobblyPluginVTable)
 
 
diff --git a/plugins/workarounds/src/workarounds.cpp b/plugins/workarounds/src/workarounds.cpp
index 465f76b..3dddc45 100644
--- a/plugins/workarounds/src/workarounds.cpp
+++ b/plugins/workarounds/src/workarounds.cpp
@@ -26,6 +26,8 @@
 
 #include "workarounds.h"
 
+using namespace boost::placeholders;
+
 bool haveOpenGL;
 
 COMPIZ_PLUGIN_20090315 (workarounds, WorkaroundsPluginVTable);
diff --git a/src/configurerequestbuffer.cpp b/src/configurerequestbuffer.cpp
index 30c4e2e..02bd19b 100644
--- a/src/configurerequestbuffer.cpp
+++ b/src/configurerequestbuffer.cpp
@@ -26,7 +26,7 @@
 #include <cassert>
 #include <boost/foreach.hpp>
 #include <boost/weak_ptr.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include "asyncserverwindow.h"
 #include "configurerequestbuffer-impl.h"
 
@@ -34,6 +34,8 @@
 #define foreach BOOST_FOREACH
 #endif
 
+using namespace boost::placeholders;
+
 namespace crb = compiz::window::configure_buffers;
 namespace cw = compiz::window;
 
diff --git a/src/event.cpp b/src/event.cpp
index 82fd49e..4c12bb2 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/foreach.hpp>
 #define foreach BOOST_FOREACH
 
@@ -43,6 +43,8 @@
 #include "privatestackdebugger.h"
 #include "eventmanagement.h"
 
+using namespace boost::placeholders;
+
 namespace cps = compiz::private_screen;
 namespace ce = compiz::events;
 
diff --git a/src/option/tests/option.cpp b/src/option/tests/option.cpp
index cfa840e..be3cb7b 100644
--- a/src/option/tests/option.cpp
+++ b/src/option/tests/option.cpp
@@ -50,7 +50,7 @@ namespace {
 	     it != vl.get <CompOption::Value::Vector> ().end ();
 	     it++)
 	{
-	    T inst;
+	    T inst = T();
 	    CompOption::Value value (inst);
 
 	    const CompOption::Value &v (*it);
diff --git a/src/plugin.cpp b/src/plugin.cpp
index bfaf2aa..b59bc3a 100644
--- a/src/plugin.cpp
+++ b/src/plugin.cpp
@@ -46,6 +46,8 @@
 
 #define foreach BOOST_FOREACH
 
+using namespace boost::placeholders;
+
 static const char here[] = "core";
 
 CompPlugin::Map pluginsMap;
diff --git a/src/plugin/tests/test-plugin.cpp b/src/plugin/tests/test-plugin.cpp
index e7b5f7f..9cf39aa 100644
--- a/src/plugin/tests/test-plugin.cpp
+++ b/src/plugin/tests/test-plugin.cpp
@@ -13,6 +13,8 @@
 #include <gtest_shared_tmpenv.h>
 #include <gtest_shared_autodestroy.h>
 
+using namespace boost::placeholders;
+
 class CompMatch
 {
 };
diff --git a/src/point/tests/test-point.h b/src/point/tests/test-point.h
index c0f2664..8d6ac34 100644
--- a/src/point/tests/test-point.h
+++ b/src/point/tests/test-point.h
@@ -29,7 +29,7 @@
 #include <gtest/gtest.h>
 #include <core/point.h>
 #include <iostream>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 class CompWindowPointTest : public ::testing::Test
 {
diff --git a/src/privatescreen/tests/test-privatescreen.cpp b/src/privatescreen/tests/test-privatescreen.cpp
index c412f7a..c8c979d 100644
--- a/src/privatescreen/tests/test-privatescreen.cpp
+++ b/src/privatescreen/tests/test-privatescreen.cpp
@@ -11,6 +11,7 @@
 
 #include <stdlib.h>
 
+using namespace boost::placeholders;
 using ::testing::Return;
 using ::testing::ReturnRef;
 using ::testing::_;
diff --git a/src/screen.cpp b/src/screen.cpp
index 8629530..9ab20be 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -42,7 +42,7 @@
 #include <libgen.h>
 #include <algorithm>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
 #define foreach BOOST_FOREACH
@@ -65,6 +65,8 @@
 #include "privateaction.h"
 #include "privatestackdebugger.h"
 
+using namespace boost::placeholders;
+
 template class WrapableInterface<CompScreen, ScreenInterface>;
 
 CompOutput *targetOutput;
diff --git a/src/session.cpp b/src/session.cpp
index f5ff49c..8188c81 100644
--- a/src/session.cpp
+++ b/src/session.cpp
@@ -41,7 +41,7 @@
 #include <X11/SM/SMlib.h>
 #include <X11/ICE/ICElib.h>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #define SM_DEBUG(x)
 
diff --git a/src/tests/test_configurerequestbuffer.cpp b/src/tests/test_configurerequestbuffer.cpp
index 44503b4..cd4a167 100644
--- a/src/tests/test_configurerequestbuffer.cpp
+++ b/src/tests/test_configurerequestbuffer.cpp
@@ -25,7 +25,7 @@
 #include <deque>
 #include <boost/shared_ptr.hpp>
 #include <boost/make_shared.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <X11/Xlib.h>
@@ -33,6 +33,8 @@
 #include "configurerequestbuffer-impl.h"
 #include "asyncserverwindow.h"
 
+using namespace boost::placeholders;
+
 namespace crb = compiz::window::configure_buffers;
 namespace cw = compiz::window;
 
diff --git a/src/timer/tests/test-timer.h b/src/timer/tests/test-timer.h
index a351e5c..5b355e1 100644
--- a/src/timer/tests/test-timer.h
+++ b/src/timer/tests/test-timer.h
@@ -33,7 +33,7 @@
 #include <core/timer.h>
 #include <privatetimeouthandler.h>
 #include <privatetimeoutsource.h>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/shared_ptr.hpp>
 #include <deque>
 
diff --git a/src/window.cpp b/src/window.cpp
index d5aafe6..10f0eea 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -36,7 +36,7 @@
 #include <assert.h>
 #include <math.h>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/pointer_cast.hpp>
 
@@ -51,6 +51,8 @@
 
 #include <boost/scoped_array.hpp>
 
+using namespace boost::placeholders;
+
 namespace crb = compiz::window::configure_buffers;
 namespace cw  = compiz::window;
 
diff --git a/src/window/constrainment/tests/test-window-constrainment.h b/src/window/constrainment/tests/test-window-constrainment.h
index 1286253..1449aa1 100644
--- a/src/window/constrainment/tests/test-window-constrainment.h
+++ b/src/window/constrainment/tests/test-window-constrainment.h
@@ -30,7 +30,7 @@
 #include <core/windowconstrainment.h>
 #include <core/windowgeometry.h>
 #include <iostream>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 class CompWindowConstrainmentTest : public ::testing::Test
 {
diff --git a/src/window/extents/tests/test-window-extents.h b/src/window/extents/tests/test-window-extents.h
index bfe6e23..1166cf8 100644
--- a/src/window/extents/tests/test-window-extents.h
+++ b/src/window/extents/tests/test-window-extents.h
@@ -29,7 +29,7 @@
 #include <gtest/gtest.h>
 #include <core/windowextents.h>
 #include <iostream>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 class CompWindowExtentsTest : public ::testing::Test
 {
diff --git a/src/window/geometry-saver/tests/test-window-geometry-saver.h b/src/window/geometry-saver/tests/test-window-geometry-saver.h
index c748c2b..e85c7c6 100644
--- a/src/window/geometry-saver/tests/test-window-geometry-saver.h
+++ b/src/window/geometry-saver/tests/test-window-geometry-saver.h
@@ -30,7 +30,7 @@
 #include <core/windowgeometrysaver.h>
 #include <core/rect.h>
 #include <iostream>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 class CompWindowGeometryTest : public ::testing::Test
 {
diff --git a/src/window/geometry/tests/test-window-geometry.h b/src/window/geometry/tests/test-window-geometry.h
index 555bd37..2aea23d 100644
--- a/src/window/geometry/tests/test-window-geometry.h
+++ b/src/window/geometry/tests/test-window-geometry.h
@@ -30,7 +30,7 @@
 #include <core/windowgeometry.h>
 #include <core/rect.h>
 #include <iostream>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 class CompWindowGeometryTest : public ::testing::Test
 {
diff --git a/tests/acceptance-tests/xorg-gtest/tests/compiz_acceptance_replace_current_wm.cpp b/tests/acceptance-tests/xorg-gtest/tests/compiz_acceptance_replace_current_wm.cpp
index a616d43..c6308f2 100644
--- a/tests/acceptance-tests/xorg-gtest/tests/compiz_acceptance_replace_current_wm.cpp
+++ b/tests/acceptance-tests/xorg-gtest/tests/compiz_acceptance_replace_current_wm.cpp
@@ -26,7 +26,7 @@
 #include <gmock/gmock.h>
 
 #include <boost/function.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <boost/shared_ptr.hpp>
 #include <boost/make_shared.hpp>
diff --git a/tests/shared/gtest_shared_autodestroy.h b/tests/shared/gtest_shared_autodestroy.h
index db19c8d..043af74 100644
--- a/tests/shared/gtest_shared_autodestroy.h
+++ b/tests/shared/gtest_shared_autodestroy.h
@@ -21,9 +21,11 @@
 #ifndef _COMPIZ_GTEST_SHARED_AUTODESTROY_H
 #define _COMPIZ_GTEST_SHARED_AUTODESTROY_H
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/shared_ptr.hpp>
 
+using namespace boost::placeholders;
+
 namespace
 {
     template <typename T, typename TDel>
diff --git a/tests/system/xorg-gtest/tests/compiz_xorg_gtest_configure_window.cpp b/tests/system/xorg-gtest/tests/compiz_xorg_gtest_configure_window.cpp
index 1f85e0a..3caa3a1 100644
--- a/tests/system/xorg-gtest/tests/compiz_xorg_gtest_configure_window.cpp
+++ b/tests/system/xorg-gtest/tests/compiz_xorg_gtest_configure_window.cpp
@@ -31,7 +31,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 #include <boost/function.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <xorg/gtest/xorg-gtest.h>
 #include <compiz-xorg-gtest.h>
 #include <compiz_xorg_gtest_communicator.h>
@@ -41,6 +41,8 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
+using namespace boost::placeholders;
+
 using ::testing::MatchResultListener;
 using ::testing::MakeMatcher;
 using ::testing::Matcher;
diff --git a/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp b/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp
index eb4df5b..75e4f79 100644
--- a/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp
+++ b/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp
@@ -24,7 +24,7 @@
 #include <string>
 #include <stdexcept>
 #include <boost/function.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/make_shared.hpp>
 #include <gtest/gtest.h>
diff --git a/tests/system/xorg-gtest/tests/compiz_xorg_gtest_icccm.cpp b/tests/system/xorg-gtest/tests/compiz_xorg_gtest_icccm.cpp
index 5687e2f..4901d1a 100644
--- a/tests/system/xorg-gtest/tests/compiz_xorg_gtest_icccm.cpp
+++ b/tests/system/xorg-gtest/tests/compiz_xorg_gtest_icccm.cpp
@@ -24,7 +24,7 @@
 #include <string>
 #include <stdexcept>
 #include <boost/function.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/make_shared.hpp>
 #include <gtest/gtest.h>
diff --git a/tests/system/xorg-gtest/tests/compiz_xorg_gtest_test_window_stacking.cpp b/tests/system/xorg-gtest/tests/compiz_xorg_gtest_test_window_stacking.cpp
index 9c806e2..f7ab915 100644
--- a/tests/system/xorg-gtest/tests/compiz_xorg_gtest_test_window_stacking.cpp
+++ b/tests/system/xorg-gtest/tests/compiz_xorg_gtest_test_window_stacking.cpp
@@ -27,7 +27,7 @@
 #include <gmock/gmock.h>
 
 #include <boost/shared_array.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <xorg/gtest/xorg-gtest.h>
 #include <compiz-xorg-gtest.h>
@@ -36,6 +36,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
+using namespace boost::placeholders;
 using ::testing::MatchResultListener;
 using ::testing::MakeMatcher;
 using ::testing::Matcher;
diff --git a/tests/xorg-gtest/plugins/testhelper/src/testhelper.cpp b/tests/xorg-gtest/plugins/testhelper/src/testhelper.cpp
index e6bcea5..688525d 100644
--- a/tests/xorg-gtest/plugins/testhelper/src/testhelper.cpp
+++ b/tests/xorg-gtest/plugins/testhelper/src/testhelper.cpp
@@ -24,9 +24,11 @@
 */
 
 #include <boost/shared_ptr.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include "testhelper.h"
 
+using namespace boost::placeholders;
+
 COMPIZ_PLUGIN_20090315 (testhelper, TestHelperPluginVTable)
 
 namespace