--- a/CppClient/PublicEnumerations.h	Tue Jun 02 10:22:49 2015 +0200
+++ b/CppClient/PublicEnumerations.h	Tue Jun 02 10:34:41 2015 +0200
@@ -32,11 +32,13 @@
 
 #pragma once
 
+#include "../Orthanc/Core/Enumerations.h"
+
 #include <laaw/laaw.h>
 
-namespace Orthanc
+namespace OrthancClient
 {
-    /**
+  /**
    * {summary}{The memory layout of the pixels (resp. voxels) of a 2D (resp. 3D) image.}
    **/
   enum LAAW_API PixelFormat
@@ -46,33 +48,33 @@
      * {description}{This format describes a color image. The pixels are stored in 3
      * consecutive bytes. The memory layout is RGB.}
      **/
-    PixelFormat_RGB24 = 1,
+    PixelFormat_RGB24 = Orthanc::PixelFormat_RGB24,
 
-    /**
-     * {summary}{Color image in RGBA32 format.}
-     * {description}{This format describes a color image. The pixels are stored in 4
-     * consecutive bytes. The memory layout is RGBA.}
-     **/
-    PixelFormat_RGBA32 = 2,
+      /**
+       * {summary}{Color image in RGBA32 format.}
+       * {description}{This format describes a color image. The pixels are stored in 4
+       * consecutive bytes. The memory layout is RGBA.}
+       **/
+      PixelFormat_RGBA32 = Orthanc::PixelFormat_RGBA32,
 
-    /**
-     * {summary}{Graylevel 8bpp image.}
-     * {description}{The image is graylevel. Each pixel is unsigned and stored in one byte.}
-     **/
-    PixelFormat_Grayscale8 = 3,
+      /**
+       * {summary}{Graylevel 8bpp image.}
+       * {description}{The image is graylevel. Each pixel is unsigned and stored in one byte.}
+       **/
+      PixelFormat_Grayscale8 = Orthanc::PixelFormat_Grayscale8,
       
-    /**
-     * {summary}{Graylevel, unsigned 16bpp image.}
-     * {description}{The image is graylevel. Each pixel is unsigned and stored in two bytes.}
-     **/
-    PixelFormat_Grayscale16 = 4,
+      /**
+       * {summary}{Graylevel, unsigned 16bpp image.}
+       * {description}{The image is graylevel. Each pixel is unsigned and stored in two bytes.}
+       **/
+      PixelFormat_Grayscale16 = Orthanc::PixelFormat_Grayscale16,
       
-    /**
-     * {summary}{Graylevel, signed 16bpp image.}
-     * {description}{The image is graylevel. Each pixel is signed and stored in two bytes.}
-     **/
-    PixelFormat_SignedGrayscale16 = 5
-  };
+      /**
+       * {summary}{Graylevel, signed 16bpp image.}
+       * {description}{The image is graylevel. Each pixel is signed and stored in two bytes.}
+       **/
+      PixelFormat_SignedGrayscale16 = Orthanc::PixelFormat_SignedGrayscale16
+      };
 
 
   /**
@@ -84,23 +86,21 @@
      * {summary}{Rescaled to 8bpp.}
      * {description}{The minimum value of the image is set to 0, and its maximum value is set to 255.}
      **/
-    ImageExtractionMode_Preview = 1,
+    ImageExtractionMode_Preview = Orthanc::ImageExtractionMode_Preview,
 
-    /**
-     * {summary}{Truncation to the [0, 255] range.}
-     **/
-    ImageExtractionMode_UInt8 = 2,
+      /**
+       * {summary}{Truncation to the [0, 255] range.}
+       **/
+      ImageExtractionMode_UInt8 = Orthanc::ImageExtractionMode_UInt8,
 
-    /**
-     * {summary}{Truncation to the [0, 65535] range.}
-     **/
-    ImageExtractionMode_UInt16 = 3,
+      /**
+       * {summary}{Truncation to the [0, 65535] range.}
+       **/
+      ImageExtractionMode_UInt16 = Orthanc::ImageExtractionMode_UInt16,
 
-    /**
-     * {summary}{Truncation to the [-32768, 32767] range.}
-     **/
-    ImageExtractionMode_Int16 = 4
-  };
-
-
+      /**
+       * {summary}{Truncation to the [-32768, 32767] range.}
+       **/
+      ImageExtractionMode_Int16 = Orthanc::ImageExtractionMode_Int16
+      };
 }