Attempt to resolve include issues