Fix various dependencies.

Change-Id: I8a7de439f394086ec7c2a27fbef5c1ed6bc59dfe
Depends-On: I0d78fdc62431866377a06da819724a49e738b417
Reviewed-on: http://gerrit.dmdirc.com/2704
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>