Inline reference counting
Tidy up header file dependencies
Tidy up header file dependencies
Tidy up header file dependencies
Tidyup header files, store string references