Removed lots of redundant includes + definitions