Removed Common.h and included headears individually