Fix some header includes