* fix includes string (don't use angle brackets for local, doh ..)
* fix bug that overwrote dictionary entries for local includes