fixed includes + namespace references