removed defines and includes from other branch