Fix some problematic includes.