This is to prepare removing those additional headers in common.h

Change-Id: I707d6d8eaf193eb28195a827c7fec738b968ab3e