fixed psp-fixup-imports warnings