diff --git a/arch/arm/src/goldfish/goldfish_timer.c b/arch/arm/src/goldfish/goldfish_timer.c
index 66d976b7831f9..d9f6e00fe6b30 100644
--- a/arch/arm/src/goldfish/goldfish_timer.c
+++ b/arch/arm/src/goldfish/goldfish_timer.c
@@ -23,9 +23,11 @@
  ****************************************************************************/
 
 #include <nuttx/timers/arch_alarm.h>
+#include <nuttx/timers/goldfish_timer.h>
 #include <nuttx/fdt.h>
 
 #include "arm_timer.h"
+#include "chip.h"
 
 /****************************************************************************
  * Public Functions
@@ -41,7 +43,7 @@ void up_timer_initialize(void)
 
   lower = goldfish_timer_initialize(
             fdt_get_reg_base_by_path(fdt, "/goldfish_rtc"),
-            fdt_get_irq_by_path(fdt, "/goldfish_rtc"), QEMU_SPI_IRQ_BASE);
+            fdt_get_irq_by_path(fdt, "/goldfish_rtc", QEMU_SPI_IRQ_BASE));
 
   DEBUGASSERT(lower != NULL);
 
diff --git a/drivers/timers/goldfish_timer.c b/drivers/timers/goldfish_timer.c
index 48fe855949102..7645c9204e01d 100644
--- a/drivers/timers/goldfish_timer.c
+++ b/drivers/timers/goldfish_timer.c
@@ -27,6 +27,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/timers/oneshot.h>
+#include <nuttx/spinlock.h>
 
 /****************************************************************************
  * Pre-processor Definitions