added support for included headers