Cleaning up missing declaration warnings, compiles clearly.