Move all private crap into its own header, reorganize constants again.