Moved some include statements to a more logical location