Re-order include files to fix dprintf conflict