diff --git a/src/arch/arm/kvm/ArmKvmCPU.py b/src/arch/arm/kvm/ArmKvmCPU.py
index 8af69d1..d0db063 100644
--- a/src/arch/arm/kvm/ArmKvmCPU.py
+++ b/src/arch/arm/kvm/ArmKvmCPU.py
@@ -36,7 +36,7 @@
 # Authors: Andreas Sandberg
 
 from m5.params import *
-from BaseKvmCPU import BaseKvmCPU
+from m5.objects.BaseKvmCPU import BaseKvmCPU
 
 class ArmKvmCPU(BaseKvmCPU):
     type = 'ArmKvmCPU'
diff --git a/src/arch/arm/kvm/ArmV8KvmCPU.py b/src/arch/arm/kvm/ArmV8KvmCPU.py
index 13cf2d4..1f7d69c 100644
--- a/src/arch/arm/kvm/ArmV8KvmCPU.py
+++ b/src/arch/arm/kvm/ArmV8KvmCPU.py
@@ -36,7 +36,7 @@
 # Authors: Andreas Sandberg
 
 from m5.params import *
-from BaseArmKvmCPU import BaseArmKvmCPU
+from m5.objects.BaseArmKvmCPU import BaseArmKvmCPU
 
 class ArmV8KvmCPU(BaseArmKvmCPU):
     type = 'ArmV8KvmCPU'
diff --git a/src/arch/arm/kvm/BaseArmKvmCPU.py b/src/arch/arm/kvm/BaseArmKvmCPU.py
index f29c811..7391cee 100644
--- a/src/arch/arm/kvm/BaseArmKvmCPU.py
+++ b/src/arch/arm/kvm/BaseArmKvmCPU.py
@@ -36,7 +36,7 @@
 # Authors: Andreas Sandberg
 
 from m5.params import *
-from BaseKvmCPU import BaseKvmCPU
+from m5.objects.BaseKvmCPU import BaseKvmCPU
 
 class BaseArmKvmCPU(BaseKvmCPU):
     type = 'BaseArmKvmCPU'
diff --git a/src/arch/arm/kvm/KvmGic.py b/src/arch/arm/kvm/KvmGic.py
index 19ae7f2..ea74778 100644
--- a/src/arch/arm/kvm/KvmGic.py
+++ b/src/arch/arm/kvm/KvmGic.py
@@ -38,7 +38,7 @@
 from m5.params import *
 from m5.proxy import *
 
-from Gic import GicV2
+from m5.objects.Gic import GicV2
 
 class MuxingKvmGic(GicV2):
     type = 'MuxingKvmGic'