reorder includes
remove some dumb-programmer safety