headers: fix up header idempotent lines.

For future reference, done via: for f in `find wire/ bitcoin/ common/ lightningd -name '*.h' ! -name 'gen*'`; do ID=`echo -n LIGHTNING/$f | tr 'a-z' 'A-Z' | tr -cs 'A-Z0-9' _`; sed 's/^#$ifndef\|define$ .*_H$/#\1 '$ID/ < $f | sed 's,#endif /..*_H ./$,#endif /* '$ID' */,' | bagto $f; done Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2017-08-29 01:36:01 +09:30
parent a37c165cb9
commit 8c22bd9ee1
54 changed files with 153 additions and 153 deletions
--- a/common/bip32.h
+++ b/common/bip32.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_LIGHTNINGD_BIP32_H
-#define LIGHTNING_LIGHTNINGD_BIP32_H
+#ifndef LIGHTNING_COMMON_BIP32_H
+#define LIGHTNING_COMMON_BIP32_H
 #include "config.h"
 #include <ccan/short_types/short_types.h>
 #include <stddef.h>
@@ -9,4 +9,4 @@ struct ext_key;
 void towire_ext_key(u8 **pptr, const struct ext_key *bip32);
 void fromwire_ext_key(const u8 **cursor, size_t *max, struct ext_key *bip32);

-#endif /* LIGHTNING_LIGHTNINGD_BIP32_H */
+#endif /* LIGHTNING_COMMON_BIP32_H */
--- a/common/channel_config.h
+++ b/common/channel_config.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_LIGHTNINGD_CHANNEL_CONFIG_H
-#define LIGHTNING_LIGHTNINGD_CHANNEL_CONFIG_H
+#ifndef LIGHTNING_COMMON_CHANNEL_CONFIG_H
+#define LIGHTNING_COMMON_CHANNEL_CONFIG_H
 #include "config.h"
 #include <ccan/short_types/short_types.h>
 #include <ccan/tal/tal.h>
@@ -45,4 +45,4 @@ struct channel_config {
 void towire_channel_config(u8 **pptr, const struct channel_config *config);
 void fromwire_channel_config(const u8 **ptr, size_t *max,
 			     struct channel_config *config);
-#endif /* LIGHTNING_LIGHTNINGD_CHANNEL_CONFIG_H */
+#endif /* LIGHTNING_COMMON_CHANNEL_CONFIG_H */
--- a/common/close_tx.h
+++ b/common/close_tx.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_CLOSE_TX_H
-#define LIGHTNING_CLOSE_TX_H
+#ifndef LIGHTNING_COMMON_CLOSE_TX_H
+#define LIGHTNING_COMMON_CLOSE_TX_H
 #include "config.h"
 #include <ccan/short_types/short_types.h>
 #include <ccan/tal/tal.h>
--- a/common/configdir.h
+++ b/common/configdir.h
@@ -1,9 +1,9 @@
-#ifndef LIGHTNING_DAEMON_CONFIGDIR_H
-#define LIGHTNING_DAEMON_CONFIGDIR_H
+#ifndef LIGHTNING_COMMON_CONFIGDIR_H
+#define LIGHTNING_COMMON_CONFIGDIR_H
 #include "config.h"
 #include <ccan/tal/tal.h>

 void configdir_register_opts(const tal_t *ctx,
 			     char **config_dir, char **rpc_filename);

-#endif /* LIGHTNING_DAEMON_CONFIGDIR_H */
+#endif /* LIGHTNING_COMMON_CONFIGDIR_H */
--- a/common/crypto_sync.h
+++ b/common/crypto_sync.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_LIGHTNINGD_CRYPTO_SYNC_H
-#define LIGHTNING_LIGHTNINGD_CRYPTO_SYNC_H
+#ifndef LIGHTNING_COMMON_CRYPTO_SYNC_H
+#define LIGHTNING_COMMON_CRYPTO_SYNC_H
 #include "config.h"
 #include <ccan/short_types/short_types.h>
 #include <ccan/tal/tal.h>
@@ -9,4 +9,4 @@ struct crypto_state;
 bool sync_crypto_write(struct crypto_state *cs, int fd, const void *msg TAKES);
 u8 *sync_crypto_read(const tal_t *ctx, struct crypto_state *cs, int fd);

-#endif /* LIGHTNING_LIGHTNINGD_CRYPTO_SYNC_H */
+#endif /* LIGHTNING_COMMON_CRYPTO_SYNC_H */
--- a/common/cryptomsg.h
+++ b/common/cryptomsg.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_LIGHTNINGD_CRYPTOMSG_H
-#define LIGHTNING_LIGHTNINGD_CRYPTOMSG_H
+#ifndef LIGHTNING_COMMON_CRYPTOMSG_H
+#define LIGHTNING_COMMON_CRYPTOMSG_H
 #include "config.h"
 #include <bitcoin/privkey.h>
 #include <ccan/short_types/short_types.h>
@@ -56,4 +56,4 @@ u8 *cryptomsg_encrypt_msg(const tal_t *ctx,
 bool cryptomsg_decrypt_header(struct crypto_state *cs, u8 hdr[18], u16 *lenp);
 u8 *cryptomsg_decrypt_body(const tal_t *ctx,
 			   struct crypto_state *cs, const u8 *in);
-#endif /* LIGHTNING_LIGHTNINGD_CRYPTOMSG_H */
+#endif /* LIGHTNING_COMMON_CRYPTOMSG_H */
--- a/common/daemon_conn.h
+++ b/common/daemon_conn.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_LIGHTNINGD_DAEMON_CONN_H
-#define LIGHTNING_LIGHTNINGD_DAEMON_CONN_H
+#ifndef LIGHTNING_COMMON_DAEMON_CONN_H
+#define LIGHTNING_COMMON_DAEMON_CONN_H

 #include "config.h"
 #include <ccan/io/io.h>
@@ -72,4 +72,4 @@ struct io_plan *daemon_conn_read_next(struct io_conn *conn,
 * daemon_conn_sync_flush - Flush connection by sending all messages now..
 */
 bool daemon_conn_sync_flush(struct daemon_conn *dc);
-#endif /* LIGHTNING_LIGHTNINGD_DAEMON_CONN_H */
+#endif /* LIGHTNING_COMMON_DAEMON_CONN_H */
--- a/common/debug.h
+++ b/common/debug.h
@@ -1,7 +1,7 @@
-#ifndef LIGHTNING_LIGHTNINGD_DEBUG_H
-#define LIGHTNING_LIGHTNINGD_DEBUG_H
+#ifndef LIGHTNING_COMMON_DEBUG_H
+#define LIGHTNING_COMMON_DEBUG_H
 #include "config.h"

 void subdaemon_debug(int argc, char *argv[]);

-#endif /* LIGHTNING_LIGHTNINGD_DEBUG_H */
+#endif /* LIGHTNING_COMMON_DEBUG_H */
--- a/common/derive_basepoints.h
+++ b/common/derive_basepoints.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_LIGHTNINGD_DERIVE_BASEPOINTS_H
-#define LIGHTNING_LIGHTNINGD_DERIVE_BASEPOINTS_H
+#ifndef LIGHTNING_COMMON_DERIVE_BASEPOINTS_H
+#define LIGHTNING_COMMON_DERIVE_BASEPOINTS_H
 #include "config.h"
 #include <assert.h>
 #include <bitcoin/privkey.h>
@@ -72,4 +72,4 @@ static inline u64 revocations_received(const struct shachain *shachain)
 {
 	return (1ULL << SHACHAIN_BITS) - (shachain_next_index(shachain) + 1);
 }
-#endif /* LIGHTNING_LIGHTNINGD_DERIVE_BASEPOINTS_H */
+#endif /* LIGHTNING_COMMON_DERIVE_BASEPOINTS_H */
--- a/common/dev_disconnect.h
+++ b/common/dev_disconnect.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_LIGHTNINGD_DEV_DISCONNECT_H
-#define LIGHTNING_LIGHTNINGD_DEV_DISCONNECT_H
+#ifndef LIGHTNING_COMMON_DEV_DISCONNECT_H
+#define LIGHTNING_COMMON_DEV_DISCONNECT_H
 #include "config.h"
 #include <stdbool.h>

@@ -17,4 +17,4 @@ void dev_sabotage_fd(int fd);
 /* For debug code to set in daemon. */
 void dev_disconnect_init(int fd);

-#endif /* LIGHTNING_LIGHTNINGD_DEV_DISCONNECT_H */
+#endif /* LIGHTNING_COMMON_DEV_DISCONNECT_H */
--- a/common/funding_tx.h
+++ b/common/funding_tx.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_LIGHTNINGD_FUNDING_TX_H
-#define LIGHTNING_LIGHTNINGD_FUNDING_TX_H
+#ifndef LIGHTNING_COMMON_FUNDING_TX_H
+#define LIGHTNING_COMMON_FUNDING_TX_H
 #include "config.h"
 #include <ccan/short_types/short_types.h>
 #include <ccan/tal/tal.h>
@@ -41,4 +41,4 @@ struct bitcoin_tx *funding_tx(const tal_t *ctx,
 			      u64 change_satoshis,
 			      const struct pubkey *changekey,
 			      const struct ext_key *bip32_base);
-#endif /* LIGHTNING_LIGHTNINGD_FUNDING_TX_H */
+#endif /* LIGHTNING_COMMON_FUNDING_TX_H */
--- a/common/htlc.h
+++ b/common/htlc.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_DAEMON_HTLC_H
-#define LIGHTNING_DAEMON_HTLC_H
+#ifndef LIGHTNING_COMMON_HTLC_H
+#define LIGHTNING_COMMON_HTLC_H
 #include "config.h"
 #include "bitcoin/locktime.h"
 #include "htlc_state.h"
@@ -81,4 +81,4 @@ static inline enum side str_to_side(const char *str)
 	assert(streq(str, "REMOTE"));
 	return REMOTE;
 }
-#endif /* LIGHTNING_DAEMON_HTLC_H */
+#endif /* LIGHTNING_COMMON_HTLC_H */
--- a/common/htlc_state.h
+++ b/common/htlc_state.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_DAEMON_HTLC_STATE_H
-#define LIGHTNING_DAEMON_HTLC_STATE_H
+#ifndef LIGHTNING_COMMON_HTLC_STATE_H
+#define LIGHTNING_COMMON_HTLC_STATE_H
 #include "config.h"

 enum htlc_state {
@@ -33,4 +33,4 @@ enum htlc_state {

 	HTLC_STATE_INVALID
 };
-#endif /* LIGHTNING_DAEMON_HTLC_STATE_H */
+#endif /* LIGHTNING_COMMON_HTLC_STATE_H */
--- a/common/htlc_tx.h
+++ b/common/htlc_tx.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_LIGHTNINGD_HTLC_TX_H
-#define LIGHTNING_LIGHTNINGD_HTLC_TX_H
+#ifndef LIGHTNING_COMMON_HTLC_TX_H
+#define LIGHTNING_COMMON_HTLC_TX_H
 #include "config.h"
 #include <common/htlc.h>

@@ -86,4 +86,4 @@ u8 *htlc_offered_wscript(const tal_t *ctx,
 			 const struct ripemd160 *ripemd,
 			 const struct keyset *keyset);

-#endif /* LIGHTNING_LIGHTNINGD_HTLC_TX_H */
+#endif /* LIGHTNING_COMMON_HTLC_TX_H */
--- a/common/htlc_wire.h
+++ b/common/htlc_wire.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_LIGHTNINGD_HTLC_WIRE_H
-#define LIGHTNING_LIGHTNINGD_HTLC_WIRE_H
+#ifndef LIGHTNING_COMMON_HTLC_WIRE_H
+#define LIGHTNING_COMMON_HTLC_WIRE_H
 #include "config.h"
 #include <bitcoin/preimage.h>
 #include <ccan/short_types/short_types.h>
@@ -57,4 +57,4 @@ enum side fromwire_side(const u8 **cursor, size_t *max);
 void fromwire_shachain(const u8 **cursor, size_t *max,
 		       struct shachain *shachain);
 void fromwire_bitcoin_tx(const u8 **cursor, size_t *max, struct bitcoin_tx *tx);
-#endif /* LIGHTNING_LIGHTNINGD_HTLC_WIRE_H */
+#endif /* LIGHTNING_COMMON_HTLC_WIRE_H */
--- a/common/json.h
+++ b/common/json.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_DAEMON_JSON_H
-#define LIGHTNING_DAEMON_JSON_H
+#ifndef LIGHTNING_COMMON_JSON_H
+#define LIGHTNING_COMMON_JSON_H
 #include "config.h"
 #include <bitcoin/pubkey.h>
 #include <ccan/tal/tal.h>
@@ -106,4 +106,4 @@ void json_add_hex(struct json_result *result, const char *fieldname,
 void json_add_object(struct json_result *result, ...);

 const char *json_result_string(const struct json_result *result);
-#endif /* LIGHTNING_DAEMON_JSON_H */
+#endif /* LIGHTNING_COMMON_JSON_H */
--- a/common/key_derive.h
+++ b/common/key_derive.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_LIGHTNINGD_KEY_DERIVE_H
-#define LIGHTNING_LIGHTNINGD_KEY_DERIVE_H
+#ifndef LIGHTNING_COMMON_KEY_DERIVE_H
+#define LIGHTNING_COMMON_KEY_DERIVE_H
 #include "config.h"
 #include <ccan/short_types/short_types.h>
 #include <stdbool.h>
@@ -33,4 +33,4 @@ bool derive_revocation_privkey(const struct secret *base_secret,
 struct ext_key;
 bool bip32_pubkey(const struct ext_key *bip32_base,
 		  struct pubkey *pubkey, u32 index);
-#endif /* LIGHTNING_LIGHTNINGD_KEY_DERIVE_H */
+#endif /* LIGHTNING_COMMON_KEY_DERIVE_H */
--- a/common/keyset.h
+++ b/common/keyset.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_LIGHTNINGD_KEYSET_H
-#define LIGHTNING_LIGHTNINGD_KEYSET_H
+#ifndef LIGHTNING_COMMON_KEYSET_H
+#define LIGHTNING_COMMON_KEYSET_H
 #include "config.h"
 #include <bitcoin/pubkey.h>
 #include <stdbool.h>
@@ -17,4 +17,4 @@ bool derive_keyset(const struct pubkey *per_commitment_point,
 		   const struct pubkey *self_delayed_basepoint,
 		   const struct pubkey *other_revocation_basepoint,
 		   struct keyset *keyset);
-#endif /* LIGHTNING_LIGHTNINGD_KEYSET_H */
+#endif /* LIGHTNING_COMMON_KEYSET_H */
--- a/common/msg_queue.h
+++ b/common/msg_queue.h
@@ -1,6 +1,6 @@
 /* Helper for simple message queues. */
-#ifndef LIGHTNING_LIGHTNINGD_MSG_QUEUE_H
-#define LIGHTNING_LIGHTNINGD_MSG_QUEUE_H
+#ifndef LIGHTNING_COMMON_MSG_QUEUE_H
+#define LIGHTNING_COMMON_MSG_QUEUE_H
 #include "config.h"
 #include <ccan/io/io.h>
 #include <ccan/short_types/short_types.h>
@@ -33,4 +33,4 @@ int msg_extract_fd(const u8 *msg);
 #define msg_queue_wait(conn, q, next, arg) \
 	io_out_wait((conn), (q), (next), (arg))

-#endif /* LIGHTNING_LIGHTNINGD_MSG_QUEUE_H */
+#endif /* LIGHTNING_COMMON_MSG_QUEUE_H */
--- a/common/overflows.h
+++ b/common/overflows.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_OVERFLOWS_H
-#define LIGHTNING_OVERFLOWS_H
+#ifndef LIGHTNING_COMMON_OVERFLOWS_H
+#define LIGHTNING_COMMON_OVERFLOWS_H
 #include "config.h"

 static inline bool add_overflows_size_t(uint64_t a, uint64_t b)
@@ -31,4 +31,4 @@ static inline bool mul_overflows_u64(uint64_t a, uint64_t b)
 	ret = a * b;
 	return (ret / a != b);
 }
-#endif /* LIGHTNING_OVERFLOWS_H */
+#endif /* LIGHTNING_COMMON_OVERFLOWS_H */
--- a/common/peer_failed.h
+++ b/common/peer_failed.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_LIGHTNINGD_PEER_FAILED_H
-#define LIGHTNING_LIGHTNINGD_PEER_FAILED_H
+#ifndef LIGHTNING_COMMON_PEER_FAILED_H
+#define LIGHTNING_COMMON_PEER_FAILED_H
 #include "config.h"
 #include <ccan/compiler/compiler.h>
 #include <ccan/short_types/short_types.h>
@@ -18,4 +18,4 @@ void peer_failed(int peer_fd, struct crypto_state *cs,
 		const struct channel_id *channel_id,
 		u16 error_code, const char *fmt, ...)
 	PRINTF_FMT(5,6) NORETURN;
-#endif /* LIGHTNING_STATUS_H */
+#endif /* LIGHTNING_COMMON_PEER_FAILED_H */
--- a/common/permute_tx.h
+++ b/common/permute_tx.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_PERMUTE_TX_H
-#define LIGHTNING_PERMUTE_TX_H
+#ifndef LIGHTNING_COMMON_PERMUTE_TX_H
+#define LIGHTNING_COMMON_PERMUTE_TX_H
 #include "config.h"
 #include "bitcoin/tx.h"

@@ -16,4 +16,4 @@ void permute_inputs(struct bitcoin_tx_input *inputs, size_t num_inputs,
 */
 void permute_outputs(struct bitcoin_tx_output *outputs, size_t num_outputs,
 		     const void **map);
-#endif /* LIGHTNING_PERMUTE_TX_H */
+#endif /* LIGHTNING_COMMON_PERMUTE_TX_H */
--- a/common/ping.h
+++ b/common/ping.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_LIGHTNINGD_PING_H
-#define LIGHTNING_LIGHTNINGD_PING_H
+#ifndef LIGHTNING_COMMON_PING_H
+#define LIGHTNING_COMMON_PING_H
 #include "config.h"
 #include <ccan/short_types/short_types.h>
 #include <ccan/tal/tal.h>
@@ -10,4 +10,4 @@ bool check_ping_make_pong(const tal_t *ctx, const u8 *ping, u8 **pong);
 /* Make a ping packet requesting num_pong_bytes */
 u8 *make_ping(const tal_t *ctx, u16 num_pong_bytes, u16 padlen);

-#endif /* LIGHTNING_LIGHTNINGD_PING_H */
+#endif /* LIGHTNING_COMMON_PING_H */
--- a/common/pseudorand.h
+++ b/common/pseudorand.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_DAEMON_PSEUDORAND_H
-#define LIGHTNING_DAEMON_PSEUDORAND_H
+#ifndef LIGHTNING_COMMON_PSEUDORAND_H
+#define LIGHTNING_COMMON_PSEUDORAND_H
 #include "config.h"
 #include <stdint.h>

@@ -13,4 +13,4 @@ uint64_t pseudorand(uint64_t max);
 */
 const struct siphash_seed *siphash_seed(void);

-#endif /* LIGHTNING_DAEMON_PSEUDORAND_H */
+#endif /* LIGHTNING_COMMON_PSEUDORAND_H */
--- a/common/sphinx.h
+++ b/common/sphinx.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_DAEMON_SPHINX_H
-#define LIGHTNING_DAEMON_SPHINX_H
+#ifndef LIGHTNING_COMMON_SPHINX_H
+#define LIGHTNING_COMMON_SPHINX_H

 #include "config.h"
 #include "bitcoin/privkey.h"
@@ -196,4 +196,4 @@ struct onionreply *unwrap_onionreply(const tal_t *ctx,
 				     const struct secret *shared_secrets,
 				     const int numhops, const u8 *reply);

-#endif /* LIGHTNING_DAEMON_SPHINX_H */
+#endif /* LIGHTNING_COMMON_SPHINX_H */
--- a/common/status.h
+++ b/common/status.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_LIGHTNINGD_STATUS_H
-#define LIGHTNING_LIGHTNINGD_STATUS_H
+#ifndef LIGHTNING_COMMON_STATUS_H
+#define LIGHTNING_COMMON_STATUS_H
 #include "config.h"
 #include <ccan/compiler/compiler.h>
 #include <ccan/short_types/short_types.h>
@@ -27,4 +27,4 @@ void status_trace(const char *fmt, ...) PRINTF_FMT(1,2);
 /* Send a failure status code with printf-style msg, and exit. */
 void status_failed(u16 code, const char *fmt, ...) PRINTF_FMT(2,3) NORETURN;

-#endif /* LIGHTNING_LIGHTNINGD_STATUS_H */
+#endif /* LIGHTNING_COMMON_STATUS_H */
--- a/common/timeout.h
+++ b/common/timeout.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_DAEMON_TIMEOUT_H
-#define LIGHTNING_DAEMON_TIMEOUT_H
+#ifndef LIGHTNING_COMMON_TIMEOUT_H
+#define LIGHTNING_COMMON_TIMEOUT_H
 #include "config.h"

 #include <ccan/tal/tal.h>
@@ -19,4 +19,4 @@ struct oneshot *new_reltimer_(struct timers *timers,

 void timer_expired(tal_t *ctx, struct timer *timer);

-#endif /* LIGHTNING_DAEMON_TIMEOUT_H */
+#endif /* LIGHTNING_COMMON_TIMEOUT_H */
--- a/common/type_to_string.h
+++ b/common/type_to_string.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_TYPE_TO_STRING_H
-#define LIGHTNING_TYPE_TO_STRING_H
+#ifndef LIGHTNING_COMMON_TYPE_TO_STRING_H
+#define LIGHTNING_COMMON_TYPE_TO_STRING_H
 #include "config.h"
 #include "utils.h"
 #include <ccan/autodata/autodata.h>
@@ -64,4 +64,4 @@ struct type_to_string {
 	char *(*fmt)(const tal_t *ctx, union printable_types u);
 };
 AUTODATA_TYPE(type_to_string, struct type_to_string);
-#endif /* LIGHTNING_UTILS_H */
+#endif /* LIGHTNING_COMMON_TYPE_TO_STRING_H */
--- a/common/utils.h
+++ b/common/utils.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_UTILS_H
-#define LIGHTNING_UTILS_H
+#ifndef LIGHTNING_COMMON_UTILS_H
+#define LIGHTNING_COMMON_UTILS_H
 #include "config.h"
 #include <ccan/short_types/short_types.h>
 #include <ccan/tal/tal.h>
@@ -20,4 +20,4 @@ u8 *tal_hexdata(const tal_t *ctx, const void *str, size_t len);
 	tal_alloc_((ctx), 0, false, false,				\
 		   __FILE__ ":" stringify(__LINE__) ":tal_tmpctx")

-#endif /* LIGHTNING_UTILS_H */
+#endif /* LIGHTNING_COMMON_UTILS_H */
--- a/common/utxo.h
+++ b/common/utxo.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_LIGHTNINGD_UTXO_H
-#define LIGHTNING_LIGHTNINGD_UTXO_H
+#ifndef LIGHTNING_COMMON_UTXO_H
+#define LIGHTNING_COMMON_UTXO_H
 #include "config.h"
 #include <bitcoin/shadouble.h>
 #include <ccan/short_types/short_types.h>
@@ -22,4 +22,4 @@ void fromwire_utxo(const u8 **ptr, size_t *max, struct utxo *utxo);
 * wants arr of structs */
 struct utxo *from_utxoptr_arr(const tal_t *ctx, const struct utxo **utxos);
 const struct utxo **to_utxoptr_arr(const tal_t *ctx, const struct utxo *utxos);
-#endif /* LIGHTNING_LIGHTNINGD_UTXO_H */
+#endif /* LIGHTNING_COMMON_UTXO_H */
--- a/common/version.h
+++ b/common/version.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_VERSION_H
-#define LIGHTNING_VERSION_H
+#ifndef LIGHTNING_COMMON_VERSION_H
+#define LIGHTNING_COMMON_VERSION_H
 #include "config.h"
 #include <ccan/opt/opt.h>

@@ -10,4 +10,4 @@ const char *version(void);
 	opt_register_early_noarg("--version|-V", version_and_exit, NULL, \
 				 "print version to standard output and exit")

-#endif /* LIGHTNING_VERSION_H */
+#endif /* LIGHTNING_COMMON_VERSION_H */
--- a/common/withdraw_tx.h
+++ b/common/withdraw_tx.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_LIGHTNINGD_WITHDRAW_TX_H
-#define LIGHTNING_LIGHTNINGD_WITHDRAW_TX_H
+#ifndef LIGHTNING_COMMON_WITHDRAW_TX_H
+#define LIGHTNING_COMMON_WITHDRAW_TX_H
 #include "config.h"
 #include <ccan/short_types/short_types.h>
 #include <ccan/tal/tal.h>
@@ -30,4 +30,4 @@ struct bitcoin_tx *withdraw_tx(const tal_t *ctx,
 			       const u64 changesat,
 			       const struct ext_key *bip32_base);

-#endif /* LIGHTNING_LIGHTNINGD_WITHDRAW_TX_H */
+#endif /* LIGHTNING_COMMON_WITHDRAW_TX_H */