Solving include bugs