diff --git a/CMakeLists.txt b/CMakeLists.txt
index c43ff49f7ef2abcc0cceb0704bfbe6e70a024285..fb7ef5eabf4d5ccd75b532e58cb2c5a764c85ff9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,7 +62,7 @@ IF(NOT CLIENT_ONLY)
   ADD_REQUIRED_DEPENDENCY("gepetto-viewer")
   ADD_REQUIRED_DEPENDENCY("urdfdom")
 
-  SET(BOOST_COMPONENTS system thread regex)
+  SET(BOOST_COMPONENTS system regex)
   SEARCH_FOR_BOOST ()
   FINDPYTHON()
 
diff --git a/include/gepetto/viewer/corba/server.hh b/include/gepetto/viewer/corba/server.hh
index 54c614f3d89ea2cd73c7aeb813932981aff4ec13..c82ca7d24963b1682f82fb4b9ac402a4941da79c 100644
--- a/include/gepetto/viewer/corba/server.hh
+++ b/include/gepetto/viewer/corba/server.hh
@@ -12,14 +12,14 @@
 # define SCENEVIEWER_CORBASERVER_SERVER_HH
 
 #include "gepetto/viewer/corba/fwd.hh"
-#include <gepetto/viewer/windows-manager.h>
+#include <gepetto/gui/windows-manager.hh>
 
 namespace graphics
 {
   namespace corbaServer
   {
-    using graphics::WindowsManager;
-    using graphics::WindowsManagerPtr_t;
+    using gepetto::gui::WindowsManager;
+    using gepetto::gui::WindowsManagerPtr_t;
 
     /// Implementation of Hpp module Corba server.
 
diff --git a/plugins/pyqcustomplot/CMakeLists.txt b/plugins/pyqcustomplot/CMakeLists.txt
index a751a24b5d3891b12cb6b5795133f7619f8912fc..2238f6192df0f81dca83046d89ad1e4a5683495a 100644
--- a/plugins/pyqcustomplot/CMakeLists.txt
+++ b/plugins/pyqcustomplot/CMakeLists.txt
@@ -22,7 +22,7 @@ ELSE()
   SET(QT4 "")
 ENDIF()
 
-INCLUDE_DIRECTORIES("${PYTHON_INCLUDE_DIR}" "${PYTHONQT_INCLUDE_DIR}")
+INCLUDE_DIRECTORIES(SYSTEM "${PYTHON_INCLUDE_DIR}" "${PYTHONQT_INCLUDE_DIR}")
 ADD_DEFINITIONS(-DQCUSTOMPLOT_COMPILE_LIBRARY)
 
 GEPETTO_GUI_PLUGIN(pyqcustomplot
@@ -47,3 +47,7 @@ GEPETTO_GUI_PLUGIN(pyqcustomplot
   PKG_CONFIG_DEPENDENCIES
   omniORB4
   )
+
+SET_SOURCE_FILES_PROPERTIES(qcustomplot.cpp
+  PROPERTIES
+  COMPILE_FLAGS "-Wno-conversion")
diff --git a/plugins/pyqgv/CMakeLists.txt b/plugins/pyqgv/CMakeLists.txt
index 50d1a6391a5ddc08bbab0ba96be8723e5da98c2a..dc3aae7786f6b00872c970144ebe476aba733465 100644
--- a/plugins/pyqgv/CMakeLists.txt
+++ b/plugins/pyqgv/CMakeLists.txt
@@ -22,7 +22,7 @@ ELSE()
   SET(QT4 "")
 ENDIF()
 
-INCLUDE_DIRECTORIES("${PYTHON_INCLUDE_DIR}" "${PYTHONQT_INCLUDE_DIR}")
+INCLUDE_DIRECTORIES(SYSTEM "${PYTHON_INCLUDE_DIR}" "${PYTHONQT_INCLUDE_DIR}")
 
 GEPETTO_GUI_PLUGIN(pyqgv
   INSIDE_GEPETTO_VIEWER_CORBA
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6da77b4965c3453c9996812bef29b569c5bb06aa..f808b2bf4f0643a45372aefde2377895494d1dd1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -63,6 +63,11 @@ IF(NOT CLIENT_ONLY)
     ${CMAKE_CURRENT_BINARY_DIR}/gepetto/viewer/corba/graphical-interface.hh
     ${CMAKE_CURRENT_BINARY_DIR}/gepetto/viewer/corba/graphical-interfaceSK.cc
   )
+  # Removes 5 warnings about anonymous variadic macros that were added from
+  # c++ 11.
+  SET_SOURCE_FILES_PROPERTIES(graphical-interface.impl.cpp
+    PROPERTIES
+    COMPILE_FLAGS "-Wno-variadic-macros")
 
   ADD_DEPENDENCIES (${LIBRARY_NAME} generate_idl_cpp)
   ADD_DEPENDENCIES (${LIBRARY_NAME} generate_idl_python)
diff --git a/src/graphical-interface.impl.cpp b/src/graphical-interface.impl.cpp
index 4cfa29e163418f02bda716e88b232e449b97dfc4..4850aea3e3e9ce31796e655ab3171c7aeb62c6d7 100644
--- a/src/graphical-interface.impl.cpp
+++ b/src/graphical-interface.impl.cpp
@@ -25,7 +25,7 @@ namespace graphics {
 
         template <typename Input, typename Output>
           void to (const Input& in, Output& out, const int size) {
-            for (CORBA::ULong i = 0; i < size; ++i)
+            for (CORBA::ULong i = 0; i < (CORBA::ULong)size; ++i)
               out[i] = in[i];
           }
 
diff --git a/src/graphical-interface.impl.hh b/src/graphical-interface.impl.hh
index 76f94a6631f96b76fdd64a8e06293cb9023d0b82..7b6e6b518f1940b400fbe65b115a41fb977b51be 100644
--- a/src/graphical-interface.impl.hh
+++ b/src/graphical-interface.impl.hh
@@ -24,14 +24,14 @@ struct NodeConfiguration {
     osgQuat quat;
 };
 
-using graphics::WindowsManagerPtr_t;
+using gepetto::gui::WindowsManagerPtr_t;
 class GraphicalInterface :
     public virtual POA_gepetto::corbaserver::GraphicalInterface
 {
 private:
     WindowsManagerPtr_t windowsManager_;
     typedef gepetto::Error Error;
-    typedef graphics::WindowsManager::value_type value_type;
+    typedef gepetto::gui::WindowsManager::value_type value_type;
     typedef gepetto::corbaserver::Transform_slice Transform_slice;
 
 public:
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 0a6c0e8491ce600c1ffa0ac05b03204f3c9c9cb8..9d9e6ef6b34cc61c9cdcaf5bf6c4841996675eb5 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -18,8 +18,6 @@
 # <http://www.gnu.org/licenses/>.
 
 # Configure the project
-INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/src)
-
 SET (${PROJECT_NAME}_SOURCES
   ${CMAKE_BINARY_DIR}/src/gui/main.cc
   settings.cc
@@ -43,7 +41,7 @@ SET (${PROJECT_NAME}_SOURCES
   )
 
 IF(GEPETTO_GUI_HAS_PYTHONQT)
-  INCLUDE_DIRECTORIES("${PYTHON_INCLUDE_DIR}" "${PYTHONQT_INCLUDE_DIR}")
+  INCLUDE_DIRECTORIES(SYSTEM "${PYTHON_INCLUDE_DIR}" "${PYTHONQT_INCLUDE_DIR}")
   SET (${PROJECT_NAME}_SOURCES
     ${${PROJECT_NAME}_SOURCES}
     pythonwidget.cc)
diff --git a/src/gui/selection-event.cc b/src/gui/selection-event.cc
index 23c3ab69a528211549106434a4cf10efaf078b3a..130e4cca2084ad7eef68cc809944e9388436bb30 100644
--- a/src/gui/selection-event.cc
+++ b/src/gui/selection-event.cc
@@ -30,9 +30,9 @@ namespace gepetto {
         out.setZ(in[2]);
       }
       void toQVector3(const osg::Vec3d& in, QVector3D& out) {
-        out.setX(in[0]);
-        out.setY(in[1]);
-        out.setZ(in[2]);
+        out.setX((float)in[0]);
+        out.setY((float)in[1]);
+        out.setZ((float)in[2]);
       }
     }
 
diff --git a/src/gui/tree-item.cc b/src/gui/tree-item.cc
index 6ee5be5044f08b13531c73ac14e7f89192b604cf..18b683d1307524abde85a74ca693f1bf4b296746 100644
--- a/src/gui/tree-item.cc
+++ b/src/gui/tree-item.cc
@@ -28,6 +28,8 @@
 #include <gepetto/gui/bodytreewidget.hh>
 
 namespace gepetto {
+  using graphics::ScopedLock;
+
   namespace gui {
     QWidget* boolPropertyEditor (BodyTreeItem* bti, const graphics::PropertyPtr_t prop)
     {
@@ -177,7 +179,7 @@ namespace gepetto {
         QVariant nameVariant = sender->property("propertyName");
         if (nameVariant.isValid()) {
           std::string name = nameVariant.toString().toStdString();
-          boost::mutex::scoped_lock lock (MainWindow::instance()->osg()->osgFrameMutex());
+          ScopedLock lock (MainWindow::instance()->osg()->osgFrameMutex());
           node_->setProperty<T>(name, value);
         } else {
           qDebug() << "Sender has no property propertyName" << sender;