Refine : Use forward declartion if possible, remove include order