Fix broken logic surrounding includes and Debian defaults