Re-indent types.h for easier reading.
(cherry picked from commit 27a91a93d101ef080f71e5d7e50c3cbf3dbb2e39)