Change main include file, and some minor change.