Fixed include paths for external including