Minor fix of include files