Changed the order of include files to resolve version conflicts