Mrproper/typedep reorder

really?