Moving typedefs to a single file to simplify dependencies