Added subdirs to header search paths