r8806: Move data representation-independent data into seperate header