Further reduction of include dependencies

rtengine/bilateral2.h

@@ -25,7 +25,6 @@
 
 #include "array2D.h"
 #include "LUT.h"
-#include "mytime.h"
 #include "rt_math.h"
 
 #ifdef _OPENMP

rtengine/color.cc

@@ -20,11 +20,14 @@
 #include "rtengine.h"
 #include "color.h"
 #include "iccmatrices.h"
-#include "mytime.h"
 #include "sleef.c"
 #include "opthelper.h"
 #include "iccstore.h"
 
+#ifdef _DEBUG
+#include "mytime.h"
+#endif
+
 using namespace std;
 
 namespace rtengine

rtengine/imagefloat.cc

@@ -25,7 +25,6 @@
 #include "labimage.h"
 #include <cstring>
 #include "rtengine.h"
-#include "mytime.h"
 #include "iccstore.h"
 #include "alignedbuffer.h"
 #include "rt_math.h"

rtengine/improccoordinator.cc

@@ -33,7 +33,6 @@
 #include "imagefloat.h"
 #include "improcfun.h"
 #include "labimage.h"
-#include "mytime.h"
 #include "procparams.h"
 #include "refreshmap.h"
 

rtengine/improcfun.cc

@@ -30,7 +30,6 @@
 #include "improcfun.h"
 #include "curves.h"
 #include "dcp.h"
-#include "mytime.h"
 #include "iccstore.h"
 #include "imagesource.h"
 #include "rtthumbnail.h"
@@ -48,6 +47,10 @@
 #include "../rtgui/ppversion.h"
 #include "../rtgui/editcallbacks.h"
 
+#ifdef _DEBUG
+#include "mytime.h"
+#endif
+
 #undef CLIPD
 #define CLIPD(a) ((a)>0.0f?((a)<1.0f?(a):1.0f):0.0f)
 

rtengine/iptransform.cc

@@ -25,7 +25,6 @@
 #include "imagefloat.h"
 #include "improcfun.h"
 
-#include "mytime.h"
 #include "procparams.h"
 #include "rt_math.h"
 #include "rtengine.h"

rtengine/ipvibrance.cc

@@ -24,7 +24,6 @@
 #include "improcfun.h"
 #include "iccstore.h"
 #include "labimage.h"
-#include "mytime.h"
 #include "curves.h"
 #include "color.h"
 #include "procparams.h"

rtengine/ipwavelet.cc

@@ -36,7 +36,6 @@
 #include "labimage.h"
 #include "LUT.h"
 #include "median.h"
-#include "mytime.h"
 #include "opthelper.h"
 #include "procparams.h"
 #include "rt_math.h"

rtengine/profilestore.h

@@ -25,7 +25,6 @@
 
 #include "dynamicprofile.h"
 #include "noncopyable.h"
-#include "procparams.h"
 #include "../rtgui/threadutils.h"
 
 // forward decl
@@ -35,6 +34,8 @@ namespace rtengine
 namespace procparams
 {
 
+class ProcParams;
+
 class AutoPartialProfile;
 class PartialProfile;
 

rtgui/batchqueueentry.h

@@ -27,11 +27,18 @@
 #include "thumbnail.h"
 
 #include "../rtengine/noncopyable.h"
-#include "../rtengine/procparams.h"
 
 namespace rtengine
 {
-    class ProcessingJob;
+class ProcessingJob;
+
+namespace procparams
+{
+
+class ProcParams;
+
+}
+
 }
 
 class BatchQueueEntry;

rtgui/clipboard.cc

@@ -18,6 +18,7 @@
  */
 #include "clipboard.h"
 
+#include "paramsedited.h"
 #include "../rtengine/procparams.h"
 
 Clipboard clipboard;

rtgui/clipboard.h

@@ -21,17 +21,17 @@
 #include <memory>
 #include <vector>
 
-#include "paramsedited.h"
-
 #include "../rtengine/diagonalcurvetypes.h"
 #include "../rtengine/flatcurvetypes.h"
 
+class ParamsEdited;
+
 namespace rtengine
 {
 
 namespace procparams
 {
-
+class ProcParams;
 class PartialProfile;
 class IPTCPairs;
 

rtgui/cropwindow.cc

@@ -17,6 +17,9 @@
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include <iomanip>
+#ifdef WIN32
+#include <windows.h>
+#endif
 
 #include "cropwindow.h"
 
@@ -32,7 +35,6 @@
 #include "editwidgets.h"
 
 #include "../rtengine/dcrop.h"
-#include "../rtengine/mytime.h"
 #include "../rtengine/procparams.h"
 #include "../rtengine/rt_math.h"
 

rtgui/filebrowser.cc

@@ -29,6 +29,7 @@
 #include "clipboard.h"
 #include "multilangmgr.h"
 #include "options.h"
+#include "profilestorecombobox.h"
 #include "procparamchangers.h"
 #include "rtimage.h"
 #include "threadutils.h"

rtgui/filebrowser.h

@@ -29,7 +29,7 @@
 #include "filebrowserentry.h"
 #include "partialpastedlg.h"
 #include "pparamschangelistener.h"
-#include "profilestorecombobox.h"
+#include "../rtengine/profilestore.h"
 #include "thumbbrowserbase.h"
 
 #include "../rtengine/noncopyable.h"

rtgui/pparamschangelistener.h

@@ -20,7 +20,7 @@
 
 #include <glibmm/ustring.h>
 
-#include "paramsedited.h"
+class ParamsEdited;
 
 namespace rtengine
 {

rtgui/profilepanel.cc

@@ -22,6 +22,7 @@
 #include "multilangmgr.h"
 #include "options.h"
 #include "profilestorecombobox.h"
+#include "paramsedited.h"
 #include "pathutils.h"
 #include "rtimage.h"
 

rtgui/profilepanel.h

@@ -26,10 +26,12 @@
 #include "partialpastedlg.h"
 #include "pparamschangelistener.h"
 #include "profilechangelistener.h"
-#include "profilestorecombobox.h"
 
+#include "../rtengine/profilestore.h"
 #include "../rtengine/noncopyable.h"
 
+class ProfileStoreComboBox;
+
 namespace rtengine
 {
 

rtgui/profilestorecombobox.h

@@ -24,11 +24,9 @@
 #include <glibmm/ustring.h>
 
 #include "guiutils.h"
-#include "paramsedited.h"
 #include "threadutils.h"
 
-#include "../rtengine/profilestore.h"
+class ProfileStoreEntry;
-
 /**
  * @brief subclass of Gtk::Label with extra fields for Combobox and Menu, to link with a ProfileStoreEntry
  */

rtgui/thumbbrowserbase.cc

@@ -22,7 +22,6 @@
 #include "options.h"
 #include "thumbbrowserbase.h"
 
-#include "../rtengine/mytime.h"
 #include "../rtengine/rt_math.h"
 
 using namespace std;

rtgui/thumbbrowserentrybase.cc

@@ -21,8 +21,6 @@
 #include "options.h"
 #include "thumbbrowserbase.h"
 
-#include "../rtengine/mytime.h"
-
 namespace
 {
 

rtgui/thumbnail.cc

@@ -15,12 +15,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
+#ifdef WIN32
+#include <windows.h>
+#endif
+
 #include "cachemanager.h"
 #include "multilangmgr.h"
 #include "thumbnail.h"
 #include <sstream>
 #include <iomanip>
-#include "../rtengine/mytime.h"
 #include <cstdio>
 #include <cstdlib>
 #include "../rtengine/colortemp.h"
@@ -30,12 +33,13 @@
 #include <glib/gstdio.h>
 
 #include "../rtengine/dynamicprofile.h"
+#include "../rtengine/profilestore.h"
 #include "../rtengine/settings.h"
 #include "guiutils.h"
 #include "batchqueue.h"
 #include "extprog.h"
 #include "pathutils.h"
-#include "profilestorecombobox.h"
+#include "paramsedited.h"
 #include "procparamchangers.h"
 
 using namespace rtengine::procparams;

rtgui/toolpanel.h

@@ -30,8 +30,6 @@
 #include "../rtengine/noncopyable.h"
 #include "../rtengine/rtengine.h"
 
-class ParamsEdited;
-
 namespace rtengine
 {
     class ProcEvent;