--- a/Framework/Oracle/GenericOracleRunner.h	Tue Nov 05 22:39:25 2019 +0100
+++ b/Framework/Oracle/GenericOracleRunner.h	Tue Nov 05 22:45:27 2019 +0100
@@ -21,8 +21,6 @@
 
 #pragma once
 
-#include "IOracleRunner.h"
-
 #if !defined(ORTHANC_ENABLE_DCMTK)
 #  error The macro ORTHANC_ENABLE_DCMTK must be defined
 #endif
@@ -31,13 +29,14 @@
 #  include "../Toolbox/ParsedDicomFileCache.h"
 #endif
 
+#include "IOracleCommand.h"
 
 #include <Core/Enumerations.h>  // For ORTHANC_OVERRIDE
 #include <Core/WebServiceParameters.h>
 
 namespace OrthancStone
 {
-  class GenericOracleRunner : public IOracleRunner
+  class GenericOracleRunner : public boost::noncopyable
   {
   private:
     Orthanc::WebServiceParameters  orthanc_;
@@ -80,6 +79,6 @@
     }
 #endif
 
-    virtual IMessage* Run(IOracleCommand& command) ORTHANC_OVERRIDE;
+    IMessage* Run(IOracleCommand& command);
   };
 }

--- a/Framework/Oracle/IOracle.h	Tue Nov 05 22:39:25 2019 +0100
+++ b/Framework/Oracle/IOracle.h	Tue Nov 05 22:45:27 2019 +0100
@@ -22,7 +22,7 @@
 #pragma once
 
 #include "../Messages/IObserver.h"
-#include "IOracleRunner.h"
+#include "IOracleCommand.h"
 
 #include <boost/shared_ptr.hpp>
 

--- a/Framework/Oracle/IOracleRunner.h	Tue Nov 05 22:39:25 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/**
- * Stone of Orthanc
- * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
- * Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2019 Osimis S.A., Belgium
- *
- * This program is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Affero General Public License for more details.
- * 
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- **/
-
-
-#pragma once
-
-#include "IOracleCommand.h"
-#include "../Messages/IMessage.h"
-
-namespace OrthancStone
-{
-  class IOracleRunner : public boost::noncopyable
-  {
-  public:
-    virtual ~IOracleRunner()
-    {
-    }
-
-    virtual IMessage* Run(IOracleCommand& command) = 0;
-  };
-}