[PATCH v2 23/30] storage_file: Remove unused includes