diff --git a/src/FatFs/fattime.c b/src/FatFs/fattime.c
index ff92baf8a..219fab57d 100644
--- a/src/FatFs/fattime.c
+++ b/src/FatFs/fattime.c
@@ -31,8 +31,8 @@
  *
  */
 
-#include "FatFs/fattime.h"
-#include "FatFs/integer.h"
+#include "fattime.h"
+#include "integer.h"
 
 #define LEAP_SECONDS_POSSIBLE 0
 
diff --git a/src/gruvin9x/diskio.cpp b/src/gruvin9x/diskio.cpp
index c7f286a27..e6a280197 100644
--- a/src/gruvin9x/diskio.cpp
+++ b/src/gruvin9x/diskio.cpp
@@ -39,7 +39,7 @@
 /*-----------------------------------------------------------------------*/
 
 #include "../open9x.h"
-#include "diskio.h"
+#include "../FatFs/diskio.h"
 
 /* Definitions for MMC/SDC command */
 #define CMD0	(0)			/* GO_IDLE_STATE */
@@ -488,11 +488,11 @@ DRESULT disk_write (
 DRESULT disk_ioctl (
 			BYTE drv,		/* Physical drive nmuber (0) */
 			BYTE ctrl,		/* Control code */
-			BYTE *buff		/* Buffer to send/receive control data */
+			void *buff		/* Buffer to send/receive control data */
 			)
 {
 	DRESULT res;
-	BYTE n, csd[16], *ptr = buff;
+	BYTE n, csd[16], *ptr = (BYTE*)buff;
 	WORD csize;