[PATCH 22/29] storage_file: Remove unused includes