refining the way that prefixes are applied with regards to include files

and doing more testing related to that