Added file system and USE_WINDOWS preprocessor