diff --git a/include/arch/arm/arch/machine/priv_timer.h b/include/arch/arm/arch/machine/priv_timer.h
index 327c93ba8..ee472443e 100644
--- a/include/arch/arm/arch/machine/priv_timer.h
+++ b/include/arch/arm/arch/machine/priv_timer.h
@@ -13,7 +13,6 @@
 #ifndef __ARCH_MACHINE_PRIV_TIMER_H_
 #define __ARCH_MACHINE_PRIV_TIMER_H_
 
-#define TIMER_CLOCK_HZ 400000000ULL
 #define TMR_INTS_EVENT       BIT(0)
 
 /* 32 bit down counter */
diff --git a/include/plat/imx6/plat/machine.h b/include/plat/imx6/plat/machine.h
deleted file mode 100644
index 0d3a823de..000000000
--- a/include/plat/imx6/plat/machine.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2014, General Dynamics C4 Systems
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
- */
-
-#ifndef __PLAT_MACHINE_H
-#define __PLAT_MACHINE_H
-
-enum IRQConstants {
-    maxIRQ = 159
-} platform_interrupt_t;
-
-#include <arch/machine/gic_pl390.h>
-
-#endif /* !__PLAT_MACHINE_H */
diff --git a/include/plat/imx6/plat/machine/hardware.h b/include/plat/imx6/plat/machine/hardware.h
deleted file mode 100644
index 0be111e07..000000000
--- a/include/plat/imx6/plat/machine/hardware.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright 2014, General Dynamics C4 Systems
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
- */
-
-#ifndef __PLAT_MACHINE_HARDWARE_H
-#define __PLAT_MACHINE_HARDWARE_H
-
-#include <plat/machine/devices_gen.h>
-
-#endif /* !__PLAT_MACHINE_HARDWARE_H */
diff --git a/include/plat/imx6/plat/machine/timer.h b/include/plat/imx6/plat/machine/timer.h
deleted file mode 100644
index 46306e2ac..000000000
--- a/include/plat/imx6/plat/machine/timer.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-#ifndef __PLAT_MACHINE_TIMER_H
-#define __PLAT_MACHINE_TIMER_H
-
-#include <arch/machine/priv_timer.h>
-
-#endif /* !__PLAT_MACHINE_TIMER_H */
diff --git a/src/plat/imx6/config.cmake b/src/plat/imx6/config.cmake
index 80a215c83..53ce12ccc 100644
--- a/src/plat/imx6/config.cmake
+++ b/src/plat/imx6/config.cmake
@@ -26,6 +26,13 @@ if(KernelPlatformWandQ OR KernelPlatformSabre)
         list(APPEND KernelDTSList "tools/dts/sabre.dts")
         list(APPEND KernelDTSList "src/plat/imx6/overlay-sabre.dts")
     endif()
+
+    declare_default_headers(
+        TIMER_FREQUENCY 400000000llu
+        MAX_IRQ 159
+        INTERRUPT_CONTROLLER arch/machine/gic_pl390.h
+        TIMER arch/machine/priv_timer.h
+    )
 else()
     config_set(KernelPlatImx6 PLAT_IMX6 OFF)
 endif()