diff --git a/cmake/Doxyfile.in b/cmake/Doxyfile.in
index 8621ef090fa6dc9e465f5774b807ebd89a25eb45..5f8cff3389d0a5e16e95c68a3aa2f8b54fe0c925 100644
--- a/cmake/Doxyfile.in
+++ b/cmake/Doxyfile.in
@@ -649,12 +649,14 @@ WARN_LOGFILE =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT = @CMAKE_CURRENT_SOURCE_DIR@/DDCore/src
+INPUT  = @CMAKE_CURRENT_SOURCE_DIR@/DDCore/src
 INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDCore/src/XML
 INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDCore/include/DD4hep
 INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDCore/include/XML
-INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDG4/src
 INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDG4/include/DDG4
+INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDG4/src
+INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDG4/plugins
+INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDG4/lcio
 INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDSegmentation/src
 INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDSegmentation/include/DDSegmentation
 INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDSense/src
@@ -662,7 +664,6 @@ INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDSense/include/DDSense
 #INPUT += @CMAKE_CURRENT_SOURCE_DIR@//src
 #INPUT += @CMAKE_CURRENT_SOURCE_DIR@//include
 
-
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
 # also the default input encoding. Doxygen uses libiconv (or the iconv built
diff --git a/cmake/FindROOT.cmake b/cmake/FindROOT.cmake
index 818f9cf2140642db9cdca6393526832807803afd..0711e1ba4b3365f2840fb0cd268263d9a6c70c68 100644
--- a/cmake/FindROOT.cmake
+++ b/cmake/FindROOT.cmake
@@ -32,6 +32,11 @@ if(ROOT_CONFIG_EXECUTABLE)
     OUTPUT_VARIABLE ROOT_LIBRARIES
     OUTPUT_STRIP_TRAILING_WHITESPACE)
 
+  execute_process(
+    COMMAND ${ROOT_CONFIG_EXECUTABLE} --evelibs
+    OUTPUT_VARIABLE ROOT_EVE_LIBRARIES
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
   set(ROOT_LIBRARY_DIR ${ROOTSYS}/lib)
 
   set(ROOT_ROOT ${ROOTSYS})
@@ -42,6 +47,7 @@ if(ROOT_CONFIG_EXECUTABLE)
 endif()
 
 set(ROOT_LIBRARIES ${ROOT_LIBRARIES} -lGenVector)     
+set(ROOT_EVE_LIBRARIES ${ROOT_EVE_LIBRARIES} )     
 
 # handle the QUIETLY and REQUIRED arguments and set ROOT_FOUND to TRUE if
 # all listed variables are TRUE