diff --git a/DataQuality/DQUtils/src/pythonic_coracool.cxx b/DataQuality/DQUtils/src/pythonic_coracool.cxx
index 13f19bfc9a3bbaea2acff42551094187e8c2ca55..72c36fe2a72699ccb7ffa262069072b30085e1aa 100644
--- a/DataQuality/DQUtils/src/pythonic_coracool.cxx
+++ b/DataQuality/DQUtils/src/pythonic_coracool.cxx
@@ -14,19 +14,10 @@
 #include <CoolKernel/IFolder.h>
 #include <CoolKernel/IDatabase.h>
 
-using cool::IFolderPtr;
-using cool::IDatabasePtr;
-using cool::ChannelSelection;
-using cool::ValidityKey;
-
 #include "CoralBase/Attribute.h"
 #include "CoralBase/AttributeList.h"
 #include "CoralBase/AttributeListSpecification.h"
 
-using coral::Attribute;
-using coral::AttributeSpecification;
-using coral::AttributeList;
-
 #include <CoraCool/CoraCoolDatabaseSvcFactory.h>
 #include <CoraCool/CoraCoolDatabaseSvc.h>
 #include <CoraCool/CoraCoolDatabase.h>
@@ -36,7 +27,6 @@ using coral::AttributeList;
 
 #include <boost/bind.hpp>
 #include <boost/function.hpp>
-using boost::bind;
 
 #include <string>
 #include <iostream>
@@ -45,6 +35,15 @@ using std::endl;
 using std::string;
 using std::vector;
 
+using boost::bind;
+using cool::IFolderPtr;
+using cool::IDatabasePtr;
+using cool::ChannelSelection;
+using cool::ValidityKey;
+using coral::Attribute;
+using coral::AttributeSpecification;
+using coral::AttributeList;
+
 typedef boost::function<PyObject* (const AttributeList&)> 
     coral_attribute_fetcher_t;
 
diff --git a/DataQuality/DQUtils/src/quick_retrieve.cxx b/DataQuality/DQUtils/src/quick_retrieve.cxx
index de4085708598520e2b1dad77857ea19329b1bbaa..b0d8876aad293560ee8aaa60ac07596a6a60e33e 100644
--- a/DataQuality/DQUtils/src/quick_retrieve.cxx
+++ b/DataQuality/DQUtils/src/quick_retrieve.cxx
@@ -20,22 +20,9 @@
 
 #include <CoolApplication/DatabaseSvcFactory.h>
 
-using cool::DatabaseSvcFactory;
-using cool::IDatabasePtr;
-using cool::IField;
-using cool::IObject;
-using cool::IFolder;
-using cool::IFolderPtr;
-using cool::ChannelSelection;
-using cool::IObjectIteratorPtr;
-using cool::IObjectVectorPtr;
-using cool::ValidityKey;
-using cool::ITime;
-
 #include <boost/typeof/typeof.hpp>
 #include <boost/bind.hpp>
 #include <boost/function.hpp>
-using boost::bind;
 
 #include <vector>
 #include <string>
@@ -45,6 +32,20 @@ using std::endl;
 using std::string;
 using std::vector;
 
+using boost::bind;
+
+using cool::DatabaseSvcFactory;
+using cool::IDatabasePtr;
+using cool::IField;
+using cool::IObject;
+using cool::IFolder;
+using cool::IFolderPtr;
+using cool::ChannelSelection;
+using cool::IObjectIteratorPtr;
+using cool::IObjectVectorPtr;
+using cool::ValidityKey;
+using cool::ITime;
+
 cool::IRecordSelection* make_fieldselection(
     const std::string& name, 
     const cool::StorageType::TypeId typeId,