Revert "fix fatal error when including common header file"

This reverts commit c1042787d47eb283912a36faf7233540499697dc.