Move more stuff to wdm.h