Moved all relevant typedefs into these files.