diff --git a/include/plat/tk1/plat/machine.h b/include/plat/tk1/plat/machine.h
deleted file mode 100644
index db5e30985..000000000
--- a/include/plat/tk1/plat/machine.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2016, 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
-
-#include <config.h>
-
-enum IRQConstants {
-    maxIRQ                          = 191
-} platform_interrupt_t;
-
-#include <arch/machine/gic_pl390.h>
-
-#endif  /* ! __PLAT_MACHINE_H */
diff --git a/include/plat/tk1/plat/machine/hardware.h b/include/plat/tk1/plat/machine/hardware.h
deleted file mode 100644
index 711a10c34..000000000
--- a/include/plat/tk1/plat/machine/hardware.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2016, 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 <config.h>
-#include <util.h>
-#include <basic_types.h>
-#include <linker.h>
-#include <arch/object/vcpu.h>
-#include <plat/machine.h>
-#include <plat/machine/devices_gen.h>
-#include <plat/machine/hardware_gen.h>
-#include <plat/machine/smmu.h>
-#include <mode/machine/hardware.h>
-#include <sel4/sel4_arch/constants.h>
-#include <arch/benchmark_overflowHandler.h>
-
-#endif
diff --git a/include/plat/tk1/plat/machine/timer.h b/include/plat/tk1/plat/machine/timer.h
deleted file mode 100644
index 5b51597f7..000000000
--- a/include/plat/tk1/plat/machine/timer.h
+++ /dev/null
@@ -1,20 +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
-
-#define TIMER_CLOCK_HZ 12000000llu
-
-#include <arch/machine/generic_timer.h>
-
-#endif /* !__PLAT_MACHINE_TIMER_H */
diff --git a/src/plat/tk1/config.cmake b/src/plat/tk1/config.cmake
index c1195fa53..3df55bad5 100644
--- a/src/plat/tk1/config.cmake
+++ b/src/plat/tk1/config.cmake
@@ -20,6 +20,7 @@ if(KernelPlatformTK1)
     config_set(KernelArmMach MACH "nvidia")
     list(APPEND KernelDTSList "tools/dts/tk1.dts")
     list(APPEND KernelDTSList "src/plat/tk1/overlay-tk1.dts")
+    declare_default_headers(12000000llu 191 arch/machine/gic_pl390.h arch/machine/generic_timer.h)
 endif()
 
 add_sources(