diff --git a/Source/Calibratio/Public/CalibratioActor.h b/Source/Calibratio/Public/CalibratioActor.h
index bb59fb1553ec889a0cef8c888759f5f9725b88bc..774c413f0d1d5a7c1761a070df67f71a50327af7 100644
--- a/Source/Calibratio/Public/CalibratioActor.h
+++ b/Source/Calibratio/Public/CalibratioActor.h
@@ -3,7 +3,6 @@
 #include "CoreMinimal.h"
 #include "Materials/MaterialInstanceDynamic.h"
 #include "Cluster/IDisplayClusterClusterManager.h"
-#include "Components/DisplayClusterSceneComponent.h"
 
 #include "GameFramework/Actor.h"
 #include "CalibratioActor.generated.h"
diff --git a/Source/RWTHVRCluster/Private/CAVEOverlay/CAVEOverlayController.cpp b/Source/RWTHVRCluster/Private/CAVEOverlay/CAVEOverlayController.cpp
index fe76403ae3cfc8015dbd0f8bf96177023624e310..f1ec00086f2ce671065a48eecf57d8b551c12243 100644
--- a/Source/RWTHVRCluster/Private/CAVEOverlay/CAVEOverlayController.cpp
+++ b/Source/RWTHVRCluster/Private/CAVEOverlay/CAVEOverlayController.cpp
@@ -8,7 +8,6 @@
 #include "UObject/ConstructorHelpers.h"
 #include "Components/StaticMeshComponent.h"
 #include "Materials/MaterialInstanceDynamic.h"
-#include "Components/DisplayClusterSceneComponent.h"
 #include "Engine/CollisionProfile.h"
 #include "Utility/VirtualRealityUtilities.h"
 
diff --git a/Source/RWTHVRToolkit/Private/Utility/VirtualRealityUtilities.cpp b/Source/RWTHVRToolkit/Private/Utility/VirtualRealityUtilities.cpp
index f014c535b0b271782b1cf9fd29500408c497e010..aab4fa3d7ef3b4d851a62185880d010bda1bb961 100644
--- a/Source/RWTHVRToolkit/Private/Utility/VirtualRealityUtilities.cpp
+++ b/Source/RWTHVRToolkit/Private/Utility/VirtualRealityUtilities.cpp
@@ -136,7 +136,7 @@ USceneComponent* UVirtualRealityUtilities::GetClusterComponent(const FString& Na
 {
 #if PLATFORM_SUPPORTS_NDISPLAY
 	ADisplayClusterRootActor* RootActor = IDisplayCluster::Get().GetGameMgr()->GetRootActor();
-	return (RootActor) ? RootActor->GetComponentById(Name) : nullptr;
+	return (RootActor) ? RootActor->GetComponentByName<USceneComponent>(Name) : nullptr;
 #else
 	return nullptr;
 #endif