fixed duplicate headers
fixed includes