Move some things into a header file.