diff --git a/src/northbridge/amd/agesa/family14/acpi/northbridge.asl b/src/northbridge/amd/agesa/family14/acpi/northbridge.asl
index 72efeca1cf..6f51ea1f7a 100644
--- a/src/northbridge/amd/agesa/family14/acpi/northbridge.asl
+++ b/src/northbridge/amd/agesa/family14/acpi/northbridge.asl
@@ -124,7 +124,6 @@ Device(PE23) {
 /* Northbridge function 3 */
 Device(NBF3) {
 	Name(_ADR, 0x00180003)
-
 	/* k10temp thermal zone */
-	#include "thermal_mixin.asl"
+	#include <soc/amd/common/acpi/thermal_zone.asl>
 } /* end NBF3 */
diff --git a/src/northbridge/amd/agesa/family15tn/acpi/northbridge.asl b/src/northbridge/amd/agesa/family15tn/acpi/northbridge.asl
index 40df8918b1..217132f8e4 100644
--- a/src/northbridge/amd/agesa/family15tn/acpi/northbridge.asl
+++ b/src/northbridge/amd/agesa/family15tn/acpi/northbridge.asl
@@ -95,5 +95,5 @@ Device(PBR7) {
 
 Device(K10M) {
 	Name (_ADR, 0x00180003)
-	#include <northbridge/amd/agesa/family14/acpi/thermal_mixin.asl>
+	#include <soc/amd/common/acpi/thermal_zone.asl>
 }
diff --git a/src/northbridge/amd/agesa/family16kb/acpi/northbridge.asl b/src/northbridge/amd/agesa/family16kb/acpi/northbridge.asl
index 34bf33a32e..34e8ef046d 100644
--- a/src/northbridge/amd/agesa/family16kb/acpi/northbridge.asl
+++ b/src/northbridge/amd/agesa/family16kb/acpi/northbridge.asl
@@ -95,5 +95,5 @@ Device(PBR8) {
 
 Device(K10M) {
 	Name (_ADR, 0x00180003)
-	#include <northbridge/amd/agesa/family14/acpi/thermal_mixin.asl>
+	#include <soc/amd/common/acpi/thermal_zone.asl>
 }
diff --git a/src/northbridge/amd/pi/00630F01/acpi/northbridge.asl b/src/northbridge/amd/pi/00630F01/acpi/northbridge.asl
index cdb4063d36..ed5db82e79 100644
--- a/src/northbridge/amd/pi/00630F01/acpi/northbridge.asl
+++ b/src/northbridge/amd/pi/00630F01/acpi/northbridge.asl
@@ -65,5 +65,5 @@ Device(PBR3) {
 
 Device(K10M) {
 	Name (_ADR, 0x00180003)
-	#include <northbridge/amd/agesa/family14/acpi/thermal_mixin.asl>
+	#include <soc/amd/common/acpi/thermal_zone.asl>
 }
diff --git a/src/northbridge/amd/pi/00730F01/acpi/northbridge.asl b/src/northbridge/amd/pi/00730F01/acpi/northbridge.asl
index 34bf33a32e..34e8ef046d 100644
--- a/src/northbridge/amd/pi/00730F01/acpi/northbridge.asl
+++ b/src/northbridge/amd/pi/00730F01/acpi/northbridge.asl
@@ -95,5 +95,5 @@ Device(PBR8) {
 
 Device(K10M) {
 	Name (_ADR, 0x00180003)
-	#include <northbridge/amd/agesa/family14/acpi/thermal_mixin.asl>
+	#include <soc/amd/common/acpi/thermal_zone.asl>
 }
diff --git a/src/northbridge/amd/agesa/family14/acpi/thermal_mixin.asl b/src/soc/amd/common/acpi/thermal_zone.asl
similarity index 97%
rename from src/northbridge/amd/agesa/family14/acpi/thermal_mixin.asl
rename to src/soc/amd/common/acpi/thermal_zone.asl
index 3c692ce859..e6ab43235b 100644
--- a/src/northbridge/amd/agesa/family14/acpi/thermal_mixin.asl
+++ b/src/soc/amd/common/acpi/thermal_zone.asl
@@ -25,7 +25,7 @@
  * Scope (\_SB.PCI0) {
  *   Device (K10M) {
  *     Name (_ADR, 0x00180003)
- *     #include <northbridge/amd/agesa/family14/acpi/thermal_mixin.asl>
+ *     #include <soc/amd/common/acpi/thermal_zone.asl>
  *   }
  * }
  *