diff --git a/libraries/AP_HAL/AP_HAL_Namespace.h b/libraries/AP_HAL/AP_HAL_Namespace.h
index 37c142e423..9e298d87bd 100644
--- a/libraries/AP_HAL/AP_HAL_Namespace.h
+++ b/libraries/AP_HAL/AP_HAL_Namespace.h
@@ -27,8 +27,6 @@ namespace AP_HAL {
     class Scheduler;
     class Semaphore;
 
-    class EmptyUARTDriver;
-
     /* Utility Classes */
     class Print;
     class Stream;
diff --git a/libraries/AP_HAL/SPIDriver.h b/libraries/AP_HAL/SPIDriver.h
index d98a1a4b98..8208af3f62 100644
--- a/libraries/AP_HAL/SPIDriver.h
+++ b/libraries/AP_HAL/SPIDriver.h
@@ -8,7 +8,7 @@
 class AP_HAL::SPIDeviceManager {
 public:
     virtual void init(void *) = 0;
-    virtual SPIDeviceDriver* device(enum AP_HAL::SPIDevice) = 0;
+    virtual AP_HAL::SPIDeviceDriver* device(enum AP_HAL::SPIDevice) = 0;
 };
 
 /**