diff --git a/include/plat/hikey/plat/machine.h b/include/plat/hikey/plat/machine.h
deleted file mode 100644
index 8c650e7c9..000000000
--- a/include/plat/hikey/plat/machine.h
+++ /dev/null
@@ -1,20 +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
-
-enum IRQConstants {
-    maxIRQ = 159
-} platform_interrupt_t;
-
-#include <arch/machine/gic_pl390.h>
-
-#endif  /* ! __PLAT_MACHINE_H */
diff --git a/include/plat/hikey/plat/machine/hardware.h b/include/plat/hikey/plat/machine/hardware.h
deleted file mode 100755
index 1afbe2b16..000000000
--- a/include/plat/hikey/plat/machine/hardware.h
+++ /dev/null
@@ -1,20 +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 <basic_types.h>
-#include <linker.h>
-#include <plat/machine.h>
-#include <plat/machine/devices_gen.h>
-
-#endif
diff --git a/include/plat/hikey/plat/machine/timer.h b/include/plat/hikey/plat/machine/timer.h
deleted file mode 100644
index 2346eaa3b..000000000
--- a/include/plat/hikey/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 1200000llu
-
-#include <arch/machine/generic_timer.h>
-
-#endif /* !__PLAT_MACHINE_TIMER_H */
diff --git a/src/plat/hikey/config.cmake b/src/plat/hikey/config.cmake
index ba07075fc..493775fdf 100644
--- a/src/plat/hikey/config.cmake
+++ b/src/plat/hikey/config.cmake
@@ -74,6 +74,12 @@ if(KernelPlatformHikey)
     endif()
     list(APPEND KernelDTSList "tools/dts/hikey.dts")
     list(APPEND KernelDTSList "src/plat/hikey/overlay-hikey.dts")
+    declare_default_headers(
+        TIMER_FREQUENCY 1200000llu
+        MAX_IRQ 159
+        TIMER arch/machine/generic_timer.h
+        INTERRUPT_CONTROLLER arch/machine/gic_pl390.h
+    )
 endif()
 
 add_sources(