Remove a few useless or duplicate things from q_shared.h