Code cleanup, removed unneeded includes in cpp files