Fixed minor build script issues.
Fixed include cases.