Misc
Re-add dsp-utlity headers