Removed common.hpp and moved all the includes into source files that needed them