Use common.h for all prototypes

Change-Id: Ib4573ebbd24704c773f7cf1c1b4da97ac830aa45