Mostly remove unnecessary struct and typedef keywords. Move a few more small wm headers to C++ as well.