Moved all type aliases into their respective headers to resolve an issue
with typeid on forward declared classes