fixed forward declaration statics issue
merge