diff --git a/libraries/DataFlash/DataFlash.h b/libraries/DataFlash/DataFlash.h
index eea062475d..824a1066cb 100644
--- a/libraries/DataFlash/DataFlash.h
+++ b/libraries/DataFlash/DataFlash.h
@@ -36,7 +36,7 @@ private:
     virtual uint8_t BufferRead (uint8_t BufferNum, uint16_t IntPageAdr) = 0;
     virtual void PageErase(uint16_t PageAdr) = 0;
     virtual void BlockErase(uint16_t BlockAdr) = 0;
-    virtual void ChipErase(void (*delay_cb)(unsigned long)) = 0;
+    virtual void ChipErase() = 0;
 
     // internal high level functions
     int16_t find_last_page(void);
diff --git a/libraries/DataFlash/DataFlash_APM1.h b/libraries/DataFlash/DataFlash_APM1.h
index 6d51e42055..a71caee5f0 100644
--- a/libraries/DataFlash/DataFlash_APM1.h
+++ b/libraries/DataFlash/DataFlash_APM1.h
@@ -21,7 +21,7 @@ private:
     uint16_t                PageSize();
     void                    PageErase (uint16_t PageAdr);
     void                    BlockErase (uint16_t BlockAdr);
-    void                    ChipErase(void (*delay_cb)(unsigned long));
+    void                    ChipErase();
     
     AP_HAL::SPIDeviceDriver *_spi;
     AP_HAL::Semaphore *_spi_sem;
diff --git a/libraries/DataFlash/DataFlash_APM2.h b/libraries/DataFlash/DataFlash_APM2.h
index caaec5f9e0..f1830a4633 100644
--- a/libraries/DataFlash/DataFlash_APM2.h
+++ b/libraries/DataFlash/DataFlash_APM2.h
@@ -4,7 +4,7 @@
 #ifndef __DATAFLASH_APM2_H__
 #define __DATAFLASH_APM2_H__
 
-#include <AP_Semaphore.h>
+#include <AP_HAL.h>
 #include "DataFlash.h"
 
 class DataFlash_APM2 : public DataFlash_Class
@@ -22,7 +22,7 @@ private:
 
     void                    PageErase (uint16_t PageAdr);
     void                    BlockErase (uint16_t BlockAdr);
-    void                    ChipErase(void (*delay_cb)(unsigned long));
+    void                    ChipErase();
 
     AP_HAL::SPIDeviceDriver* _spi;
     AP_HAL::Semaphore* _spi_sem;