replace includes by forward declarations
fix conflicts