Split even more things out of or.h