simulator: More more stuff into common header