More files with typedefs.