Elizabeth Figura (@zfigura) commented about dlls/user32/plugplay.idl:
+#pragma makedep header +#include "wine/plugplay.idl"
That shouldn't be necessary? If we're only using it for the header, we should be able to include "wine/plugplay.h" directly in user32.