diff --git a/meson.build b/meson.build
index 64c6fcf5..2ecbb2fb 100644
--- a/meson.build
+++ b/meson.build
@@ -231,7 +231,8 @@ mduv380_def = def + stm32f405_def + {'PLATFORM_MDUV380': ''}
 ## TYT MD-UV380G
 mduv380g_src = src + stm32f405_src + ['platform/drivers/display/HX83XX_MDx.c',
                                      'platform/drivers/keyboard/keyboard_MDx.c',
-                                     'platform/drivers/NVM/extFlash_MDx.c',
+                                     'platform/drivers/NVM/W25Qx.c',
+                                     'platform/drivers/NVM/spiFlash_MDx.c',
                                      'platform/drivers/NVM/nvmem_MDUV3x0G.c',
                                      'platform/drivers/ADC/ADC1_MDx.c',
                                      'platform/drivers/baseband/rtx_UV3x0.c',
@@ -245,6 +246,10 @@ mduv380g_def = def + stm32f405_def + {'PLATFORM_MDUV380G': ''}
 gd77_src = src + mk22fn512_src + ['platform/targets/GD77/platform.c',
                                   'platform/drivers/display/UC1701_GD77.c',
                                   'platform/drivers/keyboard/keyboard_GD77.c',
+                                  'platform/drivers/NVM/W25Qx.c',
+                                  'platform/drivers/NVM/AT24Cx_GDx.c',
+                                  'platform/drivers/NVM/spiFlash_GDx.c',
+                                  'platform/drivers/NVM/nvmem_GDx.c',
                                   'platform/drivers/ADC/ADC0_GDx.c',
                                   'platform/drivers/baseband/rtx_GDx.c']
 
diff --git a/platform/drivers/NVM/AT24Cx_GDx.c b/platform/drivers/NVM/AT24Cx_GDx.c
index c613d4f4..a9a64d9c 100644
--- a/platform/drivers/NVM/AT24Cx_GDx.c
+++ b/platform/drivers/NVM/AT24Cx_GDx.c
@@ -19,11 +19,11 @@
  ***************************************************************************/
 
 #include "AT24Cx.h"
-#include <I2C0.h>
-#include <gpio.h>
-#include <delays.h>
-#include <stdint.h>
+#include <interfaces/gpio.h>
+#include <interfaces/delays.h>
 #include <hwconfig.h>
+#include <stdint.h>
+#include <I2C0.h>
 
 static const uint8_t devAddr = 0xA0;    /* EEPROM I2C address */
 
diff --git a/platform/drivers/NVM/nvmem_GDx.c b/platform/drivers/NVM/nvmem_GDx.c
index 3c3e7a7a..f17cd403 100644
--- a/platform/drivers/NVM/nvmem_GDx.c
+++ b/platform/drivers/NVM/nvmem_GDx.c
@@ -18,8 +18,8 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <nvmem.h>
-#include <delays.h>
+#include <interfaces/delays.h>
+#include <interfaces/nvmem.h>
 #include <calibInfo_GDx.h>
 #include "AT24Cx.h"
 #include "W25Qx.h"
diff --git a/platform/drivers/NVM/spiFlash_GDx.c b/platform/drivers/NVM/spiFlash_GDx.c
index c0ce750c..80f14922 100644
--- a/platform/drivers/NVM/spiFlash_GDx.c
+++ b/platform/drivers/NVM/spiFlash_GDx.c
@@ -18,10 +18,10 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <gpio.h>
-#include <delays.h>
-#include <stdint.h>
+#include <interfaces/gpio.h>
+#include <interfaces/delays.h>
 #include <hwconfig.h>
+#include <stdint.h>
 
 /*
  * Implementation of external flash SPI interface for GDx devices.
diff --git a/platform/drivers/NVM/spiFlash_MDx.c b/platform/drivers/NVM/spiFlash_MDx.c
index 2ec48606..47442a2b 100644
--- a/platform/drivers/NVM/spiFlash_MDx.c
+++ b/platform/drivers/NVM/spiFlash_MDx.c
@@ -18,9 +18,9 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <gpio.h>
-#include <stdint.h>
+#include <interfaces/gpio.h>
 #include <hwconfig.h>
+#include <stdint.h>
 
 /*
  * Implementation of external flash SPI interface for MDx devices.
diff --git a/platform/targets/GD77/hwconfig.h b/platform/targets/GD77/hwconfig.h
index 39f7a186..7b46d448 100644
--- a/platform/targets/GD77/hwconfig.h
+++ b/platform/targets/GD77/hwconfig.h
@@ -72,4 +72,15 @@
 #define FUNC2_SW GPIOB,1
 #define MONI_SW  GPIOB,9
 
+
+/* External flash */
+#define FLASH_CS  GPIOE,6
+#define FLASH_CLK GPIOE,5
+#define FLASH_SDO GPIOE,4
+#define FLASH_SDI GPIOA,19
+
+/* I2C for EEPROM and AT1846S */
+#define I2C_SDA GPIOE,25
+#define I2C_SCL GPIOE,24
+
 #endif