diff --git a/include/plat/zynqmp/plat/machine.h b/include/plat/zynqmp/plat/machine.h
deleted file mode 100644
index 862e2fe2f..000000000
--- a/include/plat/zynqmp/plat/machine.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2017, DornerWorks
- * 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_DORNERWORKS_GPL)
- */
-/*
- * This data was produced by DornerWorks, Ltd. of Grand Rapids, MI, USA under
- * a DARPA SBIR, Contract Number D16PC00107.
- *
- * Approved for Public Release, Distribution Unlimited.
- */
-
-#ifndef __PLAT_MACHINE_H
-#define __PLAT_MACHINE_H
-#include <machine/io.h>
-
-enum IRQConstants {
-    maxIRQ = 187
-} platform_interrupt_t;
-
-#include <arch/machine/gic_pl390.h>
-
-#endif /* !__PLAT_MACHINE_H */
diff --git a/include/plat/zynqmp/plat/machine/hardware.h b/include/plat/zynqmp/plat/machine/hardware.h
deleted file mode 100644
index 55f490c0d..000000000
--- a/include/plat/zynqmp/plat/machine/hardware.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2017, DornerWorks
- * 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_DORNERWORKS_GPL)
- */
-/*
- * This data was produced by DornerWorks, Ltd. of Grand Rapids, MI, USA under
- * a DARPA SBIR, Contract Number D16PC00107.
- *
- * Approved for Public Release, Distribution Unlimited.
- */
-
-#ifndef __PLAT_MACHINE_HARDWARE_H
-#define __PLAT_MACHINE_HARDWARE_H
-#include <config.h>
-#include <types.h>
-#include <basic_types.h>
-#include <arch/linker.h>
-#include <plat/machine.h>
-#include <plat/machine/devices_gen.h>
-#include <machine/io.h>
-
-#endif /* !__PLAT_MACHINE_HARDWARE_H */
diff --git a/include/plat/zynqmp/plat/machine/timer.h b/include/plat/zynqmp/plat/machine/timer.h
deleted file mode 100644
index 3340b6858..000000000
--- a/include/plat/zynqmp/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 100000000llu
-
-#include <arch/machine/generic_timer.h>
-
-#endif /* !__PLAT_MACHINE_TIMER_H */
diff --git a/src/plat/zynqmp/config.cmake b/src/plat/zynqmp/config.cmake
index 64312bd75..14cd31280 100644
--- a/src/plat/zynqmp/config.cmake
+++ b/src/plat/zynqmp/config.cmake
@@ -31,6 +31,13 @@ if(KernelPlatformZynqmp)
     if(NOT KernelPlatformUltra96)
         list(APPEND KernelDTSList "tools/dts/zynqmp.dts")
     endif()
+
+    declare_default_headers(
+        TIMER_FREQUENCY 100000000llu
+        MAX_IRQ 187
+        TIMER arch/machine/generic_timer.h
+        INTERRUPT_CONTROLLER arch/machine/gic_pl390.h
+    )
 endif()
 
 add_sources(