Restore cleanups to rtengine/dcp.*

rtengine/imagesource.h

@@ -28,7 +28,6 @@
 #include "rtengine.h"
 #include "colortemp.h"
 #include "array2D.h"
-#include "dcp.h"
 
 template<typename T>
 class LUT;
@@ -42,8 +41,9 @@ namespace rtengine
 {
 
 class ColorTemp;
-class Imagefloat;
 class DCPProfile;
+class DCPProfileApplyState;
+class Imagefloat;
 class RetinexgaintransmissionCurve;
 class RetinextransmissionCurve;
 
@@ -137,7 +137,7 @@ public:
 
     virtual ImageMatrices* getImageMatrices () = 0;
     virtual bool           isRAW () const = 0;
-    virtual DCPProfile*    getDCP (const procparams::ColorManagementParams &cmp, DCPProfile::ApplyState &as)
+    virtual DCPProfile*    getDCP (const procparams::ColorManagementParams &cmp, DCPProfileApplyState &as)
     {
         return nullptr;
     };