moved a few includes to .cpp files