From 1acca23fe1e6edd4139b45d50a73608c1d92a52f Mon Sep 17 00:00:00 2001
From: Ingo Weyrich <heckflosse67@gmx.de>
Date: Tue, 29 Oct 2019 22:45:26 +0100
Subject: [PATCH] Further cleanup of include dependencies

---
 rtengine/dynamicprofile.cc      | 2 ++
 rtengine/dynamicprofile.h       | 2 +-
 rtengine/gamutwarning.cc        | 1 +
 rtengine/gamutwarning.h         | 3 ++-
 rtengine/histmatching.cc        | 1 -
 rtengine/ipdehaze.cc            | 1 +
 rtengine/iplabregions.cc        | 1 +
 rtengine/ipshadowshighlights.cc | 1 +
 rtengine/ipsoftlight.cc         | 1 +
 rtgui/dynamicprofilepanel.cc    | 1 +
 rtgui/histogrampanel.cc         | 3 ---
 rtgui/iccprofilecreator.cc      | 1 +
 rtgui/navigator.cc              | 2 --
 rtgui/navigator.h               | 1 -
 rtgui/preferences.cc            | 1 +
 15 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/rtengine/dynamicprofile.cc b/rtengine/dynamicprofile.cc
index b9f76fa95..607b0b528 100644
--- a/rtengine/dynamicprofile.cc
+++ b/rtengine/dynamicprofile.cc
@@ -23,6 +23,8 @@
 #include <glibmm/regex.h>
 #include <glibmm/miscutils.h>
 
+#include "../rtgui/options.h"
+
 using namespace rtengine;
 using namespace rtengine::procparams;
 
diff --git a/rtengine/dynamicprofile.h b/rtengine/dynamicprofile.h
index 714f526f2..e23c57b49 100644
--- a/rtengine/dynamicprofile.h
+++ b/rtengine/dynamicprofile.h
@@ -21,7 +21,7 @@
 
 #include <glibmm/ustring.h>
 #include <vector>
-#include "../rtgui/options.h"
+#include "../rtengine/rtengine.h"
 
 class DynamicProfileRule
 {
diff --git a/rtengine/gamutwarning.cc b/rtengine/gamutwarning.cc
index fe6b7c0dc..290800f90 100644
--- a/rtengine/gamutwarning.cc
+++ b/rtengine/gamutwarning.cc
@@ -26,6 +26,7 @@
 #include <iostream>
 
 #include "gamutwarning.h"
+#include "iccstore.h"
 #include "image8.h"
 
 namespace rtengine {
diff --git a/rtengine/gamutwarning.h b/rtengine/gamutwarning.h
index b7ac5e41d..4e34ed431 100644
--- a/rtengine/gamutwarning.h
+++ b/rtengine/gamutwarning.h
@@ -25,7 +25,8 @@
 
 #pragma once
 
-#include "iccstore.h"
+#include <lcms2.h>
+
 #include "noncopyable.h"
 
 namespace rtengine {
diff --git a/rtengine/histmatching.cc b/rtengine/histmatching.cc
index 212b11d00..e85f5ee13 100644
--- a/rtengine/histmatching.cc
+++ b/rtengine/histmatching.cc
@@ -23,7 +23,6 @@
 #include "curves.h"
 #include "color.h"
 #include "rt_math.h"
-#include "iccstore.h"
 #include "procparams.h"
 #include "../rtgui/mydiagonalcurve.h"
 #include "improcfun.h"
diff --git a/rtengine/ipdehaze.cc b/rtengine/ipdehaze.cc
index e3c86454f..7ca4d72ad 100644
--- a/rtengine/ipdehaze.cc
+++ b/rtengine/ipdehaze.cc
@@ -33,6 +33,7 @@
 #include <vector>
 
 #include "guidedfilter.h"
+#include "iccstore.h"
 #include "imagefloat.h"
 #include "improcfun.h"
 #include "procparams.h"
diff --git a/rtengine/iplabregions.cc b/rtengine/iplabregions.cc
index 2462959bf..d6b7294f6 100644
--- a/rtengine/iplabregions.cc
+++ b/rtengine/iplabregions.cc
@@ -22,6 +22,7 @@
 #include <omp.h>
 #endif
 
+#include "iccstore.h"
 #include "improcfun.h"
 #include "labimage.h"
 #include "guidedfilter.h"
diff --git a/rtengine/ipshadowshighlights.cc b/rtengine/ipshadowshighlights.cc
index 7680ae6c7..1e8842cbb 100644
--- a/rtengine/ipshadowshighlights.cc
+++ b/rtengine/ipshadowshighlights.cc
@@ -22,6 +22,7 @@
 
 #include "gauss.h"
 #include "guidedfilter.h"
+#include "iccstore.h"
 #include "labimage.h"
 #include "opthelper.h"
 #include "procparams.h"
diff --git a/rtengine/ipsoftlight.cc b/rtengine/ipsoftlight.cc
index e0dc6aa40..ab2e7c8b1 100644
--- a/rtengine/ipsoftlight.cc
+++ b/rtengine/ipsoftlight.cc
@@ -19,6 +19,7 @@
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include "iccstore.h"
 #include "improcfun.h"
 #include "labimage.h"
 
diff --git a/rtgui/dynamicprofilepanel.cc b/rtgui/dynamicprofilepanel.cc
index 38029af71..6acad07f9 100644
--- a/rtgui/dynamicprofilepanel.cc
+++ b/rtgui/dynamicprofilepanel.cc
@@ -18,6 +18,7 @@
  */
 
 #include "dynamicprofilepanel.h"
+#include "options.h"
 #include "multilangmgr.h"
 #include "../rtengine/profilestore.h"
 #include "../rtengine/rtengine.h"
diff --git a/rtgui/histogrampanel.cc b/rtgui/histogrampanel.cc
index 36803ddf2..74e473096 100644
--- a/rtgui/histogrampanel.cc
+++ b/rtgui/histogrampanel.cc
@@ -24,10 +24,7 @@
 #include <cmath>
 #include "../rtengine/LUT.h"
 #include "rtimage.h"
-#include "../rtengine/improccoordinator.h"
 #include "../rtengine/color.h"
-#include "../rtengine/opthelper.h"
-#include "../rtengine/iccstore.h"
 
 using namespace rtengine;
 
diff --git a/rtgui/iccprofilecreator.cc b/rtgui/iccprofilecreator.cc
index 9efa4360b..2728a7611 100644
--- a/rtgui/iccprofilecreator.cc
+++ b/rtgui/iccprofilecreator.cc
@@ -19,6 +19,7 @@
  */
 #include <sigc++/slot.h>
 #include "iccprofilecreator.h"
+#include "../rtengine/iccstore.h"
 #include "multilangmgr.h"
 #include "cachemanager.h"
 #include "addsetids.h"
diff --git a/rtgui/navigator.cc b/rtgui/navigator.cc
index 2cad9fdc1..50946f32f 100644
--- a/rtgui/navigator.cc
+++ b/rtgui/navigator.cc
@@ -19,8 +19,6 @@
 #include <iomanip>
 #include "navigator.h"
 #include "toolpanel.h"
-#include "../rtengine/iccmatrices.h"
-#include "../rtengine/iccstore.h"
 #include "../rtengine/color.h"
 #include "../rtengine/rt_math.h"
 #include "options.h"
diff --git a/rtgui/navigator.h b/rtgui/navigator.h
index eb4584f42..32ad68175 100644
--- a/rtgui/navigator.h
+++ b/rtgui/navigator.h
@@ -23,7 +23,6 @@
 #include "previewwindow.h"
 #include "pointermotionlistener.h"
 #include "options.h"
-#include "../rtengine/iccstore.h"
 
 class Navigator : public Gtk::Frame, public PointerMotionListener
 {
diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc
index b4447fd44..3c0d1bedc 100644
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -24,6 +24,7 @@
 #include "addsetids.h"
 #include "../rtengine/dfmanager.h"
 #include "../rtengine/ffmanager.h"
+#include "../rtengine/iccstore.h"
 #include <sstream>
 #include "rtimage.h"
 #ifdef _OPENMP