diff --git a/examples/device/nrf52840/segger/nrf52840.emProject b/examples/device/nrf52840/segger/nrf52840.emProject
index 571a6bb80..ff02d3b55 100644
--- a/examples/device/nrf52840/segger/nrf52840.emProject
+++ b/examples/device/nrf52840/segger/nrf52840.emProject
@@ -74,13 +74,22 @@
         <folder Name="nordic">
           <folder Name="nrfx">
             <folder Name="drivers">
-              <folder Name="include" />
+              <folder Name="include">
+                <file file_name="../../../../hw/mcu/nordic/nrfx/drivers/include/nrfx_power_clock.h" />
+                <file file_name="../../../../hw/mcu/nordic/nrfx/drivers/include/nrfx_power.h" />
+                <file file_name="../../../../hw/mcu/nordic/nrfx/drivers/include/nrfx_qspi.h" />
+              </folder>
               <folder Name="src">
                 <file file_name="../../../../hw/mcu/nordic/nrfx/drivers/src/nrfx_power.c" />
                 <file file_name="../../../../hw/mcu/nordic/nrfx/drivers/src/nrfx_power_clock.c" />
+                <file file_name="../../../../hw/mcu/nordic/nrfx/drivers/src/nrfx_qspi.c" />
               </folder>
             </folder>
-            <folder Name="hal" />
+            <folder Name="hal">
+              <file file_name="../../../../hw/mcu/nordic/nrfx/hal/nrf_power.h" />
+              <file file_name="../../../../hw/mcu/nordic/nrfx/hal/nrf_qspi.h" />
+              <file file_name="../../../../hw/mcu/nordic/nrfx/hal/nrf_usbd.h" />
+            </folder>
             <folder Name="mdk">
               <file file_name="../../../../hw/mcu/nordic/nrfx/mdk/nrf51_to_nrf52840.h" />
               <file file_name="../../../../hw/mcu/nordic/nrfx/mdk/nrf52840_bitfields.h" />
diff --git a/examples/device/nrf52840/src/msc_device_app.c b/examples/device/nrf52840/src/msc_device_app.c
index 9f5015042..e9c9f547e 100644
--- a/examples/device/nrf52840/src/msc_device_app.c
+++ b/examples/device/nrf52840/src/msc_device_app.c
@@ -47,15 +47,6 @@
 //--------------------------------------------------------------------+
 // tinyusb callbacks
 //--------------------------------------------------------------------+
-void msc_app_mount(uint8_t rhport)
-{
-
-}
-
-void msc_app_umount(uint8_t rhport)
-{
-
-}
 
 // Callback invoked when received an SCSI command not in built-in list below
 // - READ_CAPACITY10, READ_FORMAT_CAPACITY, INQUIRY, MODE_SENSE6, REQUEST_SENSE
diff --git a/examples/device/nrf52840/src/msc_device_app.h b/examples/device/nrf52840/src/msc_device_app.h
index cc3caa102..7f2864695 100644
--- a/examples/device/nrf52840/src/msc_device_app.h
+++ b/examples/device/nrf52840/src/msc_device_app.h
@@ -50,8 +50,6 @@
  extern "C" {
 #endif
 
-#if CFG_TUD_MSC
-
 enum
 {
   DISK_BLOCK_NUM  = 16, // 8KB is the smallest size that windows allow to mount
@@ -69,21 +67,6 @@ issue at github.com/hathach/tinyusb"
   #define MSCD_APP_RAMDISK
 #endif
 
-void msc_app_init(void);
-void msc_app_task(void* param);
-
-void msc_app_mount(uint8_t rhport);
-void msc_app_umount(uint8_t rhport);
-
-#else
-
-#define msc_app_init()
-#define msc_app_task(x)
-#define msc_app_mount(x)
-#define msc_app_umount(x)
-
-#endif
-
 #ifdef __cplusplus
  }
 #endif
diff --git a/examples/device/nrf52840/src/msc_device_ramdisk.c b/examples/device/nrf52840/src/msc_device_ramdisk.c
index 91ef442db..e65070d2c 100644
--- a/examples/device/nrf52840/src/msc_device_ramdisk.c
+++ b/examples/device/nrf52840/src/msc_device_ramdisk.c
@@ -38,7 +38,7 @@
 
 #include "msc_device_app.h"
 
-#if CFG_TUD_MSC && defined (MSCD_APP_RAMDISK)
+#if CFG_TUD_MSC && defined (BOARD_FLASH_INTERNAL)
 
 //--------------------------------------------------------------------+
 // MACRO CONSTANT TYPEDEF