Moved extraneous includes to cpp