Changed some local includes to use quotes - may cause problems on some compilers otherwise.