diff --git a/Core/Code/Rendering/mitkPointSetGLMapper2D.h b/Core/Code/Rendering/mitkPointSetGLMapper2D.h
index 3d32447ef1..b50b775162 100644
--- a/Core/Code/Rendering/mitkPointSetGLMapper2D.h
+++ b/Core/Code/Rendering/mitkPointSetGLMapper2D.h
@@ -1,98 +1,98 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef MITKPointSetMAPPER2D_H_HEADER_INCLUDED
 #define MITKPointSetMAPPER2D_H_HEADER_INCLUDED
 
 #include <MitkExports.h>
 #include "mitkGLMapper.h"
 
 namespace mitk {
 
 class BaseRenderer;
 class PointSet;
 
 /**
  * @brief OpenGL-based mapper to display a mitk::PointSet in a 2D window.
  *
  * This mapper can actually more than just draw a number of points of a
  * mitk::PointSet. If you set the right properties of the mitk::DataNode,
  * which contains the point set, then this mapper will also draw lines
  * connecting the points, and calculate and display distances and angles
  * between adjacent points. Here is a complete list of boolean properties,
  * which might be of interest:
  *
  * - \b "show contour": Draw not only the points but also the connections between
  *     them (default false)
  * - \b "line width": IntProperty which gives the width of the contour lines
  * - \b "show points": Wheter or not to draw the actual points (default true)
  * - \b "show distances": Wheter or not to calculate and print the distance
  *     between adjacent points (default false)
  * - \b "show angles": Wheter or not to calculate and print the angle between
  *     adjacent points (default false)
  * - \b "show distant lines": When true, the mapper will also draw contour
  *     lines that are far away form the current slice (default true)
  * - \b "label": StringProperty with a label for this point set
  *
  * BUG 1321 - possible new features:
  * point-2d-size (length of lines in cross/diamond)
  * point-linewidth
  *
  * @ingroup Mapper
  */
 
 /** \deprecatedSince{2013_06} This mapper is replaced by PointSetVtkMapper2D. The child classes of this class are deprecated.
  * To further ensure their functionality PointSetGLMapper2D cannot be removed and is set deprecated too.
  */
-DEPRECATED(class MITK_CORE_EXPORT PointSetGLMapper2D) : public GLMapper
+class MITK_CORE_EXPORT DEPRECATED(PointSetGLMapper2D) : public GLMapper
 {
 public:
   mitkClassMacro(PointSetGLMapper2D, GLMapper);
 
   itkNewMacro(Self);
 
   /** @brief Get the PointDataList to map */
   virtual const mitk::PointSet * GetInput(void);
 
   virtual void Paint(mitk::BaseRenderer * renderer);
 
   virtual void ApplyAllProperties(mitk::BaseRenderer* renderer);
 
   static void SetDefaultProperties(mitk::DataNode* node, mitk::BaseRenderer* renderer = NULL, bool overwrite = false);
 
 protected:
   PointSetGLMapper2D();
 
   virtual ~PointSetGLMapper2D();
 
   bool m_Polygon;
   bool m_PolygonClosed;
   bool m_ShowPoints;
   bool m_ShowDistances;
   int m_DistancesDecimalDigits;
   bool m_ShowAngles;
   bool m_ShowDistantLines;
   int  m_LineWidth;
   int m_PointLineWidth;
   int m_Point2DSize;
 };
 
 } // namespace mitk
 
 
 
 #endif /* MITKPointSetMapper2D_H_HEADER_INCLUDED */
diff --git a/Core/Code/Testing/mitkPointSetVtkMapper2DGlyphTypeTest.cpp b/Core/Code/Testing/mitkPointSetVtkMapper2DGlyphTypeTest.cpp
index 1557729adf..6fbb2274e4 100644
--- a/Core/Code/Testing/mitkPointSetVtkMapper2DGlyphTypeTest.cpp
+++ b/Core/Code/Testing/mitkPointSetVtkMapper2DGlyphTypeTest.cpp
@@ -1,55 +1,55 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 //MITK
 #include "mitkTestingMacros.h"
 #include "mitkRenderingTestHelper.h"
 #include <mitkNodePredicateDataType.h>
 #include <mitkEnumerationProperty.h>
 #include <mitkBaseProperty.h>
 #include <mitkPointSet.h>
 
 //VTK
 #include <vtkRegressionTestImage.h>
 
 
 int mitkPointSetVtkMapper2DGlyphTypeTest(int argc, char* argv[])
 {
   // load all arguments into a datastorage, take last argument as reference rendering
   // setup a renderwindow of fixed size X*Y
   // render the datastorage
   // compare rendering to reference image
   MITK_TEST_BEGIN("mitkPointSetVtkMapper2DGlyphTypeTest")
 
-  mitkRenderingTestHelper renderingHelper(640, 480, argc, argv);
+  mitk::RenderingTestHelper renderingHelper(640, 480, argc, argv);
 
   renderingHelper.SetViewDirection(mitk::SliceNavigationController::ViewDirection::Sagittal);
 
   mitk::EnumerationProperty* eP = dynamic_cast<mitk::EnumerationProperty*> (renderingHelper.GetDataStorage()->GetNode(mitk::NodePredicateDataType::New("PointSet"))->GetProperty("Pointset.2D.shape"));
   // render triangles instead of crosses
   eP->SetValue(5);
 
   //### Usage of CompareRenderWindowAgainstReference: See docu of mitkRrenderingTestHelper
   MITK_TEST_CONDITION( renderingHelper.CompareRenderWindowAgainstReference(argc, argv) == true, "CompareRenderWindowAgainstReference test result positive?" );
 
  //use this to generate a reference screenshot or save the file:
   if(false)
   {
     renderingHelper.SaveReferenceScreenShot("C:/development_ITK4/output.png");
   }
 
   MITK_TEST_END();
 }
\ No newline at end of file
diff --git a/Core/Code/Testing/mitkPointSetVtkMapper2DImageTest.cpp b/Core/Code/Testing/mitkPointSetVtkMapper2DImageTest.cpp
index 50a600af61..7eca24edd4 100644
--- a/Core/Code/Testing/mitkPointSetVtkMapper2DImageTest.cpp
+++ b/Core/Code/Testing/mitkPointSetVtkMapper2DImageTest.cpp
@@ -1,45 +1,45 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 //MITK
 #include "mitkTestingMacros.h"
 #include "mitkRenderingTestHelper.h"
 
 //VTK
 #include <vtkRegressionTestImage.h>
 
 
 int mitkPointSetVtkMapper2DImageTest(int argc, char* argv[])
 {
   // load all arguments into a datastorage, take last argument as reference rendering
   // setup a renderwindow of fixed size X*Y
   // render the datastorage
   // compare rendering to reference image
   MITK_TEST_BEGIN("mitkPointSetVtkMapper2DImageTest")
 
-  mitkRenderingTestHelper renderingHelper(640, 480, argc, argv);
+  mitk::RenderingTestHelper renderingHelper(640, 480, argc, argv);
 
   //### Usage of CompareRenderWindowAgainstReference: See docu of mitkRrenderingTestHelper
   MITK_TEST_CONDITION( renderingHelper.CompareRenderWindowAgainstReference(argc, argv) == true, "CompareRenderWindowAgainstReference test result positive?" );
 
  //use this to generate a reference screenshot or save the file:
   if(false)
   {
     renderingHelper.SaveReferenceScreenShot("C:/development_ITK4/output.png");
   }
 
   MITK_TEST_END();
 }
\ No newline at end of file
diff --git a/Core/Code/Testing/mitkPointSetVtkMapper2DTest.cpp b/Core/Code/Testing/mitkPointSetVtkMapper2DTest.cpp
index 27377c36d6..3fbdc4cfa6 100644
--- a/Core/Code/Testing/mitkPointSetVtkMapper2DTest.cpp
+++ b/Core/Code/Testing/mitkPointSetVtkMapper2DTest.cpp
@@ -1,48 +1,48 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 //MITK
 #include "mitkTestingMacros.h"
 #include "mitkRenderingTestHelper.h"
 
 //VTK
 #include <vtkRegressionTestImage.h>
 
 
 int mitkPointSetVtkMapper2DTest(int argc, char* argv[])
 {
   // load all arguments into a datastorage, take last argument as reference rendering
   // setup a renderwindow of fixed size X*Y
   // render the datastorage
   // compare rendering to reference image
   MITK_TEST_BEGIN("mitkPointSetVtkMapper2DTest")
 
-  mitkRenderingTestHelper renderingHelper(640, 480, argc, argv);
+  mitk::RenderingTestHelper renderingHelper(640, 480, argc, argv);
 
   // sagittal view direction
   renderingHelper.SetViewDirection(mitk::SliceNavigationController::ViewDirection::Sagittal);
 
   //### Usage of CompareRenderWindowAgainstReference: See docu of mitkRrenderingTestHelper
   MITK_TEST_CONDITION( renderingHelper.CompareRenderWindowAgainstReference(argc, argv) == true, "CompareRenderWindowAgainstReference test result positive?" );
 
  //use this to generate a reference screenshot or save the file:
   if(false)
   {
     renderingHelper.SaveReferenceScreenShot("C:/development_ITK4/output.png");
   }
 
   MITK_TEST_END();
 }
\ No newline at end of file
diff --git a/Modules/MitkExt/Rendering/mitkLineMapper2D.h b/Modules/MitkExt/Rendering/mitkLineMapper2D.h
index ac1180f57e..f9524b07e2 100644
--- a/Modules/MitkExt/Rendering/mitkLineMapper2D.h
+++ b/Modules/MitkExt/Rendering/mitkLineMapper2D.h
@@ -1,58 +1,58 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef MITKLINEMAPPER2D_H_HEADER_INCLUDED
 #define MITKLINEMAPPER2D_H_HEADER_INCLUDED
 
 #include "mitkCommon.h"
 #include "MitkExtExports.h"
 #include "mitkPointSetGLMapper2D.h"
 
 namespace mitk {
 
 class BaseRenderer;
 class PointSet;
 
 //##Documentation
 //## @brief OpenGL-based mapper to display Lines
 //##
 //## uses the information from the PointSet to build up the lines.
 //## Only lines in 2D in one Slice are drawn, not between slices!
 //## @ingroup Mapper
 
 /** \deprecatedSince{2013_06} This mapper is deprecated. */
-DEPRECATED(class MitkExt_EXPORT LineMapper2D) : public PointSetGLMapper2D
+class MitkExt_EXPORT DEPRECATED(LineMapper2D) : public PointSetGLMapper2D
 {
 public:
   mitkClassMacro(LineMapper2D, PointSetGLMapper2D);
   itkNewMacro(Self);
 
   //##Documentation
   //## @brief Get the PointDataList to map
   const PointSet * GetInput(void);
 
   virtual void Paint(mitk::BaseRenderer * renderer);
 
 protected:
   LineMapper2D();
 
   virtual ~LineMapper2D();
 };
 
 } // namespace mitk
 
 #endif /* MITKLINEMAPPER2D_H_HEADER_INCLUDED */
diff --git a/Modules/MitkExt/Rendering/mitkSplineMapper2D.h b/Modules/MitkExt/Rendering/mitkSplineMapper2D.h
index dcb24752b7..5fd7babf73 100755
--- a/Modules/MitkExt/Rendering/mitkSplineMapper2D.h
+++ b/Modules/MitkExt/Rendering/mitkSplineMapper2D.h
@@ -1,85 +1,85 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef MITKSplineMapper2D_H_HEADER_INCLUDED
 #define MITKSplineMapper2D_H_HEADER_INCLUDED
 
 #include "mitkCommon.h"
 #include "MitkExtExports.h"
 #include "mitkGLMapper.h"
 #include "mitkPointSetGLMapper2D.h"
 #include <vtkSystemIncludes.h>
 
 namespace mitk
 {
 
 class BaseRenderer;
 class PointSet;
 
 //##Documentation
 //## @brief OpenGL-based mapper to display a spline based on a mitk::PointSet in a 2D window.
 //##
 /** This mapper can actually more than just draw a number of points of a
 * mitk::PointSet. If you set the right properties of the mitk::DataNode,
 * which contains the point set, then this mapper will also draw lines
 * connecting the points, and calculate and display distances and angles
 * between adjacent points. Here is a complete list of boolean properties,
 * which might be of interest:
 *
 * - \b "show contour": Draw not only the points but also the connections between
 *     them (default false)
 * - \b "line width": IntProperty which gives the width of the contour lines
 * - \b "show points": Wheter or not to draw the actual points (default true)
 * - \b "show distances": Wheter or not to calculate and print the distance
 *     between adjacent points (default false)
 * - \b "show angles": Wheter or not to calculate and print the angle between
 *     adjacent points (default false)
 * - \b "show distant lines": When true, the mapper will also draw contour
 *     lines that are far away form the current slice (default true)
 * - \b "label": StringProperty with a label for this point set
 */
 //## @ingroup Mapper
 
 /** \deprecatedSince{2013_06} This mapper is deprecated. */
-DEPRECATED(class MitkExt_EXPORT SplineMapper2D) : public PointSetGLMapper2D
+class MitkExt_EXPORT DEPRECATED(SplineMapper2D) : public PointSetGLMapper2D
 {
 public:
   mitkClassMacro ( SplineMapper2D, PointSetGLMapper2D );
 
   itkNewMacro ( Self );
 
   virtual void Paint ( mitk::BaseRenderer * renderer );
 
   virtual void ApplyProperties ( mitk::BaseRenderer* renderer );
 
   itkSetMacro ( MaxProjectionDistance, vtkFloatingPointType );
 
   itkGetMacro ( MaxProjectionDistance, vtkFloatingPointType );
 
 protected:
   SplineMapper2D();
 
   virtual ~SplineMapper2D();
 
   vtkFloatingPointType m_MaxProjectionDistance;
 };
 
 } // namespace mitk
 
 
 
 #endif /* MITKSplineMapper2D_H_HEADER_INCLUDED */