move wait.h macros out of bits. they do not vary.