diff --git a/src/core/renderer/qgsrenderer.cpp b/src/core/renderer/qgsrenderer.cpp
diff --git a/src/core/renderer/qgsrenderer.h b/src/core/renderer/qgsrenderer.h
diff --git a/src/core/symbology-ng/qgssymbollayerv2.cpp b/src/core/symbology-ng/qgssymbollayerv2.cpp
@@ -15,7 +15,6 @@
 
 #include "qgssymbollayerv2.h"
 #include "qgsclipper.h"
-#include "qgsrenderer.h"
 #include "qgsrendercontext.h"
 
 #include <QSize>

diff --git a/src/core/symbology-ng/qgssymbolv2.cpp b/src/core/symbology-ng/qgssymbolv2.cpp
@@ -13,7 +13,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "qgsrenderer.h"
 #include "qgssymbolv2.h"
 #include "qgssymbollayerv2.h"
 
@@ -375,6 +374,9 @@ QSet<QString> QgsSymbolV2::usedAttributes() const
 
 ////////////////////
 
+QColor QgsSymbolV2RenderContext::mSelectionColor = QColor( 0, 0, 0 );
+
+
 QgsSymbolV2RenderContext::QgsSymbolV2RenderContext( QgsRenderContext& c, QgsSymbolV2::OutputUnit u, qreal alpha, bool selected, int renderHints, const QgsFeature* f )
     : mRenderContext( c ), mOutputUnit( u ), mAlpha( alpha ), mSelected( selected ), mRenderHints( renderHints ), mFeature( f ), mLayer( 0 )
 {
@@ -388,10 +390,16 @@ QgsSymbolV2RenderContext::~QgsSymbolV2RenderContext()
 
 QColor QgsSymbolV2RenderContext::selectionColor()
 {
-  return QgsRenderer::selectionColor();
+  return mSelectionColor;
+}
+
+void QgsSymbolV2RenderContext::setSelectionColor( const QColor& color )
+{
+  mSelectionColor = color;
 }
 
 
+
 double QgsSymbolV2RenderContext::outputLineWidth( double width ) const
 {
   return width * QgsSymbolLayerV2Utils::lineWidthScaleFactor( mRenderContext, mOutputUnit );

diff --git a/src/core/symbology-ng/qgssymbolv2.h b/src/core/symbology-ng/qgssymbolv2.h
@@ -183,6 +183,8 @@ class CORE_EXPORT QgsSymbolV2RenderContext
 
     // Color used for selections
     static QColor selectionColor();
+    //! @note added in 2.0
+    static void setSelectionColor( const QColor& color );
 
     double outputLineWidth( double width ) const;
     double outputPixelSize( double size ) const;
@@ -198,6 +200,10 @@ class CORE_EXPORT QgsSymbolV2RenderContext
     int mRenderHints;
     const QgsFeature* mFeature; //current feature
     const QgsVectorLayer* mLayer; //current vectorlayer
+
+    /**Color to draw selected features - static so we can change it in proj props and automatically
+     all renderers are updated*/
+    static QColor mSelectionColor;
 };
 
 

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -318,7 +318,6 @@ INCLUDE_DIRECTORIES(
   ../core
   ../core/composer
   ../core/raster
-  ../core/renderer
   ../core/symbology
   ../core/symbology-ng
   ${CMAKE_CURRENT_BINARY_DIR}

diff --git a/src/gui/qgsattributedialog.cpp b/src/gui/qgsattributedialog.cpp
@@ -21,7 +21,6 @@
 #include "qgsproject.h"
 #include "qgsvectorlayer.h"
 #include "qgsvectordataprovider.h"
-#include "qgsuniquevaluerenderer.h"
 #include "qgssymbol.h"
 #include "qgsattributeeditor.h"
 #include "qgshighlight.h"

diff --git a/src/gui/qgsattributeeditor.cpp b/src/gui/qgsattributeeditor.cpp
@@ -18,7 +18,6 @@
 #include "qgsattributeeditor.h"
 #include <qgsvectorlayer.h>
 #include <qgsvectordataprovider.h>
-#include <qgsuniquevaluerenderer.h>
 #include <qgscategorizedsymbolrendererv2.h>
 #include <qgssymbol.h>
 #include <qgslonglongvalidator.h>

diff --git a/src/mapserver/CMakeLists.txt b/src/mapserver/CMakeLists.txt
@@ -95,7 +95,6 @@ INCLUDE_DIRECTORIES(
   ${QGIS_INCLUDE_DIR}
   ../core
   ../core/raster
-  ../core/renderer
   ../core/symbology
   ../core/symbology-ng
   ../core/composer

diff --git a/src/mapserver/qgsprojectparser.cpp b/src/mapserver/qgsprojectparser.cpp
@@ -23,7 +23,6 @@
 #include "qgslogger.h"
 #include "qgsmapserviceexception.h"
 #include "qgsrasterlayer.h"
-#include "qgsrenderer.h"
 #include "qgsvectorlayer.h"
 #include "qgsvectordataprovider.h"
 

diff --git a/src/mapserver/qgswfsserver.cpp b/src/mapserver/qgswfsserver.cpp
@@ -37,7 +37,6 @@
 #include "qgssldparser.h"
 #include "qgssymbol.h"
 #include "qgssymbolv2.h"
-#include "qgsrenderer.h"
 #include "qgslegendmodel.h"
 #include "qgscomposerlegenditem.h"
 #include "qgsrequesthandler.h"

diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
@@ -35,7 +35,6 @@
 #include "qgssldparser.h"
 #include "qgssymbol.h"
 #include "qgssymbolv2.h"
-#include "qgsrenderer.h"
 #include "qgsrendererv2.h"
 #include "qgslegendmodel.h"
 #include "qgscomposerlegenditem.h"
@@ -973,8 +972,8 @@ QImage* QgsWMSServer::initializeRendering( QStringList& layersList, QStringList&
 #endif
   mMapRenderer->setLayerSet( layerIdList );
 
-  //set selection color prior to each render to avoid problems with caching (selection color is a global property of QgsRenderer)
-  QgsRenderer::setSelectionColor( mConfigParser->selectionColor() );
+  //set selection color prior to each render to avoid problems with caching (selection color is a global property of QgsSymbolV2RenderContext)
+  QgsSymbolV2RenderContext::setSelectionColor( mConfigParser->selectionColor() );
   return theImage;
 }
 

diff --git a/src/plugins/compass/CMakeLists.txt b/src/plugins/compass/CMakeLists.txt
@@ -31,7 +31,7 @@ ADD_LIBRARY (compassplugin MODULE ${COMPASS_SRCS} ${COMPASS_MOC_SRCS} ${COMPASS_
 
 INCLUDE_DIRECTORIES(
      ${CMAKE_CURRENT_BINARY_DIR}
-     ../../core ../../core/raster ../../core/renderer ../../core/symbology
+     ../../core ../../core/raster ../../core/symbology
      ../../gui
      ..
 )

diff --git a/src/plugins/delimited_text/CMakeLists.txt b/src/plugins/delimited_text/CMakeLists.txt
@@ -19,7 +19,7 @@ ADD_LIBRARY (delimitedtextplugin MODULE ${DLTEXT_SRCS} ${DLTEXT_MOC_SRCS} ${DLTE
 
 INCLUDE_DIRECTORIES(
      ${CMAKE_CURRENT_BINARY_DIR}
-     ../../core ../../core/raster ../../core/renderer ../../core/symbology
+     ../../core ../../core/raster ../../core/symbology
      ../../gui
      ..
      ../../providers/delimitedtext/delimitedtext

diff --git a/src/plugins/diagram_overlay/CMakeLists.txt b/src/plugins/diagram_overlay/CMakeLists.txt
@@ -31,7 +31,6 @@ INCLUDE_DIRECTORIES(
      ../../core
      ../../core/pal
      ../../core/raster
-     ../../core/renderer
      ../../core/symbology
      ../../gui
      ..

diff --git a/src/plugins/dxf2shp_converter/CMakeLists.txt b/src/plugins/dxf2shp_converter/CMakeLists.txt
@@ -35,7 +35,6 @@ INCLUDE_DIRECTORIES(
      ${CMAKE_CURRENT_BINARY_DIR}
      ../../core
      ../../core/raster
-     ../../core/renderer
      ../../core/symbology
      ../../gui
      ..

diff --git a/src/plugins/georeferencer/CMakeLists.txt b/src/plugins/georeferencer/CMakeLists.txt
@@ -74,7 +74,7 @@ ADD_LIBRARY (georefplugin MODULE ${GEOREF_SRCS} ${GEOREF_MOC_SRCS} ${GEOREF_RCC_
 INCLUDE_DIRECTORIES(
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${CMAKE_CURRENT_BINARY_DIR}
-     ../../core ../../core/raster ../../core/renderer ../../core/symbology ../../core/composer
+     ../../core ../../core/raster ../../core/symbology ../../core/composer
      ../../gui
      ..
      ${GSL_INCLUDE_DIR}

diff --git a/src/plugins/globe/CMakeLists.txt b/src/plugins/globe/CMakeLists.txt
@@ -52,7 +52,7 @@ INCLUDE_DIRECTORIES(
      ${OSGEARTH_INCLUDE_DIR}
      ${OSG_INCLUDE_DIR}
      ${GEOS_INCLUDE_DIR}
-     ../../core ../../core/raster ../../core/renderer ../../core/symbology
+     ../../core ../../core/raster ../../core/symbology
      ../../gui
      ..
 )

diff --git a/src/plugins/grass/CMakeLists.txt b/src/plugins/grass/CMakeLists.txt
@@ -136,7 +136,6 @@ INCLUDE_DIRECTORIES(
      ${CMAKE_CURRENT_BINARY_DIR}
      ../../core 
      ../../core/raster 
-     ../../core/renderer 
      ../../core/symbology
      ../../gui
      ../../providers/grass

diff --git a/src/plugins/interpolation/CMakeLists.txt b/src/plugins/interpolation/CMakeLists.txt
@@ -44,7 +44,6 @@ INCLUDE_DIRECTORIES(
      ../../analysis/interpolation
      ../../core
      ../../core/raster
-     ../../core/renderer
      ../../core/symbology
      ../../gui
      ..

diff --git a/src/plugins/offline_editing/CMakeLists.txt b/src/plugins/offline_editing/CMakeLists.txt
@@ -44,7 +44,7 @@ ENDIF (WITH_INTERNAL_SPATIALITE)
 
 INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_BINARY_DIR}
-  ../../core ../../core/raster ../../core/renderer ../../core/symbology
+  ../../core ../../core/raster ../../core/symbology
   ../../gui
   ..
   ${GEOS_INCLUDE_DIR}

diff --git a/src/plugins/oracle_raster/CMakeLists.txt b/src/plugins/oracle_raster/CMakeLists.txt
@@ -34,7 +34,7 @@ ADD_LIBRARY (oracleplugin MODULE ${ORACLE_SRCS} ${ORACLE_MOC_SRCS} ${ORACLE_RCC_
 
 INCLUDE_DIRECTORIES(
      ${CMAKE_CURRENT_BINARY_DIR}
-     ../../core ../../core/raster ../../core/renderer ../../core/symbology
+     ../../core ../../core/raster ../../core/symbology
      ../../gui
      ..
      ${GDAL_INCLUDE_DIR}

diff --git a/src/plugins/plugin_template/CMakeLists.txt b/src/plugins/plugin_template/CMakeLists.txt
@@ -29,7 +29,7 @@ ADD_LIBRARY ([pluginlcasename]plugin MODULE ${[pluginlcasename]_SRCS} ${[pluginl
 
 INCLUDE_DIRECTORIES(
      ${CMAKE_CURRENT_BINARY_DIR}
-     ../../core ../../core/raster ../../core/renderer ../../core/symbology
+     ../../core ../../core/raster ../../core/symbology
      ../../gui
      ..
 )

diff --git a/src/plugins/qgsrendererplugin.h b/src/plugins/qgsrendererplugin.h
diff --git a/src/plugins/spatialquery/CMakeLists.txt b/src/plugins/spatialquery/CMakeLists.txt
@@ -36,7 +36,6 @@ INCLUDE_DIRECTORIES(
      ${CMAKE_CURRENT_BINARY_DIR}/../../ui/
      ../../core
      ../../core/raster
-     ../../core/renderer
      ../../core/symbology
      ../../gui
      ..

diff --git a/src/plugins/spit/CMakeLists.txt b/src/plugins/spit/CMakeLists.txt
@@ -55,7 +55,7 @@ ADD_LIBRARY (spitplugin MODULE ${SPIT_PLUGIN_SRCS} ${SPIT_PLUGIN_MOC_SRCS} ${SPI
 
 INCLUDE_DIRECTORIES(
      ${CMAKE_CURRENT_BINARY_DIR}
-     ../../core ../../core/raster ../../core/renderer ../../core/symbology
+     ../../core ../../core/raster ../../core/symbology
      ../../gui
      ../../ui
      ../../app

diff --git a/src/plugins/sqlanywhere/CMakeLists.txt b/src/plugins/sqlanywhere/CMakeLists.txt
@@ -50,7 +50,6 @@ INCLUDE_DIRECTORIES(
      ${CMAKE_CURRENT_BINARY_DIR}/../../ui
      ../../core
      ../../core/raster
-     ../../core/renderer
      ../../core/symbology
      ../../gui
      ../../app

diff --git a/src/plugins/topology/CMakeLists.txt b/src/plugins/topology/CMakeLists.txt
@@ -41,7 +41,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_BINARY_DIR}/src/ui
   ${CMAKE_CURRENT_BINARY_DIR}
   ${GEOS_INCLUDE_DIR}
-  ../../core ../../core/raster ../../core/renderer ../../core/symbology
+  ../../core ../../core/raster ../../core/symbology
   ../../gui  
   ..
 )

diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
@@ -14,7 +14,6 @@ SET(QGISPYTHON_SRCS qgispython.cpp qgspythonutilsimpl.cpp)
 INCLUDE_DIRECTORIES(
   ../core
   ../core/raster
-  ../core/renderer
   ../core/symbology
   ../gui
   ${PYTHON_INCLUDE_PATH}

diff --git a/tests/src/core/testziplayer.cpp b/tests/src/core/testziplayer.cpp
@@ -26,8 +26,6 @@
 #include <qgsrasterlayer.h>
 #include <qgsdataitem.h>
 #include "qgsconfig.h"
-#include <qgsrenderer.h>
-#include <qgsuniquevaluerenderer.h>
 
 #include <gdal.h>