Reverted trond's header file changes for now.