This reverts commit c93f76436f. This looked better with the #defines attached to the typedef symbols.
c93f76436f