fixed the order of includes such that it compiles