* Remove deprecated c-headers * Update calls to old cfunctions * Add missing one * Add another missing one