Minor syntax cleanup.
Move OSD_Func code from a header file to a more proper file.