[WARNINGFIX] error in header inclusion order [discards 'const' qualifier]
[WARNINGFIX] error in header inclusion order [discards 'const' qualifier]

Change-Id: I22a7a44f299174a127548dac4167899befc51283

Parrot-Developers/fusion,ncarrier/fusion,ncarrier/fusion,Parrot-Developers/fusion