r12542: Move some more prototypes out to seperate headers