Clean-up so that the project can be build standalone.

Signed-off-by: jzz128 <jimmyzhangca@gmail.com>