Please split out the `#include "dmobject.h"` removal diff chunks into a separate commit. Those are an unrelated cleanup.
They are only there because "dmusic_private.h" is included in "dmime_private.h" (in order to get wave entry points), so IMO it is related. I can still split them into a preceding commit but not the other way around.