Changed include order to solve build problem