This reduced dependecies.

Change-Id: I064a9f4ef953196a301b4fdd194db2370efcfba1
Reviewed-by: Marco Bubke <marco.bubke@digia.com>