diff --git a/Algorithms/MaterialMapping/CMakeLists.txt b/Algorithms/MaterialMapping/CMakeLists.txt
index 63f151b27fbac81ca97d2b67070a74bac52f6cdc..c4a75fc62219f289410a9e3d75b7736b2aef170d 100644
--- a/Algorithms/MaterialMapping/CMakeLists.txt
+++ b/Algorithms/MaterialMapping/CMakeLists.txt
@@ -6,7 +6,7 @@ endif()
 
 add_library(ACTFWMaterialMapping SHARED ${src_files})
 target_include_directories(ACTFWMaterialMapping PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/> $<INSTALL_INTERFACE:include>)
-target_link_libraries(ACTFWMaterialMapping PUBLIC ActsCore ActsMaterialMappingPlugin)
+target_link_libraries(ACTFWMaterialMapping PUBLIC ActsCore)
 target_link_libraries(ACTFWMaterialMapping PUBLIC ACTFramework)
 if (USE_GEANT4)
   target_link_libraries(ACTFWMaterialMapping PUBLIC ACTFWGeant4Plugin ACTFWGeometryInterfaces)
diff --git a/Algorithms/MaterialMapping/include/ACTFW/MaterialMapping/MaterialMapping.hpp b/Algorithms/MaterialMapping/include/ACTFW/MaterialMapping/MaterialMapping.hpp
index c5d3dbe69254678ee7e95e9d96b6182f7353eb23..7c80b4cf0180758346ba412f7040000594afe003 100644
--- a/Algorithms/MaterialMapping/include/ACTFW/MaterialMapping/MaterialMapping.hpp
+++ b/Algorithms/MaterialMapping/include/ACTFW/MaterialMapping/MaterialMapping.hpp
@@ -15,7 +15,7 @@
 #include "ACTFW/Framework/BareAlgorithm.hpp"
 #include "ACTFW/Framework/ProcessCode.hpp"
 #include "ACTFW/MaterialMapping/IMaterialWriter.hpp"
-#include "Acts/Plugins/MaterialMapping/SurfaceMaterialMapper.hpp"
+#include "Acts/Material/SurfaceMaterialMapper.hpp"
 #include "Acts/Utilities/Logger.hpp"
 
 namespace Acts {
diff --git a/Plugins/Geant4/CMakeLists.txt b/Plugins/Geant4/CMakeLists.txt
index 7e956722757788fd369178787ec3d92d73d99a42..13bbbd00a266abad1724ed4d6c079222e6457e5b 100644
--- a/Plugins/Geant4/CMakeLists.txt
+++ b/Plugins/Geant4/CMakeLists.txt
@@ -6,7 +6,7 @@ add_library(ACTFWGeant4Plugin SHARED ${src_files})
 target_include_directories(ACTFWGeant4Plugin PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/> $<INSTALL_INTERFACE:include>)
 target_include_directories(ACTFWGeant4Plugin PUBLIC ${Geant4_INCLUDE_DIRS})
 target_include_directories(ACTFWGeant4Plugin PUBLIC ${ROOT_INCLUDE_DIRS})
-target_link_libraries(ACTFWGeant4Plugin PUBLIC ActsCore ActsMaterialMappingPlugin ACTFramework)
+target_link_libraries(ACTFWGeant4Plugin PUBLIC ActsCore ACTFramework)
 target_link_libraries(ACTFWGeant4Plugin PUBLIC ${Geant4_LIBRARIES})
 target_link_libraries(ACTFWGeant4Plugin PUBLIC ${ROOT_LIBRARIES})