Moved a couple of types from include/wine/obj_*.h to