diff --git a/src/mainboard/amd/inagua/acpi/gpe.asl b/src/mainboard/amd/inagua/acpi/gpe.asl
index 16fe45f32b..44e7b68eac 100644
--- a/src/mainboard/amd/inagua/acpi/gpe.asl
+++ b/src/mainboard/amd/inagua/acpi/gpe.asl
@@ -50,6 +50,3 @@ Scope(\_GPE) {	/* Start Scope GPE */
 		Notify(\_SB.PCI0.AZHD, 0x02) /* NOTIFY_DEVICE_WAKE */
 	}
 }	/* End Scope GPE */
-
-/* Contains the GPEs for USB overcurrent */
-#include "usb_oc.asl"
diff --git a/src/mainboard/amd/inagua/dsdt.asl b/src/mainboard/amd/inagua/dsdt.asl
index d81c672af8..af83ea4b80 100644
--- a/src/mainboard/amd/inagua/dsdt.asl
+++ b/src/mainboard/amd/inagua/dsdt.asl
@@ -47,5 +47,6 @@ DefinitionBlock (
 	#include "acpi/sleep.asl"
 
 	#include "acpi/gpe.asl"
+	#include "acpi/usb_oc.asl"
 }
 /* End of ASL file */
diff --git a/src/mainboard/amd/persimmon/acpi/gpe.asl b/src/mainboard/amd/persimmon/acpi/gpe.asl
index 16fe45f32b..44e7b68eac 100644
--- a/src/mainboard/amd/persimmon/acpi/gpe.asl
+++ b/src/mainboard/amd/persimmon/acpi/gpe.asl
@@ -50,6 +50,3 @@ Scope(\_GPE) {	/* Start Scope GPE */
 		Notify(\_SB.PCI0.AZHD, 0x02) /* NOTIFY_DEVICE_WAKE */
 	}
 }	/* End Scope GPE */
-
-/* Contains the GPEs for USB overcurrent */
-#include "usb_oc.asl"
diff --git a/src/mainboard/amd/persimmon/dsdt.asl b/src/mainboard/amd/persimmon/dsdt.asl
index d81c672af8..af83ea4b80 100644
--- a/src/mainboard/amd/persimmon/dsdt.asl
+++ b/src/mainboard/amd/persimmon/dsdt.asl
@@ -47,5 +47,6 @@ DefinitionBlock (
 	#include "acpi/sleep.asl"
 
 	#include "acpi/gpe.asl"
+	#include "acpi/usb_oc.asl"
 }
 /* End of ASL file */
diff --git a/src/mainboard/amd/south_station/acpi/gpe.asl b/src/mainboard/amd/south_station/acpi/gpe.asl
index 16fe45f32b..44e7b68eac 100644
--- a/src/mainboard/amd/south_station/acpi/gpe.asl
+++ b/src/mainboard/amd/south_station/acpi/gpe.asl
@@ -50,6 +50,3 @@ Scope(\_GPE) {	/* Start Scope GPE */
 		Notify(\_SB.PCI0.AZHD, 0x02) /* NOTIFY_DEVICE_WAKE */
 	}
 }	/* End Scope GPE */
-
-/* Contains the GPEs for USB overcurrent */
-#include "usb_oc.asl"
diff --git a/src/mainboard/amd/south_station/dsdt.asl b/src/mainboard/amd/south_station/dsdt.asl
index d81c672af8..af83ea4b80 100644
--- a/src/mainboard/amd/south_station/dsdt.asl
+++ b/src/mainboard/amd/south_station/dsdt.asl
@@ -47,5 +47,6 @@ DefinitionBlock (
 	#include "acpi/sleep.asl"
 
 	#include "acpi/gpe.asl"
+	#include "acpi/usb_oc.asl"
 }
 /* End of ASL file */
diff --git a/src/mainboard/amd/union_station/acpi/gpe.asl b/src/mainboard/amd/union_station/acpi/gpe.asl
index 16fe45f32b..44e7b68eac 100644
--- a/src/mainboard/amd/union_station/acpi/gpe.asl
+++ b/src/mainboard/amd/union_station/acpi/gpe.asl
@@ -50,6 +50,3 @@ Scope(\_GPE) {	/* Start Scope GPE */
 		Notify(\_SB.PCI0.AZHD, 0x02) /* NOTIFY_DEVICE_WAKE */
 	}
 }	/* End Scope GPE */
-
-/* Contains the GPEs for USB overcurrent */
-#include "usb_oc.asl"
diff --git a/src/mainboard/amd/union_station/dsdt.asl b/src/mainboard/amd/union_station/dsdt.asl
index d81c672af8..af83ea4b80 100644
--- a/src/mainboard/amd/union_station/dsdt.asl
+++ b/src/mainboard/amd/union_station/dsdt.asl
@@ -47,5 +47,6 @@ DefinitionBlock (
 	#include "acpi/sleep.asl"
 
 	#include "acpi/gpe.asl"
+	#include "acpi/usb_oc.asl"
 }
 /* End of ASL file */
diff --git a/src/mainboard/asrock/e350m1/acpi/gpe.asl b/src/mainboard/asrock/e350m1/acpi/gpe.asl
index c2378b2206..db500c0ee7 100644
--- a/src/mainboard/asrock/e350m1/acpi/gpe.asl
+++ b/src/mainboard/asrock/e350m1/acpi/gpe.asl
@@ -52,6 +52,3 @@ Scope(\_GPE) {	/* Start Scope GPE */
 	}
 
 }	/* End Scope GPE */
-
-/* Contains the GPEs for USB overcurrent */
-#include "usb_oc.asl"
diff --git a/src/mainboard/asrock/e350m1/dsdt.asl b/src/mainboard/asrock/e350m1/dsdt.asl
index b6bb94a253..4f766582b1 100644
--- a/src/mainboard/asrock/e350m1/dsdt.asl
+++ b/src/mainboard/asrock/e350m1/dsdt.asl
@@ -43,5 +43,6 @@ DefinitionBlock (
 	#include "acpi/sleep.asl"
 
 	#include "acpi/gpe.asl"
+	#include "acpi/usb_oc.asl"
 }
 /* End of ASL file */
diff --git a/src/mainboard/elmex/pcm205400/acpi/gpe.asl b/src/mainboard/elmex/pcm205400/acpi/gpe.asl
index 4fd7b9ff98..705abf17f6 100644
--- a/src/mainboard/elmex/pcm205400/acpi/gpe.asl
+++ b/src/mainboard/elmex/pcm205400/acpi/gpe.asl
@@ -51,6 +51,3 @@ Scope(\_GPE) {	/* Start Scope GPE */
 		Notify(\_SB.PCI0.AZHD, 0x02) /* NOTIFY_DEVICE_WAKE */
 	}
 }	/* End Scope GPE */
-
-/* Contains the GPEs for USB overcurrent */
-#include "usb_oc.asl"
diff --git a/src/mainboard/elmex/pcm205400/dsdt.asl b/src/mainboard/elmex/pcm205400/dsdt.asl
index d81c672af8..af83ea4b80 100644
--- a/src/mainboard/elmex/pcm205400/dsdt.asl
+++ b/src/mainboard/elmex/pcm205400/dsdt.asl
@@ -47,5 +47,6 @@ DefinitionBlock (
 	#include "acpi/sleep.asl"
 
 	#include "acpi/gpe.asl"
+	#include "acpi/usb_oc.asl"
 }
 /* End of ASL file */
diff --git a/src/mainboard/gizmosphere/gizmo/acpi/gpe.asl b/src/mainboard/gizmosphere/gizmo/acpi/gpe.asl
index 4fd7b9ff98..705abf17f6 100644
--- a/src/mainboard/gizmosphere/gizmo/acpi/gpe.asl
+++ b/src/mainboard/gizmosphere/gizmo/acpi/gpe.asl
@@ -51,6 +51,3 @@ Scope(\_GPE) {	/* Start Scope GPE */
 		Notify(\_SB.PCI0.AZHD, 0x02) /* NOTIFY_DEVICE_WAKE */
 	}
 }	/* End Scope GPE */
-
-/* Contains the GPEs for USB overcurrent */
-#include "usb_oc.asl"
diff --git a/src/mainboard/gizmosphere/gizmo/dsdt.asl b/src/mainboard/gizmosphere/gizmo/dsdt.asl
index cf04653b31..adcd64f357 100644
--- a/src/mainboard/gizmosphere/gizmo/dsdt.asl
+++ b/src/mainboard/gizmosphere/gizmo/dsdt.asl
@@ -41,5 +41,6 @@ DefinitionBlock (
 	#include "acpi/sleep.asl"
 
 	#include "acpi/gpe.asl"
+	#include "acpi/usb_oc.asl"
 }
 /* End of ASL file */
diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi/gpe.asl b/src/mainboard/jetway/nf81-t56n-lf/acpi/gpe.asl
index 4fd7b9ff98..705abf17f6 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/acpi/gpe.asl
+++ b/src/mainboard/jetway/nf81-t56n-lf/acpi/gpe.asl
@@ -51,6 +51,3 @@ Scope(\_GPE) {	/* Start Scope GPE */
 		Notify(\_SB.PCI0.AZHD, 0x02) /* NOTIFY_DEVICE_WAKE */
 	}
 }	/* End Scope GPE */
-
-/* Contains the GPEs for USB overcurrent */
-#include "usb_oc.asl"
diff --git a/src/mainboard/jetway/nf81-t56n-lf/dsdt.asl b/src/mainboard/jetway/nf81-t56n-lf/dsdt.asl
index e70f490372..cd792a7eca 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/dsdt.asl
+++ b/src/mainboard/jetway/nf81-t56n-lf/dsdt.asl
@@ -41,6 +41,8 @@ DefinitionBlock (
 	#include "acpi/sleep.asl"
 
 	#include "acpi/gpe.asl"
+	#include "acpi/usb_oc.asl"
+
 	#include "acpi/superio.asl"
 }
 /* End of ASL file */
diff --git a/src/mainboard/pcengines/apu1/acpi/gpe.asl b/src/mainboard/pcengines/apu1/acpi/gpe.asl
index 4fd7b9ff98..705abf17f6 100644
--- a/src/mainboard/pcengines/apu1/acpi/gpe.asl
+++ b/src/mainboard/pcengines/apu1/acpi/gpe.asl
@@ -51,6 +51,3 @@ Scope(\_GPE) {	/* Start Scope GPE */
 		Notify(\_SB.PCI0.AZHD, 0x02) /* NOTIFY_DEVICE_WAKE */
 	}
 }	/* End Scope GPE */
-
-/* Contains the GPEs for USB overcurrent */
-#include "usb_oc.asl"
diff --git a/src/mainboard/pcengines/apu1/dsdt.asl b/src/mainboard/pcengines/apu1/dsdt.asl
index 6d3876ae48..327570d15c 100644
--- a/src/mainboard/pcengines/apu1/dsdt.asl
+++ b/src/mainboard/pcengines/apu1/dsdt.asl
@@ -41,6 +41,7 @@ DefinitionBlock (
 	#include "acpi/sleep.asl"
 
 	#include "acpi/gpe.asl"
+	#include "acpi/usb_oc.asl"
 
 	/* Contains the GPIO led and button setup for this board */
 	#include "acpi/buttons.asl"