Force more specific header includes