Add some more types

These are used in some header files.