Fixing more header dependencies (moving includes to cpp files)