Minor includes fixes