diff --git a/targets/corstone-300/CMakeLists.txt b/targets/corstone-300/CMakeLists.txt
index 5dc3804..7c8db4e 100644
--- a/targets/corstone-300/CMakeLists.txt
+++ b/targets/corstone-300/CMakeLists.txt
@@ -124,9 +124,8 @@
     target.cpp)
 
 target_link_libraries(ethosu_target_startup INTERFACE
-    $<$<TARGET_EXISTS:ethosu_core_driver>:ethosu_core_driver>
+    $<$<TARGET_EXISTS:ethosu_core_driver>:ethosu_core_driver;timing_adapter>
     mpu
-    timing_adapter
     ethosu_mhu_dummy
     ethosu_uart_cmsdk_apb)
 
diff --git a/targets/corstone-300/target.cpp b/targets/corstone-300/target.cpp
index 87ba0c4..8f8db83 100644
--- a/targets/corstone-300/target.cpp
+++ b/targets/corstone-300/target.cpp
@@ -24,11 +24,10 @@
 
 #ifdef ETHOSU
 #include <ethosu_driver.h>
+#include <timing_adapter.h>
 #endif
 
 #include "mpu.hpp"
-#include <timing_adapter.h>
-
 #include "uart_stdout.h"
 
 #include <inttypes.h>
@@ -67,6 +66,8 @@
  * Timing Adapters
  ****************************************************************************/
 
+#ifdef ETHOSU
+
 #ifndef ETHOSU_TA_MAXR_0
 #define ETHOSU_TA_MAXR_0 0
 #endif
@@ -203,6 +204,8 @@
                                                                            ETHOSU_TA_HISTBIN_1,
                                                                            ETHOSU_TA_HISTCNT_1}};
 
+#endif
+
 /****************************************************************************
  * Cache maintenance
  ****************************************************************************/
@@ -283,6 +286,7 @@
     // Initialize UART driver
     UartStdOutInit();
 
+#ifdef ETHOSU
     // Initialize timing adapter(s)
     for (int i = 0; i < ETHOSU_NPU_COUNT; i++) {
         for (int j = 0; j < ETHOSU_NPU_TA_COUNT; j++) {
@@ -295,7 +299,6 @@
         }
     }
 
-#ifdef ETHOSU
     // Initialize Ethos-U NPU driver
     if (ethosu_init(&ethosu0_driver,
                     reinterpret_cast<void *>(ETHOSU_BASE_ADDRESS),