Fix problems with Services while compiling C++

Change-Id: I92802e348a8023b51b506605558783fa5a4f06c5