diff --git a/rtengine/dcrop.cc b/rtengine/dcrop.cc
index 0872049d8..c033dba87 100644
--- a/rtengine/dcrop.cc
+++ b/rtengine/dcrop.cc
@@ -24,6 +24,8 @@
 #include "refreshmap.h"
 #include "rt_math.h"
 
+#include "../rtgui/edit.h"
+
 namespace
 {
 
diff --git a/rtengine/improcfun.cc b/rtengine/improcfun.cc
index 4e2523137..91f56c015 100644
--- a/rtengine/improcfun.cc
+++ b/rtengine/improcfun.cc
@@ -17,33 +17,38 @@
  *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <cmath>
+
 #include <glib.h>
 #include <glibmm.h>
+
 #ifdef _OPENMP
 #include <omp.h>
 #endif
 
-#include "alignedbuffer.h"
-#include "rtengine.h"
 #include "improcfun.h"
+
+#include "alignedbuffer.h"
+#include "calc_distort.h"
+#include "ciecam02.h"
+#include "clutstore.h"
+#include "color.h"
 #include "curves.h"
-#include "mytime.h"
+#include "EdgePreservingDecomposition.h"
+#include "iccmatrices.h"
 #include "iccstore.h"
 #include "imagesource.h"
-#include "rtthumbnail.h"
-#include "utils.h"
-#include "iccmatrices.h"
-#include "color.h"
-#include "calc_distort.h"
-#include "rt_math.h"
-#include "EdgePreservingDecomposition.h"
 #include "improccoordinator.h"
-#include "clutstore.h"
-#include "ciecam02.h"
-#include "StopWatch.h"
+#include "mytime.h"
 #include "procparams.h"
-#include "../rtgui/ppversion.h"
+#include "rt_math.h"
+#include "rtengine.h"
+#include "rtthumbnail.h"
+#include "StopWatch.h"
+#include "utils.h"
+
+#include "../rtgui/edit.h"
 #include "../rtgui/guiutils.h"
+#include "../rtgui/ppversion.h"
 
 #undef CLIPD
 #define CLIPD(a) ((a)>0.0f?((a)<1.0f?(a):1.0f):0.0f)
diff --git a/rtengine/pipettebuffer.cc b/rtengine/pipettebuffer.cc
index 8981b6480..5f5a5ce71 100644
--- a/rtengine/pipettebuffer.cc
+++ b/rtengine/pipettebuffer.cc
@@ -19,6 +19,8 @@
 
 #include "pipettebuffer.h"
 
+#include "../rtgui/edit.h"
+
 namespace rtengine
 {
 
diff --git a/rtengine/pipettebuffer.h b/rtengine/pipettebuffer.h
index 139438e1d..25ff55b51 100644
--- a/rtengine/pipettebuffer.h
+++ b/rtengine/pipettebuffer.h
@@ -16,17 +16,22 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef _PIPETTEBUFFER_H_
-#define _PIPETTEBUFFER_H_
+#pragma once
 
-#include "../rtgui/edit.h"
 #include "array2D.h"
-#include "iimage.h"
 #include "coord.h"
+#include "iimage.h"
+
+class EditDataProvider;
+class EditSubscriber;
+
+enum EditUniqueID : int;
 
 namespace rtengine
 {
 
+class Imagefloat;
+
 /// @brief Structure that contains information about and pointers to the Edit buffer
 class PipetteBuffer
 {
@@ -92,5 +97,3 @@ public:
 };
 
 }
-
-#endif
diff --git a/rtgui/editid.h b/rtgui/editid.h
index c4f9315c0..5c1cf2389 100644
--- a/rtgui/editid.h
+++ b/rtgui/editid.h
@@ -21,7 +21,7 @@
 
 
 /// @brief List of pipette editing operation
-enum EditUniqueID {
+enum EditUniqueID : int {
     EUID_None,  /// special value (default)
 
     EUID_ToneCurve1,
diff --git a/rtgui/mydiagonalcurve.cc b/rtgui/mydiagonalcurve.cc
index 59ac5a807..06e85728d 100644
--- a/rtgui/mydiagonalcurve.cc
+++ b/rtgui/mydiagonalcurve.cc
@@ -16,11 +16,16 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "mydiagonalcurve.h"
-#include "../rtengine/curves.h"
 #include <cstring>
+
 #include <gdkmm/types.h>
 
+#include "mydiagonalcurve.h"
+
+#include "edit.h"
+
+#include "../rtengine/curves.h"
+
 MyDiagonalCurve::MyDiagonalCurve () :
     MyCurve(),
     closest_point(0),
diff --git a/rtgui/myflatcurve.cc b/rtgui/myflatcurve.cc
index ee7a2de5f..dfc61063f 100644
--- a/rtgui/myflatcurve.cc
+++ b/rtgui/myflatcurve.cc
@@ -16,11 +16,16 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "myflatcurve.h"
-#include "../rtengine/curves.h"
 #include <cstring>
+
 #include <gdkmm/types.h>
 
+#include "myflatcurve.h"
+
+#include "edit.h"
+
+#include "../rtengine/curves.h"
+
 MyFlatCurve::MyFlatCurve () :
     MyCurve(),
     clampedX(0.0),