fixed header cyclic include issues preventing debug builds.