This fixes a build problem due to the reduced include search paths introduced by my recent changes. Also fix a couple of other includes to use angle brackets.