fix typedef re-define issue
Merge pull request #772 from lyao2/scrollingUT

this only solve the problem temporarily. but for the building of tests working, merge this first. 
we need to re-consider the including of typedef headers