Added some function prototypes.
Cleaned up temporary file naming.
Authored by: simonjwright 2010-05-01
Parent: [r69]
Child: [r71]
