A bit of cleanup on included files