(Menu) Get rid of some unneeded includes in menu_common.h