Updated to use fully qualified path names for headers to be included