diff --git a/libraries/DataFlash/DataFlash_File.cpp b/libraries/DataFlash/DataFlash_File.cpp
index 3b1e73a3cd..73aa8dff2a 100644
--- a/libraries/DataFlash/DataFlash_File.cpp
+++ b/libraries/DataFlash/DataFlash_File.cpp
@@ -651,7 +651,7 @@ void DataFlash_File::_io_timer(void)
           write.
          */
         BUF_ADVANCEHEAD(_writebuf, nwritten);
-#if CONFIG_HAL_BOARD != HAL_BOARD_AVR_SITL && CONFIG_HAL_BOARD_SUBTYPE != HAL_BOARD_SUBTYPE_LINUX_NONE
+#if CONFIG_HAL_BOARD != HAL_BOARD_SITL && CONFIG_HAL_BOARD_SUBTYPE != HAL_BOARD_SUBTYPE_LINUX_NONE
         ::fsync(_write_fd);
 #endif
     }
diff --git a/libraries/DataFlash/DataFlash_SITL.cpp b/libraries/DataFlash/DataFlash_SITL.cpp
index c94f4559fd..219d30216b 100644
--- a/libraries/DataFlash/DataFlash_SITL.cpp
+++ b/libraries/DataFlash/DataFlash_SITL.cpp
@@ -5,7 +5,7 @@
 
 #include <AP_HAL.h>
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL
+#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
 
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/libraries/DataFlash/DataFlash_SITL.h b/libraries/DataFlash/DataFlash_SITL.h
index 4b4827eb56..afa55dd462 100644
--- a/libraries/DataFlash/DataFlash_SITL.h
+++ b/libraries/DataFlash/DataFlash_SITL.h
@@ -4,7 +4,7 @@
 #ifndef __DATAFLASH_SITL_H__
 #define __DATAFLASH_SITL_H__
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL
+#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
 
 #include <AP_HAL.h>
 #include "DataFlash.h"
@@ -47,5 +47,5 @@ public:
     bool        CardInserted();
 };
 
-#endif // CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL
+#endif // CONFIG_HAL_BOARD == HAL_BOARD_SITL
 #endif // __DATAFLASH_SITL_H__
diff --git a/libraries/DataFlash/examples/DataFlash_test/DataFlash_test.pde b/libraries/DataFlash/examples/DataFlash_test/DataFlash_test.pde
index 92803c2f83..691b178022 100644
--- a/libraries/DataFlash/examples/DataFlash_test/DataFlash_test.pde
+++ b/libraries/DataFlash/examples/DataFlash_test/DataFlash_test.pde
@@ -7,7 +7,7 @@
 // Libraries
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
-#include <AP_HAL_AVR_SITL.h>
+#include <AP_HAL_SITL.h>
 #include <AP_HAL_Empty.h>
 #include <AP_HAL_PX4.h>