removing amddefine dependency from everywhere but the tests