JOHNE - Copy some extra header files in the post-build step
Revert "JOHNE - Copy some extra header files in the post-build step"

This reverts commit 37090e52518bf0f8b2a26e8215ea14f70c4e6085.
JOHNE - Revert changes from previous check-in