--- a/CppClient/Instance.h	Tue Jun 02 10:22:49 2015 +0200
+++ b/CppClient/Instance.h	Tue Jun 02 10:34:41 2015 +0200
@@ -35,6 +35,7 @@
 #include <string>
 #include <json/value.h>
 
+#include "PublicEnumerations.h"
 #include "OrthancClientException.h"
 #include "../Orthanc/Core/IDynamicObject.h"
 #include "../Orthanc/Core/ImageFormats/PngReader.h"
@@ -55,7 +56,7 @@
     std::string id_;
     Json::Value tags_;
     std::auto_ptr<Orthanc::PngReader> reader_;
-    Orthanc::ImageExtractionMode mode_;
+    ImageExtractionMode mode_;
     std::auto_ptr<std::string> dicom_;
     std::string content_;
 
@@ -87,13 +88,13 @@
      * {summary}{Set the extraction mode for the 2D image corresponding to this instance.}
      * {param}{mode The extraction mode.}
      **/
-    void SetImageExtractionMode(Orthanc::ImageExtractionMode mode);
+    void SetImageExtractionMode(ImageExtractionMode mode);
 
     /**
      * {summary}{Get the extraction mode for the 2D image corresponding to this instance.}
      * {returns}{The extraction mode.}
      **/
-    Orthanc::ImageExtractionMode GetImageExtractionMode() const
+    ImageExtractionMode GetImageExtractionMode() const
     {
       return mode_;
     }
@@ -147,7 +148,7 @@
      * {description}{Return the memory layout that is used for the 2D image that is encoded by this DICOM instance. This value depends on the extraction mode for the image.}
      * {returns}{The pixel format.}
      **/
-    Orthanc::PixelFormat GetPixelFormat();
+    PixelFormat GetPixelFormat();
 
     /**
      * {summary}{Access the memory buffer in which the raw pixels of the 2D image are stored.}