Remove unnecessary declarations in common.hpp