Removed cyclical header file dependencies (I discovered you can infinitely loop a build O_O)