WaE: struct/class inconsistency

Change-Id: Iedb9873bc36fa5854de56738351d3683e245024d
This uses boost_headers

Change-Id: I3e587cf07674374c18fa49e0528c0d7f8605f0df