Remove modules reuirement and fix header list

Change-Id: I97bbea13d9e186b83cb4cb116c3e24e83a9bf826