Fix include order problem and spec codes