Remove Old Header File and Use New Bdroid Def.