[ros-diffs] [akhaldi] 45707: Move more stuff to wdm.h