Resolves: #i123744# use only one way to include serf headers

(cherry picked from commit bc34afebf4562ad3a8c48484f3fb9841ab4809b0)

Change-Id: I0ef0d1a8b35ed6eb30db3d116bb102a911006ca0