Switched a bunch of includes to require_once's to eliminate chances of double-includes