reorder includes in init.pp