Fix some header stuff so that it compiles now.