diff --git a/extras/spiffs/mkspiffs/Makefile b/extras/spiffs/mkspiffs/Makefile
index 7517456..a9a9722 100644
--- a/extras/spiffs/mkspiffs/Makefile
+++ b/extras/spiffs/mkspiffs/Makefile
@@ -11,6 +11,10 @@ $(error $(ERROR_MSG))
 endif
 endif
 
+# explicitly use gcc as in xtensa build environment it might be set to
+# cross compiler
+CC = gcc
+
 SOURCES := spiffs_hydrogen.c
 SOURCES += spiffs_cache.c
 SOURCES += spiffs_gc.c
diff --git a/extras/spiffs/mkspiffs/mkspiffs.c b/extras/spiffs/mkspiffs/mkspiffs.c
index 9f231a8..65b90e0 100644
--- a/extras/spiffs/mkspiffs/mkspiffs.c
+++ b/extras/spiffs/mkspiffs/mkspiffs.c
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/dir.h>
-#include <sys/dirent.h>
+#include <dirent.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdlib.h>