cleanup include fils and namespace