Fixed usage of PFS_PIMPL* macros