OS-1528 wheels fell off dtrace.h during a merge