Fixed class include and ambiguous variables