diff --git a/bsps/powerpc/headers.am b/bsps/powerpc/headers.am
index 25a68e911a..359015e2af 100644
--- a/bsps/powerpc/headers.am
+++ b/bsps/powerpc/headers.am
@@ -53,25 +53,6 @@ include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/spr.h
 include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/stackTrace.h
 include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/vectors.h
 
-include_mpc55xxdir = $(includedir)/mpc55xx
-include_mpc55xx_HEADERS =
-include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/dspi.h
-include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/edma.h
-include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/emios.h
-include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/fsl-mpc551x.h
-include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/fsl-mpc555x.h
-include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/fsl-mpc556x.h
-include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/fsl-mpc564xL.h
-include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/fsl-mpc5668.h
-include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/fsl-mpc567x.h
-include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/mpc55xx.h
-include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/reg-defs.h
-include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/regs-edma.h
-include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/regs-mmu.h
-include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/regs.h
-include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/siu.h
-include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/watchdog.h
-
 include_mpc5xxdir = $(includedir)/mpc5xx
 include_mpc5xx_HEADERS =
 include_mpc5xx_HEADERS += ../../../../../bsps/powerpc/include/mpc5xx/console.h
diff --git a/bsps/powerpc/mpc55xxevb/headers.am b/bsps/powerpc/mpc55xxevb/headers.am
index 6dffbe060c..5b01b38a2a 100644
--- a/bsps/powerpc/mpc55xxevb/headers.am
+++ b/bsps/powerpc/mpc55xxevb/headers.am
@@ -13,3 +13,22 @@ include_bsp_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/bsp/con
 include_bsp_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/bsp/irq.h
 include_bsp_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/bsp/mpc55xx-config.h
 include_bsp_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/bsp/smsc9218i.h
+
+include_mpc55xxdir = $(includedir)/mpc55xx
+include_mpc55xx_HEADERS =
+include_mpc55xx_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/mpc55xx/dspi.h
+include_mpc55xx_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/mpc55xx/edma.h
+include_mpc55xx_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/mpc55xx/emios.h
+include_mpc55xx_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc551x.h
+include_mpc55xx_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc555x.h
+include_mpc55xx_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc556x.h
+include_mpc55xx_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc564xL.h
+include_mpc55xx_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc5668.h
+include_mpc55xx_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc567x.h
+include_mpc55xx_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/mpc55xx/mpc55xx.h
+include_mpc55xx_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/mpc55xx/reg-defs.h
+include_mpc55xx_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/mpc55xx/regs-edma.h
+include_mpc55xx_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/mpc55xx/regs-mmu.h
+include_mpc55xx_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/mpc55xx/regs.h
+include_mpc55xx_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/mpc55xx/siu.h
+include_mpc55xx_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/mpc55xx/watchdog.h
diff --git a/bsps/powerpc/include/mpc55xx/dspi.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/dspi.h
similarity index 100%
rename from bsps/powerpc/include/mpc55xx/dspi.h
rename to bsps/powerpc/mpc55xxevb/include/mpc55xx/dspi.h
diff --git a/bsps/powerpc/include/mpc55xx/edma.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/edma.h
similarity index 100%
rename from bsps/powerpc/include/mpc55xx/edma.h
rename to bsps/powerpc/mpc55xxevb/include/mpc55xx/edma.h
diff --git a/bsps/powerpc/include/mpc55xx/emios.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/emios.h
similarity index 100%
rename from bsps/powerpc/include/mpc55xx/emios.h
rename to bsps/powerpc/mpc55xxevb/include/mpc55xx/emios.h
diff --git a/bsps/powerpc/include/mpc55xx/fsl-mpc551x.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc551x.h
similarity index 100%
rename from bsps/powerpc/include/mpc55xx/fsl-mpc551x.h
rename to bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc551x.h
diff --git a/bsps/powerpc/include/mpc55xx/fsl-mpc555x.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc555x.h
similarity index 100%
rename from bsps/powerpc/include/mpc55xx/fsl-mpc555x.h
rename to bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc555x.h
diff --git a/bsps/powerpc/include/mpc55xx/fsl-mpc556x.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc556x.h
similarity index 100%
rename from bsps/powerpc/include/mpc55xx/fsl-mpc556x.h
rename to bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc556x.h
diff --git a/bsps/powerpc/include/mpc55xx/fsl-mpc564xL.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc564xL.h
similarity index 100%
rename from bsps/powerpc/include/mpc55xx/fsl-mpc564xL.h
rename to bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc564xL.h
diff --git a/bsps/powerpc/include/mpc55xx/fsl-mpc5668.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc5668.h
similarity index 100%
rename from bsps/powerpc/include/mpc55xx/fsl-mpc5668.h
rename to bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc5668.h
diff --git a/bsps/powerpc/include/mpc55xx/fsl-mpc567x.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc567x.h
similarity index 100%
rename from bsps/powerpc/include/mpc55xx/fsl-mpc567x.h
rename to bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc567x.h
diff --git a/bsps/powerpc/include/mpc55xx/mpc55xx.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/mpc55xx.h
similarity index 100%
rename from bsps/powerpc/include/mpc55xx/mpc55xx.h
rename to bsps/powerpc/mpc55xxevb/include/mpc55xx/mpc55xx.h
diff --git a/bsps/powerpc/include/mpc55xx/reg-defs.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/reg-defs.h
similarity index 100%
rename from bsps/powerpc/include/mpc55xx/reg-defs.h
rename to bsps/powerpc/mpc55xxevb/include/mpc55xx/reg-defs.h
diff --git a/bsps/powerpc/include/mpc55xx/regs-edma.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/regs-edma.h
similarity index 100%
rename from bsps/powerpc/include/mpc55xx/regs-edma.h
rename to bsps/powerpc/mpc55xxevb/include/mpc55xx/regs-edma.h
diff --git a/bsps/powerpc/include/mpc55xx/regs-mmu.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/regs-mmu.h
similarity index 100%
rename from bsps/powerpc/include/mpc55xx/regs-mmu.h
rename to bsps/powerpc/mpc55xxevb/include/mpc55xx/regs-mmu.h
diff --git a/bsps/powerpc/include/mpc55xx/regs.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/regs.h
similarity index 100%
rename from bsps/powerpc/include/mpc55xx/regs.h
rename to bsps/powerpc/mpc55xxevb/include/mpc55xx/regs.h
diff --git a/bsps/powerpc/include/mpc55xx/siu.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/siu.h
similarity index 100%
rename from bsps/powerpc/include/mpc55xx/siu.h
rename to bsps/powerpc/mpc55xxevb/include/mpc55xx/siu.h
diff --git a/bsps/powerpc/include/mpc55xx/watchdog.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/watchdog.h
similarity index 100%
rename from bsps/powerpc/include/mpc55xx/watchdog.h
rename to bsps/powerpc/mpc55xxevb/include/mpc55xx/watchdog.h