util: Fix include file order