Weren't these moved to a header file?