Make the ServiceTrackers compile in the Ant build

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Fix a class cycle

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>