diff --git a/libn3ds/source/arm9/fatfs/diskio.c b/libn3ds/source/arm9/fatfs/diskio.c
index 3884b62..b9a38de 100644
--- a/libn3ds/source/arm9/fatfs/diskio.c
+++ b/libn3ds/source/arm9/fatfs/diskio.c
@@ -7,7 +7,7 @@
 /* storage control modules to the FatFs module with a defined API.       */
 /*-----------------------------------------------------------------------*/
 
-#include "ff.h"			/* Obtains integer types */
+#include "fatfs/ff.h"			/* Obtains integer types */
 #include "fatfs/diskio.h"		/* Declarations of disk functions */
 #include "types.h"
 #include "drivers/tmio.h"
diff --git a/libn3ds/source/arm9/fatfs/ff.c b/libn3ds/source/arm9/fatfs/ff.c
index 8f68624..56b2a1b 100644
--- a/libn3ds/source/arm9/fatfs/ff.c
+++ b/libn3ds/source/arm9/fatfs/ff.c
@@ -20,7 +20,7 @@
 
 
 #include <string.h>
-#include "ff.h"			/* Declarations of FatFs API */
+#include "fatfs/ff.h"			/* Declarations of FatFs API */
 #include "diskio.h"		/* Declarations of device I/O functions */
 
 
diff --git a/libn3ds/source/arm9/fatfs/ffsystem.c b/libn3ds/source/arm9/fatfs/ffsystem.c
index d5c5134..e4b9b1b 100644
--- a/libn3ds/source/arm9/fatfs/ffsystem.c
+++ b/libn3ds/source/arm9/fatfs/ffsystem.c
@@ -2,7 +2,7 @@
 /* A Sample Code of User Provided OS Dependent Functions for FatFs        */
 /*------------------------------------------------------------------------*/
 
-#include "ff.h"
+#include "fatfs/ff.h"
 
 
 #if FF_USE_LFN == 3	/* Use dynamic memory allocation */
diff --git a/libn3ds/source/arm9/fatfs/ffunicode.c b/libn3ds/source/arm9/fatfs/ffunicode.c
index e755038..6ae85fe 100644
--- a/libn3ds/source/arm9/fatfs/ffunicode.c
+++ b/libn3ds/source/arm9/fatfs/ffunicode.c
@@ -23,7 +23,7 @@
 */
 
 
-#include "ff.h"
+#include "fatfs/ff.h"
 
 #if FF_USE_LFN != 0	/* This module will be blanked if in non-LFN configuration */
 
diff --git a/libn3ds/source/arm9/fs.c b/libn3ds/source/arm9/fs.c
index 8378f67..25ca07b 100644
--- a/libn3ds/source/arm9/fs.c
+++ b/libn3ds/source/arm9/fs.c
@@ -19,7 +19,7 @@
 #include "types.h"
 #include "error_codes.h"
 #include "fs.h"
-#include "ff.h"
+#include "fatfs/ff.h"
 
 
 static const char *const g_fsPathTable[FS_MAX_DRIVES] = {FS_DRIVE_NAMES};
diff --git a/libn3ds/source/drivers/mmc/sdmmc.c b/libn3ds/source/drivers/mmc/sdmmc.c
index 85f637d..e37990f 100644
--- a/libn3ds/source/drivers/mmc/sdmmc.c
+++ b/libn3ds/source/drivers/mmc/sdmmc.c
@@ -744,8 +744,8 @@ u32 SDMMC_getCid(const u8 devNum, u32 cidOut[4])
 	return SDMMC_ERR_NONE;
 }
 
-#include "ff.h" // Needed for the "byte" type used in diskio.h.
-#include "diskio.h"
+#include "fatfs/ff.h" // Needed for the "byte" type used in diskio.h.
+#include "fatfs/diskio.h"
 u8 SDMMC_getDiskStatus(const u8 devNum)
 {
 	if(devNum > SDMMC_MAX_DEV_NUM) return STA_NODISK | STA_NOINIT;