fix inclusion of FPHSA

Make sure these modules also include exactly the version shipped with CMake.
Merge topic 'FPHSA-include' into next

3670c6a4 fix inclusion of FPHSA