cleanup style and unneeded includes
use google style for include guards