Fix some more header inclusions that should be <brackets> but
were "quotes".
Add Makefile dependencies for non-plugins, "best effort".