Fix a cycling dependency problem

Change-Id: Ie63b92bf73884e606492315fba8e7f41171a2d1b
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>