moved defines into implementation scope