Header file cleanup, use only omxd.h