Avoid more platform ifdefs

Change-Id: I184a2dc4c20ffa17e258d049a6183f0ef1fbd8b6
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>