Remove some unneeded function prototypes and update others to match recent changes
Fix some dangling refs in HCF.h
Fix lots and lots of compile errors. Not debugged yet.