Put more stuff into cdefs