Use proper include paths