[PATCH v3 18/26] storage: Remove unused includes