From 33862d25e76a544bb230b8afb1fb6d497a697599 Mon Sep 17 00:00:00 2001
From: Andrea Valassi <avalassi@cern.ch>
Date: Thu, 18 Aug 2016 17:42:45 +0000
Subject: [PATCH] Another batch of changes for COOL #ifdef (CORALCOOL-2943)

git-svn-id: file:///git/lcgcool.svndb/cool/trunk@20133 4525493e-7705-40b1-a816-d608a930855b
---
 src/CoolApplication/CoolApplication/Application.h          | 1 -
 src/CoolKernel/CoolKernel/ChannelSelection.h               | 3 +--
 src/CoolKernel/CoolKernel/CompositeSelection.h             | 3 +--
 src/CoolKernel/CoolKernel/Exception.h                      | 3 ---
 src/CoolKernel/CoolKernel/FieldSelection.h                 | 3 +--
 src/CoolKernel/CoolKernel/FolderSpecification.h            | 3 +--
 src/CoolKernel/CoolKernel/FolderVersioning.h               | 3 +--
 src/CoolKernel/CoolKernel/HvsTagLock.h                     | 3 +--
 src/CoolKernel/CoolKernel/IDatabase.h                      | 3 +--
 src/CoolKernel/CoolKernel/IFolder.h                        | 3 ---
 src/CoolKernel/CoolKernel/IFolderSpecification.h           | 3 ---
 src/CoolKernel/CoolKernel/IHvsNode.h                       | 3 +--
 src/CoolKernel/CoolKernel/IObject.h                        | 3 ---
 src/CoolKernel/CoolKernel/ITransaction.h                   | 3 +--
 src/CoolKernel/CoolKernel/PayloadMode.h                    | 3 +--
 src/CoolKernel/CoolKernel/RecordException.h                | 3 +--
 src/CoolKernel/CoolKernel/StorageType.h                    | 3 +--
 src/CoolKernel/CoolKernel/Time.h                           | 5 -----
 src/CoolKernel/CoolKernel/pointers.h                       | 3 +--
 src/CoolKernel/tests/FolderSpec/test_FolderSpec.cpp        | 3 ---
 src/PyCool/dict/PyCool_headers.h                           | 3 +--
 src/RelationalCool/src/CoralApplication.h                  | 7 -------
 src/RelationalCool/src/ManualTransaction.cpp               | 4 +---
 src/RelationalCool/src/ManualTransaction.h                 | 3 +--
 src/RelationalCool/src/RalDatabase.cpp                     | 5 ++---
 src/RelationalCool/src/RalDatabase.h                       | 3 +--
 src/RelationalCool/src/RalDatabaseSvc.cpp                  | 2 +-
 src/RelationalCool/src/RalSchemaMgr.cpp                    | 2 +-
 src/RelationalCool/src/RelationalDatabase.cpp              | 2 +-
 src/RelationalCool/src/RelationalDatabase.h                | 3 +--
 src/RelationalCool/src/RelationalException.h               | 2 +-
 src/RelationalCool/src/RelationalNodeTable.cpp             | 2 +-
 .../src/{VersionInfo.h => RelationalVersionInfo.h}         | 2 +-
 src/RelationalCool/src/TimingReportMgr.cpp                 | 2 +-
 src/RelationalCool/src/TimingReportMgr.h                   | 2 +-
 src/RelationalCool/src/TransRalDatabase.h                  | 3 +--
 src/RelationalCool/tests/RalDatabase/test_RalDatabase.cpp  | 5 ++---
 .../tests/RalDatabaseSvc/test_RalDatabaseSvc.cpp           | 2 +-
 .../tests/RelationalFolder/test_RelationalFolder.cpp       | 3 +--
 .../utilities/coolValidateSchema/coolValidateSchema.cpp    | 2 +-
 src/Utilities/CoolDBDiscovery/src/CoolDBDiscovery.cpp      | 7 -------
 41 files changed, 34 insertions(+), 92 deletions(-)
 rename src/RelationalCool/src/{VersionInfo.h => RelationalVersionInfo.h} (90%)

diff --git a/src/CoolApplication/CoolApplication/Application.h b/src/CoolApplication/CoolApplication/Application.h
index 5a8ab9d7e..dd775a392 100644
--- a/src/CoolApplication/CoolApplication/Application.h
+++ b/src/CoolApplication/CoolApplication/Application.h
@@ -2,7 +2,6 @@
 #define COOLAPPLICATION_APPLICATION_H 1
 
 // Include files
-#include "CoolKernel/VersionInfo.h" // kept but no longer needed
 #include "CoolApplication/IApplication.h"
 
 namespace cool
diff --git a/src/CoolKernel/CoolKernel/ChannelSelection.h b/src/CoolKernel/CoolKernel/ChannelSelection.h
index 4223e632d..6fc50c6ac 100644
--- a/src/CoolKernel/CoolKernel/ChannelSelection.h
+++ b/src/CoolKernel/CoolKernel/ChannelSelection.h
@@ -1,8 +1,7 @@
 #ifndef COOLKERNEL_CHANNELSELECTION_H
 #define COOLKERNEL_CHANNELSELECTION_H 1
 
-// First of all, set/unset COOL400 macros
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #include <limits>
diff --git a/src/CoolKernel/CoolKernel/CompositeSelection.h b/src/CoolKernel/CoolKernel/CompositeSelection.h
index 1f9461709..d7691bdae 100644
--- a/src/CoolKernel/CoolKernel/CompositeSelection.h
+++ b/src/CoolKernel/CoolKernel/CompositeSelection.h
@@ -1,8 +1,7 @@
 #ifndef COOLKERNEL_COMPOSITESELECTION_H
 #define COOLKERNEL_COMPOSITESELECTION_H 1
 
-// First of all, set/unset COOL400 macros
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #ifdef COOL400CPP11ENUM
diff --git a/src/CoolKernel/CoolKernel/Exception.h b/src/CoolKernel/CoolKernel/Exception.h
index 32f08293b..89e218007 100644
--- a/src/CoolKernel/CoolKernel/Exception.h
+++ b/src/CoolKernel/CoolKernel/Exception.h
@@ -1,9 +1,6 @@
 #ifndef COOLKERNEL_EXCEPTION_H
 #define COOLKERNEL_EXCEPTION_H 1
 
-// First of all, enable or disable the API extensions (bug #92204)
-#include "CoolKernel/VersionInfo.h"
-
 // Include files
 #include <sstream>
 #include <exception>
diff --git a/src/CoolKernel/CoolKernel/FieldSelection.h b/src/CoolKernel/CoolKernel/FieldSelection.h
index e18f3ddc3..8c20dc9b1 100644
--- a/src/CoolKernel/CoolKernel/FieldSelection.h
+++ b/src/CoolKernel/CoolKernel/FieldSelection.h
@@ -1,8 +1,7 @@
 #ifndef COOLKERNEL_FIELDSELECTION_H
 #define COOLKERNEL_FIELDSELECTION_H 1
 
-// First of all, set/unset COOL400 macros
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #ifdef COOL400CPP11ENUM
diff --git a/src/CoolKernel/CoolKernel/FolderSpecification.h b/src/CoolKernel/CoolKernel/FolderSpecification.h
index dac711a49..804c12211 100644
--- a/src/CoolKernel/CoolKernel/FolderSpecification.h
+++ b/src/CoolKernel/CoolKernel/FolderSpecification.h
@@ -1,8 +1,7 @@
 #ifndef COOLKERNEL_FOLDERSPECIFICATION_H
 #define COOLKERNEL_FOLDERSPECIFICATION_H 1
 
-// First of all, set/unset COOL400 macros
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #include "CoolKernel/IFolderSpecification.h"
diff --git a/src/CoolKernel/CoolKernel/FolderVersioning.h b/src/CoolKernel/CoolKernel/FolderVersioning.h
index 037c32335..d26f48f26 100644
--- a/src/CoolKernel/CoolKernel/FolderVersioning.h
+++ b/src/CoolKernel/CoolKernel/FolderVersioning.h
@@ -1,8 +1,7 @@
 #ifndef COOLKERNEL_FOLDERVERSIONING_H
 #define COOLKERNEL_FOLDERVERSIONING_H 1
 
-// First of all, set/unset COOL400 macros
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #ifdef COOL400CPP11ENUM
diff --git a/src/CoolKernel/CoolKernel/HvsTagLock.h b/src/CoolKernel/CoolKernel/HvsTagLock.h
index 7ee64ee04..2318237d0 100644
--- a/src/CoolKernel/CoolKernel/HvsTagLock.h
+++ b/src/CoolKernel/CoolKernel/HvsTagLock.h
@@ -1,8 +1,7 @@
 #ifndef COOLKERNEL_HVSTAGLOCK_H
 #define COOLKERNEL_HVSTAGLOCK_H 1
 
-// First of all, set/unset COOL400 macros
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #ifdef COOL400CPP11ENUM
diff --git a/src/CoolKernel/CoolKernel/IDatabase.h b/src/CoolKernel/CoolKernel/IDatabase.h
index a064dd9c9..55fd7e71c 100644
--- a/src/CoolKernel/CoolKernel/IDatabase.h
+++ b/src/CoolKernel/CoolKernel/IDatabase.h
@@ -1,8 +1,7 @@
 #ifndef COOLKERNEL_IDATABASE_H
 #define COOLKERNEL_IDATABASE_H 1
 
-// First of all, set/unset COOL400 macros
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #include "CoolKernel/DatabaseId.h"
diff --git a/src/CoolKernel/CoolKernel/IFolder.h b/src/CoolKernel/CoolKernel/IFolder.h
index 3dae4301d..91075a492 100644
--- a/src/CoolKernel/CoolKernel/IFolder.h
+++ b/src/CoolKernel/CoolKernel/IFolder.h
@@ -1,9 +1,6 @@
 #ifndef COOLKERNEL_IFOLDER_H
 #define COOLKERNEL_IFOLDER_H 1
 
-// First of all, enable or disable API extensions (bug #92204)
-#include "CoolKernel/VersionInfo.h"
-
 // Include files
 #include <map>
 #include <string>
diff --git a/src/CoolKernel/CoolKernel/IFolderSpecification.h b/src/CoolKernel/CoolKernel/IFolderSpecification.h
index 2b196597c..b482e68e2 100644
--- a/src/CoolKernel/CoolKernel/IFolderSpecification.h
+++ b/src/CoolKernel/CoolKernel/IFolderSpecification.h
@@ -1,9 +1,6 @@
 #ifndef COOLKERNEL_IFOLDERSPECIFICATION_H
 #define COOLKERNEL_IFOLDERSPECIFICATION_H 1
 
-// First of all, enable or disable API extensions (see bug #92204)
-#include "CoolKernel/VersionInfo.h"
-
 // Include files
 #include "CoolKernel/IRecordSpecification.h"
 #include "CoolKernel/FolderVersioning.h"
diff --git a/src/CoolKernel/CoolKernel/IHvsNode.h b/src/CoolKernel/CoolKernel/IHvsNode.h
index 4ffaa6152..d2ee44add 100644
--- a/src/CoolKernel/CoolKernel/IHvsNode.h
+++ b/src/CoolKernel/CoolKernel/IHvsNode.h
@@ -1,8 +1,7 @@
 #ifndef COOLKERNEL_IHVSNODE_H
 #define COOLKERNEL_IHVSNODE_H 1
 
-// First of all, enable or disable the COOL400 API extensions
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #include <algorithm>
diff --git a/src/CoolKernel/CoolKernel/IObject.h b/src/CoolKernel/CoolKernel/IObject.h
index d76bf76db..27f170d32 100644
--- a/src/CoolKernel/CoolKernel/IObject.h
+++ b/src/CoolKernel/CoolKernel/IObject.h
@@ -1,9 +1,6 @@
 #ifndef COOLKERNEL_IOBJECT_H
 #define COOLKERNEL_IOBJECT_H 1
 
-// First of all, enable or disable the API extensions (bug #92204)
-#include "CoolKernel/VersionInfo.h"
-
 // Include files
 #include <sstream>
 #include "CoolKernel/ChannelId.h"
diff --git a/src/CoolKernel/CoolKernel/ITransaction.h b/src/CoolKernel/CoolKernel/ITransaction.h
index d42152038..024e38f52 100644
--- a/src/CoolKernel/CoolKernel/ITransaction.h
+++ b/src/CoolKernel/CoolKernel/ITransaction.h
@@ -1,8 +1,7 @@
 #ifndef COOLKERNEL_ITRANSACTION_H
 #define COOLKERNEL_ITRANSACTION_H 1
 
-// First of all, enable or disable the COOL400 API extensions
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // This class only exists in the COOL400 API
 #ifdef COOL400
diff --git a/src/CoolKernel/CoolKernel/PayloadMode.h b/src/CoolKernel/CoolKernel/PayloadMode.h
index ed83d0c06..3e4804098 100644
--- a/src/CoolKernel/CoolKernel/PayloadMode.h
+++ b/src/CoolKernel/CoolKernel/PayloadMode.h
@@ -1,8 +1,7 @@
 #ifndef COOLKERNEL_PAYLOADMODE_H
 #define COOLKERNEL_PAYLOADMODE_H 1
 
-// First of all, set/unset COOL400 macros
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #ifdef COOL400CPP11ENUM
diff --git a/src/CoolKernel/CoolKernel/RecordException.h b/src/CoolKernel/CoolKernel/RecordException.h
index 40be59141..b50f114e9 100644
--- a/src/CoolKernel/CoolKernel/RecordException.h
+++ b/src/CoolKernel/CoolKernel/RecordException.h
@@ -1,8 +1,7 @@
 #ifndef COOLKERNEL_RECORDEXCEPTION_H
 #define COOLKERNEL_RECORDEXCEPTION_H 1
 
-// First of all, set/unset COOL400 macros
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #include <sstream>
diff --git a/src/CoolKernel/CoolKernel/StorageType.h b/src/CoolKernel/CoolKernel/StorageType.h
index 7aadf1aac..053292627 100644
--- a/src/CoolKernel/CoolKernel/StorageType.h
+++ b/src/CoolKernel/CoolKernel/StorageType.h
@@ -1,8 +1,7 @@
 #ifndef COOLKERNEL_STORAGETYPE_H
 #define COOLKERNEL_STORAGETYPE_H 1
 
-// First of all, set/unset COOL400 macros
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #ifdef COOL400CPP11ENUM
diff --git a/src/CoolKernel/CoolKernel/Time.h b/src/CoolKernel/CoolKernel/Time.h
index 2875fa783..0b902fcfa 100644
--- a/src/CoolKernel/CoolKernel/Time.h
+++ b/src/CoolKernel/CoolKernel/Time.h
@@ -1,11 +1,6 @@
 #ifndef COOLKERNEL_TIME_H
 #define COOLKERNEL_TIME_H 1
 
-// For COOL3, the CORAL3 TimeStamp extensions are needed
-// This is no longer checked explicitly (CORALCOOL-2943)
-#include "CoolKernel/VersionInfo.h" // kept here but no longer needed
-#include "CoralBase/VersionInfo.h" // kept here but no longer needed
-
 // Include files
 #include "CoralBase/TimeStamp.h" // NB: CORAL3 TimeStamp is needed!
 #include "CoolKernel/ITime.h"
diff --git a/src/CoolKernel/CoolKernel/pointers.h b/src/CoolKernel/CoolKernel/pointers.h
index 997281ac5..0c30b0b0b 100644
--- a/src/CoolKernel/CoolKernel/pointers.h
+++ b/src/CoolKernel/CoolKernel/pointers.h
@@ -1,8 +1,7 @@
 #ifndef COOLKERNEL_POINTERS_H
 #define COOLKERNEL_POINTERS_H 1
 
-// First of all, set/unset COOL400 macros
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #include <memory>
diff --git a/src/CoolKernel/tests/FolderSpec/test_FolderSpec.cpp b/src/CoolKernel/tests/FolderSpec/test_FolderSpec.cpp
index 6200eca6f..250d54214 100644
--- a/src/CoolKernel/tests/FolderSpec/test_FolderSpec.cpp
+++ b/src/CoolKernel/tests/FolderSpec/test_FolderSpec.cpp
@@ -1,6 +1,3 @@
-// First of all, enable or disable the COOL290 API extensions (bug #92204)
-#include "CoolKernel/VersionInfo.h"
-
 // Include files
 #include <iostream>
 #include "CoolKernel/FolderSpecification.h"
diff --git a/src/PyCool/dict/PyCool_headers.h b/src/PyCool/dict/PyCool_headers.h
index 5fe898a75..b4586c653 100644
--- a/src/PyCool/dict/PyCool_headers.h
+++ b/src/PyCool/dict/PyCool_headers.h
@@ -1,8 +1,7 @@
 #ifndef PYCOOL_PYCOOLHEADERS_H
 #define PYCOOL_PYCOOLHEADERS_H 1
 
-// First of all, set/unset COOL400 macros
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Port to ROOT6 (bug #102630) - remove Reflex dependency
 #include "RVersion.h"
diff --git a/src/RelationalCool/src/CoralApplication.h b/src/RelationalCool/src/CoralApplication.h
index 276c4e293..44fe941c7 100644
--- a/src/RelationalCool/src/CoralApplication.h
+++ b/src/RelationalCool/src/CoralApplication.h
@@ -1,9 +1,6 @@
 #ifndef RELATIONALCOOL_CORALAPPLICATION_H
 #define RELATIONALCOOL_CORALAPPLICATION_H 1
 
-// First of all, enable or disable the CORAL240 API extensions (bug #89707)
-#include "CoralBase/VersionInfo.h"
-
 // Include files
 #include <memory>
 #include "CoolKernel/IApplication.h"
@@ -75,11 +72,7 @@ namespace cool
   private:
 
     /// CORAL MessageStream
-#ifndef CORAL_HAS_CPP11
-    std::auto_ptr<coral::MessageStream> m_log;
-#else
     std::unique_ptr<coral::MessageStream> m_log;
-#endif
 
     /// CORAL connection service
     coral::IConnectionService* m_connSvc;
diff --git a/src/RelationalCool/src/ManualTransaction.cpp b/src/RelationalCool/src/ManualTransaction.cpp
index 3c192261e..b48014d2e 100644
--- a/src/RelationalCool/src/ManualTransaction.cpp
+++ b/src/RelationalCool/src/ManualTransaction.cpp
@@ -1,6 +1,4 @@
-
-// First of all, set/unset COOL400 macros
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 #ifdef COOL400
 
diff --git a/src/RelationalCool/src/ManualTransaction.h b/src/RelationalCool/src/ManualTransaction.h
index 50490b5ff..3d1fac50f 100644
--- a/src/RelationalCool/src/ManualTransaction.h
+++ b/src/RelationalCool/src/ManualTransaction.h
@@ -1,8 +1,7 @@
 #ifndef RELATIONALCOOL_MANUALTRANSACTION_H
 #define RELATIONALCOOL_MANUALTRANSACTION_H 1
 
-// First of all, set/unset COOL400 macros
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // This class only exists in the COOL400 API
 #ifdef COOL400
diff --git a/src/RelationalCool/src/RalDatabase.cpp b/src/RelationalCool/src/RalDatabase.cpp
index 2883f82fe..8b4e54c54 100644
--- a/src/RelationalCool/src/RalDatabase.cpp
+++ b/src/RelationalCool/src/RalDatabase.cpp
@@ -1,5 +1,4 @@
-// First of all, enable or disable the COOL400 API extensions (bug #92204)
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #include <sstream>
@@ -51,10 +50,10 @@
 #include "RelationalTagSequence.h"
 #include "RelationalTagTable.h"
 #include "RelationalTag2TagTable.h"
+#include "RelationalVersionInfo.h"
 #include "SimpleObject.h"
 #include "TimingReportMgr.h"
 #include "TransRelFolder.h"
-#include "VersionInfo.h"
 #include "attributeListToString.h"
 #include "sleep.h"
 #include "timeToString.h"
diff --git a/src/RelationalCool/src/RalDatabase.h b/src/RelationalCool/src/RalDatabase.h
index 4f92e1073..610d90a5e 100644
--- a/src/RelationalCool/src/RalDatabase.h
+++ b/src/RelationalCool/src/RalDatabase.h
@@ -1,8 +1,7 @@
 #ifndef RELATIONALCOOL_RALDATABASE_H
 #define RELATIONALCOOL_RALDATABASE_H 1
 
-// First of all, set/unset COOL400 macros
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #include "RelationalAccess/ISessionProxy.h"
diff --git a/src/RelationalCool/src/RalDatabaseSvc.cpp b/src/RelationalCool/src/RalDatabaseSvc.cpp
index f586dcd75..102d18cb5 100644
--- a/src/RelationalCool/src/RalDatabaseSvc.cpp
+++ b/src/RelationalCool/src/RalDatabaseSvc.cpp
@@ -6,9 +6,9 @@
 #include "RalDatabase.h"
 #include "RalDatabaseSvc.h"
 #include "RelationalException.h"
+#include "RelationalVersionInfo.h"
 //#include "TimingReportMgr.h"
 #include "TransRalDatabase.h"
-#include "VersionInfo.h"
 
 // Namespace
 using namespace cool;
diff --git a/src/RelationalCool/src/RalSchemaMgr.cpp b/src/RelationalCool/src/RalSchemaMgr.cpp
index c79bb7a15..bc76ccec0 100644
--- a/src/RelationalCool/src/RalSchemaMgr.cpp
+++ b/src/RelationalCool/src/RalSchemaMgr.cpp
@@ -31,7 +31,7 @@
 #include "RelationalTagSequence.h"
 #include "RelationalTagTable.h"
 #include "RelationalTag2TagTable.h"
-#include "VersionInfo.h"
+#include "RelationalVersionInfo.h"
 #include "attributeListToString.h"
 
 // *** START *** 3.0.0 schema extensions (task #4307, task #4396)
diff --git a/src/RelationalCool/src/RelationalDatabase.cpp b/src/RelationalCool/src/RelationalDatabase.cpp
index 50dfba231..1be1423f0 100644
--- a/src/RelationalCool/src/RelationalDatabase.cpp
+++ b/src/RelationalCool/src/RelationalDatabase.cpp
@@ -30,7 +30,7 @@
 #include "RelationalTagSharedSequenceTable.h"
 #include "RelationalTagTable.h"
 #include "RelationalTagMgr.h"
-#include "VersionInfo.h"
+#include "RelationalVersionInfo.h"
 
 // *** START *** 3.0.0 schema extensions (task #4307, task #4396)
 #include "RelationalChannelTablesTable.h"
diff --git a/src/RelationalCool/src/RelationalDatabase.h b/src/RelationalCool/src/RelationalDatabase.h
index a058b9c9b..b37db7b25 100644
--- a/src/RelationalCool/src/RelationalDatabase.h
+++ b/src/RelationalCool/src/RelationalDatabase.h
@@ -1,8 +1,7 @@
 #ifndef RELATIONALCOOL_RELATIONALDATABASE_H
 #define RELATIONALCOOL_RELATIONALDATABASE_H 1
 
-// First of all, set/unset COOL400 macros
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #include <boost/shared_ptr.hpp>
diff --git a/src/RelationalCool/src/RelationalException.h b/src/RelationalCool/src/RelationalException.h
index 495736834..b7a8de8fd 100644
--- a/src/RelationalCool/src/RelationalException.h
+++ b/src/RelationalCool/src/RelationalException.h
@@ -5,7 +5,7 @@
 #include "CoolKernel/Exception.h"
 
 // Local include files
-#include "VersionInfo.h"
+#include "RelationalVersionInfo.h"
 
 namespace cool
 {
diff --git a/src/RelationalCool/src/RelationalNodeTable.cpp b/src/RelationalCool/src/RelationalNodeTable.cpp
index 43257f2cb..da6d1e4e2 100644
--- a/src/RelationalCool/src/RelationalNodeTable.cpp
+++ b/src/RelationalCool/src/RelationalNodeTable.cpp
@@ -6,7 +6,7 @@
 // Local include files
 #include "RelationalNodeTable.h"
 #include "RelationalException.h"
-#include "VersionInfo.h"
+#include "RelationalVersionInfo.h"
 
 // Namespace
 using namespace cool;
diff --git a/src/RelationalCool/src/VersionInfo.h b/src/RelationalCool/src/RelationalVersionInfo.h
similarity index 90%
rename from src/RelationalCool/src/VersionInfo.h
rename to src/RelationalCool/src/RelationalVersionInfo.h
index ccfa76ab0..77f24ec7c 100644
--- a/src/RelationalCool/src/VersionInfo.h
+++ b/src/RelationalCool/src/RelationalVersionInfo.h
@@ -2,7 +2,7 @@
 #define RELATIONALCOOL_VERSION_INFO_H
 
 // Include files
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for COOL_VERSIONINFO_RELEASE
 
 // Local include files
 #include "VersionNumber.h"
diff --git a/src/RelationalCool/src/TimingReportMgr.cpp b/src/RelationalCool/src/TimingReportMgr.cpp
index c5a84ec4a..d4309257b 100644
--- a/src/RelationalCool/src/TimingReportMgr.cpp
+++ b/src/RelationalCool/src/TimingReportMgr.cpp
@@ -1,7 +1,7 @@
 
 // Include files
 #include "CoolKernel/Exception.h"
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for COOL_ENABLE_TIMING_REPORT
 
 // Local include files
 #include "TimingReportMgr.h"
diff --git a/src/RelationalCool/src/TimingReportMgr.h b/src/RelationalCool/src/TimingReportMgr.h
index 6c831a8d8..390b33651 100644
--- a/src/RelationalCool/src/TimingReportMgr.h
+++ b/src/RelationalCool/src/TimingReportMgr.h
@@ -3,7 +3,7 @@
 
 // Include files
 #include <map>
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for COOL_ENABLE_TIMING_REPORT
 
 // Local include files
 #include "SealUtil_SealTimer.h"
diff --git a/src/RelationalCool/src/TransRalDatabase.h b/src/RelationalCool/src/TransRalDatabase.h
index 8ae53020e..864b9c2cd 100644
--- a/src/RelationalCool/src/TransRalDatabase.h
+++ b/src/RelationalCool/src/TransRalDatabase.h
@@ -1,8 +1,7 @@
 #ifndef RELATIONALCOOL_TRANSRALDATABASE_H
 #define RELATIONALCOOL_TRANSRALDATABASE_H 1
 
-// First of all, set/unset COOL400 macros
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #include "RalDatabase.h"
diff --git a/src/RelationalCool/tests/RalDatabase/test_RalDatabase.cpp b/src/RelationalCool/tests/RalDatabase/test_RalDatabase.cpp
index d52ac375f..87a2393f8 100644
--- a/src/RelationalCool/tests/RalDatabase/test_RalDatabase.cpp
+++ b/src/RelationalCool/tests/RalDatabase/test_RalDatabase.cpp
@@ -1,5 +1,4 @@
-// First of all, enable or disable the COOL400 API extensions
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #include <string>
@@ -47,8 +46,8 @@
 #include "src/RelationalTagMgr.h"
 #include "src/RelationalTransaction.h"
 #include "src/RelationalDatabaseTable.h"
+#include "src/RelationalVersionInfo.h"
 #include "src/TransRelFolder.h"
-#include "src/VersionInfo.h"
 #include "src/timeToString.h"
 
 // Forward declaration (for easier indentation)
diff --git a/src/RelationalCool/tests/RalDatabaseSvc/test_RalDatabaseSvc.cpp b/src/RelationalCool/tests/RalDatabaseSvc/test_RalDatabaseSvc.cpp
index 07d9842f9..300b9eee6 100644
--- a/src/RelationalCool/tests/RalDatabaseSvc/test_RalDatabaseSvc.cpp
+++ b/src/RelationalCool/tests/RalDatabaseSvc/test_RalDatabaseSvc.cpp
@@ -9,7 +9,7 @@
 //#define COOLDBUNITTESTDEBUG 1
 #include "tests/Common/CoolDBUnitTest.h"
 #include "src/CoralApplication.h"
-#include "src/VersionInfo.h"
+#include "src/RelationalVersionInfo.h"
 
 // Forward declaration (for easier indentation)
 namespace cool
diff --git a/src/RelationalCool/tests/RelationalFolder/test_RelationalFolder.cpp b/src/RelationalCool/tests/RelationalFolder/test_RelationalFolder.cpp
index 0a69a9439..dae45aab3 100644
--- a/src/RelationalCool/tests/RelationalFolder/test_RelationalFolder.cpp
+++ b/src/RelationalCool/tests/RelationalFolder/test_RelationalFolder.cpp
@@ -1,5 +1,4 @@
-// First of all, enable or disable the COOL400 API extensions (bug #92204)
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #include <string>
diff --git a/src/RelationalCool/utilities/coolValidateSchema/coolValidateSchema.cpp b/src/RelationalCool/utilities/coolValidateSchema/coolValidateSchema.cpp
index 5a75ed079..6a1745b1d 100644
--- a/src/RelationalCool/utilities/coolValidateSchema/coolValidateSchema.cpp
+++ b/src/RelationalCool/utilities/coolValidateSchema/coolValidateSchema.cpp
@@ -10,8 +10,8 @@
 #include "RalSchemaValidation.h"
 #include "../../src/CoralApplication.h"
 #include "../../src/RalDatabase.h"
+#include "../../src/RelationalVersionInfo.h"
 #include "../../src/TransRalDatabase.h"
-#include "../../src/VersionInfo.h"
 
 // Namespace
 using namespace cool;
diff --git a/src/Utilities/CoolDBDiscovery/src/CoolDBDiscovery.cpp b/src/Utilities/CoolDBDiscovery/src/CoolDBDiscovery.cpp
index a0fb2bcbf..85b8ffa10 100644
--- a/src/Utilities/CoolDBDiscovery/src/CoolDBDiscovery.cpp
+++ b/src/Utilities/CoolDBDiscovery/src/CoolDBDiscovery.cpp
@@ -1,6 +1,3 @@
-// First of all, enable or disable the CORAL240 API extensions (bug #89707)
-#include "CoralBase/VersionInfo.h"
-
 // Include files
 #include <iostream>
 #include <memory>
@@ -95,11 +92,7 @@ int main (int argc, char *argv[])
     for ( dbId = dbIds.begin(); dbId != dbIds.end(); ++dbId ) {
 
       // Connect to database
-#ifndef CORAL_HAS_CPP11
-      std::auto_ptr<ISessionProxy> session;
-#else
       std::unique_ptr<ISessionProxy> session;
-#endif
       if (role.empty()) {
         session.reset( connSvc.connect(*dbId,ReadOnly) );
         //std::auto_ptr<ISessionProxy> session(connSvc.connect(*dbId,Update));
-- 
GitLab