Merge branch 'dev' into spot-removal-tool

rtengine/image16.h

@@ -19,17 +19,15 @@
 //
 // A class representing a 16 bit rgb image with separate planes and 16 byte aligned data
 //
-#ifndef _IMAGE16_
-#define _IMAGE16_
+#pragma once
 
 #include "imageio.h"
-#include "rtengine.h"
-#include "imagefloat.h"
 
 namespace rtengine
 {
 
 class Image8;
+class Imagefloat;
 
 class Image16 : public IImage16, public ImageIO
 {
@@ -110,4 +108,3 @@ public:
 };
 
 }
-#endif