Moved all the includes to the main .h file so that dependencies check out.