diff --git a/cores/esp8266/FS.h b/cores/esp8266/FS.h
index 79dc319f0..527e90b58 100644
--- a/cores/esp8266/FS.h
+++ b/cores/esp8266/FS.h
@@ -127,6 +127,7 @@ protected:
 
 } // namespace fs
 
+#ifndef FS_NO_GLOBALS
 using fs::FS;
 using fs::File;
 using fs::Dir;
@@ -135,7 +136,8 @@ using fs::SeekSet;
 using fs::SeekCur;
 using fs::SeekEnd;
 using fs::FSInfo;
+#endif //FS_NO_GLOBALS
 
-extern FS SPIFFS;
+extern fs::FS SPIFFS;
 
 #endif //FS_H