diff --git a/DDRec/include/DDRec/CellIDPositionConverter.h b/DDRec/include/DDRec/CellIDPositionConverter.h
index a5b6eca8e6f8d1adbf3fb1b7b7fb13509237e942..47cf9f7ce86dc8af01c17e1c21c1135a1360eab6 100644
--- a/DDRec/include/DDRec/CellIDPositionConverter.h
+++ b/DDRec/include/DDRec/CellIDPositionConverter.h
@@ -1,12 +1,11 @@
 #ifndef CellIDPositionConverter_H_
 #define CellIDPositionConverter_H_
 
-#include "DD4hep/LCDD.h"
+#include "DD4hep/Detector.h"
 #include "DD4hep/Readout.h"
 #include "DD4hep/VolumeManager.h"
 
 #include "DDSegmentation/Segmentation.h"
-#include "DDRec/tempdefs.h"
 
 #include <set>
 #include <string>
diff --git a/DDRec/include/DDRec/MaterialManager.h b/DDRec/include/DDRec/MaterialManager.h
index 37c5a5442bff0f7ae20b2d579df20aff94c70daf..b21430e6b569934633a750406252d2c7a006c7ba 100644
--- a/DDRec/include/DDRec/MaterialManager.h
+++ b/DDRec/include/DDRec/MaterialManager.h
@@ -1,7 +1,7 @@
 #ifndef rec_MaterialManager_H_
 #define rec_MaterialManager_H_
 
-#include "DD4hep/LCDD.h"
+#include "DD4hep/Detector.h"
 #include "DD4hep/Objects.h"
 #include "DDRec/Vector3D.h"
 #include "DDRec/Material.h"
diff --git a/DDRec/include/DDRec/SurfaceManager.h b/DDRec/include/DDRec/SurfaceManager.h
index 5849c8b49ec84245fd9cec3fb3b34ff6661970d8..030eb72e5400b12c866fb0ce0eb5b7b8a7fc42ef 100644
--- a/DDRec/include/DDRec/SurfaceManager.h
+++ b/DDRec/include/DDRec/SurfaceManager.h
@@ -2,7 +2,7 @@
 #define rec_SurfaceManager_H_
 
 #include "DDRec/ISurface.h"
-#include "DD4hep/LCDD.h"
+#include "DD4hep/Detector.h"
 #include <string>
 #include <map>
 
diff --git a/DDRec/src/SurfaceManager.cpp b/DDRec/src/SurfaceManager.cpp
index 47f544039512175abe706d0ba81414ad3ce12ee9..ee703d227aa5615001fe247b07350db28c4eaef7 100644
--- a/DDRec/src/SurfaceManager.cpp
+++ b/DDRec/src/SurfaceManager.cpp
@@ -13,8 +13,6 @@ namespace dd4hep {
   namespace rec {
     
 
-    SurfaceManager::SurfaceManager(){
-
     SurfaceManager::SurfaceManager(Detector& theDetector){
 
       // have to make sure the volume manager is populated once in order to have
@@ -42,10 +40,8 @@ namespace dd4hep {
       return 0 ;
     }
 
-    void SurfaceManager::initialize(Detector& theDetector) {
+    void SurfaceManager::initialize(Detector& description) {
       
-      Detector& description = Detector::getInstance();
-
       const std::vector<std::string>& types = description.detectorTypes() ;
 
       for(unsigned i=0,N=types.size();i<N;++i){
diff --git a/DDRec/src/plugins/createSurfaceManager.cpp b/DDRec/src/plugins/createSurfaceManager.cpp
index ea4457c5271144d74b4e2e6e6f1bcba6076019a4..03f54a213ffe33d2e862584d0f4c4a323dc3ea57 100644
--- a/DDRec/src/plugins/createSurfaceManager.cpp
+++ b/DDRec/src/plugins/createSurfaceManager.cpp
@@ -29,7 +29,7 @@ namespace dd4hep{
 
       printout(INFO,"InstallSurfaceManager","**** running plugin InstallSurfaceManager ! " );
 
-      description.addExtension<SurfaceManager>(  new SurfaceManager() ) ;
+      description.addExtension<SurfaceManager>(  new SurfaceManager(description) ) ;
 
       printout(INFO,"InstallSurfaceManager","%s" , description.extension<SurfaceManager>()->toString().c_str() );
 
diff --git a/UtilityApps/src/test_surfaces.cpp b/UtilityApps/src/test_surfaces.cpp
index b68a2794f6faf149980500beb86f8ec653276bf5..7476bbc6b346968043c9b85e920bec975c9d6240 100644
--- a/UtilityApps/src/test_surfaces.cpp
+++ b/UtilityApps/src/test_surfaces.cpp
@@ -1,4 +1,4 @@
-\//==========================================================================
+//==========================================================================
 //  AIDA Detector description implementation 
 //--------------------------------------------------------------------------
 // Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)