diff --git a/Modules/Core/include/mitkColorProperty.h b/Modules/Core/include/mitkColorProperty.h
index c4a3ae0be4..8b31242324 100644
--- a/Modules/Core/include/mitkColorProperty.h
+++ b/Modules/Core/include/mitkColorProperty.h
@@ -1,118 +1,121 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
 #ifndef mitkColorProperty_h
 #define mitkColorProperty_h
 
-#include "mitkBaseProperty.h"
+#include <mitkBaseProperty.h>
 #include <MitkCoreExports.h>
+
 #include <itkRGBPixel.h>
 
+#include <nlohmann/json.hpp>
+
 namespace mitk
 {
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable : 4522)
 #endif
 
   /**
    * @brief Color Standard RGB color typedef (float)
    *
    * Standard RGB color typedef to get rid of template argument (float).
    * Color range is from 0.0f to 1.0f for each component.
    *
    * @ingroup Property
    */
   typedef itk::RGBPixel<float> Color;
 
   /**
    * @brief The ColorProperty class RGB color property
    * @ingroup DataManagement
    *
    * @note If you want to apply the mitk::ColorProperty to an mitk::Image
    * make sure to set the mitk::RenderingModeProperty to a mode which
    * supports color (e.g. LEVELWINDOW_COLOR). For an example how to use
    * the mitk::ColorProperty see mitkImageVtkMapper2DColorTest.cpp in
    * Core/Code/Rendering.
    */
   class MITKCORE_EXPORT ColorProperty : public BaseProperty
   {
   protected:
     mitk::Color m_Color;
 
     ColorProperty();
 
     ColorProperty(const ColorProperty &other);
 
     ColorProperty(const float red, const float green, const float blue);
 
     ColorProperty(const float color[3]);
 
     ColorProperty(const mitk::Color &color);
 
   public:
     mitkClassMacro(ColorProperty, BaseProperty);
     itkFactorylessNewMacro(Self);
     itkCloneMacro(Self) mitkNewMacro1Param(ColorProperty, const float *);
     mitkNewMacro1Param(ColorProperty, const mitk::Color &);
     mitkNewMacro3Param(ColorProperty, const float, const float, const float);
 
     typedef mitk::Color ValueType;
 
     const mitk::Color &GetColor() const;
     const mitk::Color &GetValue() const;
     std::string GetValueAsString() const override;
     void SetColor(const mitk::Color &color);
     void SetValue(const mitk::Color &color);
     void SetColor(float red, float green, float blue);
 
     bool ToJSON(nlohmann::json &j) const override;
     bool FromJSON(const nlohmann::json &j) override;
 
     using BaseProperty::operator=;
 
   private:
     // purposely not implemented
     ColorProperty &operator=(const ColorProperty &);
 
     itk::LightObject::Pointer InternalClone() const override;
 
     bool IsEqual(const BaseProperty &property) const override;
     bool Assign(const BaseProperty &property) override;
   };
 
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
 } // namespace mitk
 
 namespace itk
 {
   template <typename TComponent>
   void to_json(nlohmann::json& j, const RGBPixel<TComponent>& c)
   {
     j = nlohmann::json::array();
 
     for (size_t i = 0; i < 3; ++i)
       j.push_back(c[i]);
   }
 
   template <typename TComponent>
   void from_json(const nlohmann::json& j, RGBPixel<TComponent>& c)
   {
     for (size_t i = 0; i < 3; ++i)
       j.at(i).get_to(c[i]);
   }
 } // namespace itk
 
 #endif