Patch from Scott McKellar to remove srfsh.h and push all relevant