diff --git a/components/spiffs/component.mk b/components/spiffs/component.mk
index 4fe37f4f..ad45698a 100644
--- a/components/spiffs/component.mk
+++ b/components/spiffs/component.mk
@@ -1,6 +1,6 @@
 #
 # Component Makefile
 #
-COMPONENT_ADD_INCLUDEDIRS += include
+COMPONENT_ADD_INCLUDEDIRS += include/spiffs
 
 COMPONENT_SRCDIRS := library
diff --git a/components/spiffs/include/esp_spiffs.h b/components/spiffs/include/spiffs/esp_spiffs.h
similarity index 100%
rename from components/spiffs/include/esp_spiffs.h
rename to components/spiffs/include/spiffs/esp_spiffs.h
diff --git a/components/spiffs/include/spiffs.h b/components/spiffs/include/spiffs/spiffs.h
similarity index 100%
rename from components/spiffs/include/spiffs.h
rename to components/spiffs/include/spiffs/spiffs.h
diff --git a/components/spiffs/include/spiffs_config.h b/components/spiffs/include/spiffs/spiffs_config.h
similarity index 100%
rename from components/spiffs/include/spiffs_config.h
rename to components/spiffs/include/spiffs/spiffs_config.h
diff --git a/components/spiffs/include/spiffs_nucleus.h b/components/spiffs/include/spiffs/spiffs_nucleus.h
similarity index 100%
rename from components/spiffs/include/spiffs_nucleus.h
rename to components/spiffs/include/spiffs/spiffs_nucleus.h
diff --git a/components/spiffs/library/esp_spiffs.c b/components/spiffs/library/esp_spiffs.c
index 8155dceb..9d3fbbc7 100644
--- a/components/spiffs/library/esp_spiffs.c
+++ b/components/spiffs/library/esp_spiffs.c
@@ -1,4 +1,5 @@
 #include "esp_common.h"
+#include "esp_spiffs.h"
 
 #include <fcntl.h>
 #include <stdio.h>