fix #322. Rearrange the order of header files