--- a/OrthancServer/FromDcmtkBridge.h	Tue Nov 08 10:06:16 2016 +0100
+++ b/OrthancServer/FromDcmtkBridge.h	Tue Nov 08 10:49:45 2016 +0100
@@ -33,7 +33,6 @@
 #pragma once
 
 #include "ServerEnumerations.h"
-#include "OrthancInitialization.h"
 
 #include "../Core/DicomFormat/DicomElement.h"
 #include "../Core/DicomFormat/DicomMap.h"
@@ -58,6 +57,7 @@
 #endif
 
     friend class ParsedDicomFile;
+    friend class Configuration;
 
   private:
     FromDcmtkBridge();  // Pure static class
@@ -85,7 +85,8 @@
                                    DcmDataset& dataset,
                                    DicomToJsonFormat format,
                                    DicomToJsonFlags flags,
-                                   unsigned int maxStringLength);
+                                   unsigned int maxStringLength,
+                                   Encoding defaultEncoding);
 
   public:
     static void InitializeDictionary();
@@ -100,12 +101,6 @@
     static Encoding DetectEncoding(DcmItem& dataset,
                                    Encoding defaultEncoding);
 
-    static void ExtractDicomSummary(DicomMap& target, 
-                                    DcmItem& dataset)
-    {
-      ExtractDicomSummary(target, dataset, ORTHANC_MAXIMUM_TAG_LENGTH, Configuration::GetDefaultEncoding());
-    }
-
     static DicomTag Convert(const DcmTag& tag);
 
     static DicomTag GetTag(const DcmElement& element);
@@ -117,12 +112,6 @@
                                           unsigned int maxStringLength,
                                           Encoding encoding);
 
-    static void ExtractDicomAsJson(Json::Value& target, 
-                                   DcmDataset& dataset)
-    {
-      ExtractDicomAsJson(target, dataset, DicomToJsonFormat_Full, DicomToJsonFlags_Default, ORTHANC_MAXIMUM_TAG_LENGTH);
-    }
-
     static void ExtractHeaderAsJson(Json::Value& target, 
                                     DcmMetaInfo& header,
                                     DicomToJsonFormat format,