common: absorb remaining files from daemon/

Also, we split the more sophisticated json_add helpers to avoid pulling in
everything into lightning-cli, and unify the routines to print struct
short_channel_id (it's ':',  not '/' too).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

lightningd/channel/commit_tx.h

@@ -2,8 +2,8 @@
 #define LIGHTNING_LIGHTNINGD_COMMIT_TX_H
 #include "config.h"
 #include <bitcoin/pubkey.h>
+#include <common/htlc.h>
 #include <common/initial_commit_tx.h>
-#include <daemon/htlc.h>
 #include <lightningd/channel/channeld_htlc.h>
 
 struct keyset;