Updated removed doubled include paths
removed #ifdefs