Moved some more definitions out of undocshell.h into the exported