Use expected LIGHTNING_DIR_FILE_H define

channeld/channeld_htlc.h

@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_LIGHTNINGD_CHANNEL_CHANNELD_HTLC_H
-#define LIGHTNING_LIGHTNINGD_CHANNEL_CHANNELD_HTLC_H
+#ifndef LIGHTNING_CHANNELD_CHANNELD_HTLC_H
+#define LIGHTNING_CHANNELD_CHANNELD_HTLC_H
 #include "config.h"
 #include <bitcoin/locktime.h>
 #include <ccan/short_types/short_types.h>
@@ -81,4 +81,4 @@ static inline bool htlc_is_dead(const struct htlc *htlc)
 	return htlc->state == RCVD_REMOVE_ACK_REVOCATION
 		|| htlc->state == SENT_REMOVE_ACK_REVOCATION;
 }
-#endif /* LIGHTNING_LIGHTNINGD_CHANNEL_CHANNELD_HTLC_H */
+#endif /* LIGHTNING_CHANNELD_CHANNELD_HTLC_H */

channeld/commit_tx.h

@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_LIGHTNINGD_CHANNEL_COMMIT_TX_H
-#define LIGHTNING_LIGHTNINGD_CHANNEL_COMMIT_TX_H
+#ifndef LIGHTNING_CHANNELD_COMMIT_TX_H
+#define LIGHTNING_CHANNELD_COMMIT_TX_H
 #include "config.h"
 #include <bitcoin/pubkey.h>
 #include <channeld/channeld_htlc.h>
@@ -57,4 +57,4 @@ struct bitcoin_tx *commit_tx(const tal_t *ctx,
 			     u64 obscured_commitment_number,
 			     enum side side);
 
-#endif /* LIGHTNING_LIGHTNINGD_CHANNEL_COMMIT_TX_H */
+#endif /* LIGHTNING_CHANNELD_COMMIT_TX_H */

channeld/full_channel.h

@@ -1,6 +1,6 @@
 /* This is the full channel routines, with HTLC support. */
-#ifndef LIGHTNING_LIGHTNINGD_CHANNEL_FULL_CHANNEL_H
-#define LIGHTNING_LIGHTNINGD_CHANNEL_FULL_CHANNEL_H
+#ifndef LIGHTNING_CHANNELD_FULL_CHANNEL_H
+#define LIGHTNING_CHANNELD_FULL_CHANNEL_H
 #include "config.h"
 #include <channeld/channeld_htlc.h>
 #include <channeld/full_channel_error.h>
@@ -250,4 +250,4 @@ void dump_htlcs(const struct channel *channel, const char *prefix);
 const char *channel_add_err_name(enum channel_add_err e);
 const char *channel_remove_err_name(enum channel_remove_err e);
 
-#endif /* LIGHTNING_LIGHTNINGD_CHANNEL_FULL_CHANNEL_H */
+#endif /* LIGHTNING_CHANNELD_FULL_CHANNEL_H */

common/bech32.h

@@ -22,8 +22,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef _SEGWIT_ADDR_H_
-#define _SEGWIT_ADDR_H_ 1
+#ifndef LIGHTNING_COMMON_BECH32_H
+#define LIGHTNING_COMMON_BECH32_H
 #include "config.h"
 
 #include <stdint.h>
@@ -119,4 +119,4 @@ int bech32_convert_bits(uint8_t* out, size_t* outlen, int outbits,
 extern const char bech32_charset[32];
 extern const int8_t bech32_charset_rev[128];
 
-#endif /* LIGHTNING_LIGHTNINGD_BECH32_H */
+#endif /* LIGHTNING_COMMON_BECH32_H */

common/bolt11.h

@@ -105,4 +105,4 @@ char *bolt11_encode_(const tal_t *ctx,
  */
 struct bolt11 *bolt11_out_check(const struct bolt11 *bolt11,
 				const char *abortstr);
-#endif /* LIGHTNING_LIGHTNINGD_BOLT11_H */
+#endif /* LIGHTNING_COMMON_BOLT11_H */

common/close_tx.h

@@ -16,4 +16,4 @@ struct bitcoin_tx *create_close_tx(const tal_t *ctx,
 				   u64 anchor_satoshis,
 				   uint64_t to_us, uint64_t to_them,
 				   uint64_t dust_limit);
-#endif
+#endif /* LIGHTNING_COMMON_CLOSE_TX_H */

gossipd/broadcast.h

@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_LIGHTNINGD_GOSSIP_BROADCAST_H
-#define LIGHTNING_LIGHTNINGD_GOSSIP_BROADCAST_H
+#ifndef LIGHTNING_GOSSIPD_BROADCAST_H
+#define LIGHTNING_GOSSIPD_BROADCAST_H
 #include "config.h"
 
 #include <ccan/intmap/intmap.h>
@@ -29,4 +29,4 @@ bool replace_broadcast(const tal_t *ctx,
 const u8 *next_broadcast(struct broadcast_state *bstate, u64 *last_index);
 
 const u8 *get_broadcast(struct broadcast_state *bstate, u64 msgidx);
-#endif /* LIGHTNING_LIGHTNINGD_GOSSIP_BROADCAST_H */
+#endif /* LIGHTNING_GOSSIPD_BROADCAST_H */

gossipd/handshake.h

@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_LIGHTNINGD_GOSSIP_HANDSHAKE_H
-#define LIGHTNING_LIGHTNINGD_GOSSIP_HANDSHAKE_H
+#ifndef LIGHTNING_GOSSIPD_HANDSHAKE_H
+#define LIGHTNING_GOSSIPD_HANDSHAKE_H
 #include "config.h"
 #include <ccan/typesafe_cb/typesafe_cb.h>
 
@@ -51,4 +51,4 @@ struct io_plan *responder_handshake_(struct io_conn *conn,
 							   void *cbarg),
 				     void *cbarg);
 
-#endif /* LIGHTNING_LIGHTNINGD_GOSSIP_HANDSHAKE_H */
+#endif /* LIGHTNING_GOSSIPD_HANDSHAKE_H */

gossipd/routing.h

@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_LIGHTNINGD_GOSSIP_ROUTING_H
-#define LIGHTNING_LIGHTNINGD_GOSSIP_ROUTING_H
+#ifndef LIGHTNING_GOSSIPD_ROUTING_H
+#define LIGHTNING_GOSSIPD_ROUTING_H
 #include "config.h"
 #include <bitcoin/pubkey.h>
 #include <ccan/crypto/siphash24/siphash24.h>
@@ -253,4 +253,4 @@ void route_prune(struct routing_state *rstate);
  * the direction bit the matching channel should get */
 #define get_channel_direction(from, to) (pubkey_cmp(from, to) > 0)
 
-#endif /* LIGHTNING_LIGHTNINGD_GOSSIP_ROUTING_H */
+#endif /* LIGHTNING_GOSSIPD_ROUTING_H */

hsmd/client.h

@@ -1,6 +1,6 @@
 /* API to ask the HSM for things. */
-#ifndef LIGHTNING_LIGHTNINGD_HSM_CLIENT_H
-#define LIGHTNING_LIGHTNINGD_HSM_CLIENT_H
+#ifndef LIGHTNING_HSMD_CLIENT_H
+#define LIGHTNING_HSMD_CLIENT_H
 #include "config.h"
 #include <ccan/endian/endian.h>
 #include <ccan/short_types/short_types.h>
@@ -14,4 +14,4 @@ void hsm_setup(int fd);
 
 /* Do ECDH using this node id secret. */
 bool hsm_do_ecdh(struct secret *ss, const struct pubkey *point);
-#endif /* LIGHTNING_LIGHTNINGD_HSM_CLIENT_H */
+#endif /* LIGHTNING_HSMD_CLIENT_H */

lightningd/json.h

@@ -55,4 +55,4 @@ void json_add_address(struct json_result *response, const char *fieldname,
 		      const struct wireaddr *addr);
 
 
-#endif /* !defined (LIGHTNING_LIGHTNINGD_JSON_H) */
+#endif /* LIGHTNING_LIGHTNINGD_JSON_H */

lightningd/jsonrpc_errors.h

@@ -23,4 +23,4 @@
 #define PAY_UNSPECIFIED_ERROR		209
 #define PAY_STOPPED_RETRYING		210
 
-#endif /* !defined (LIGHTNING_LIGHTNINGD_JSONRPC_ERRORS_H) */
+#endif /* LIGHTNING_LIGHTNINGD_JSONRPC_ERRORS_H */

onchaind/onchain_types.h

@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_LIGHTNINGD_ONCHAIN_ONCHAIN_TYPES_H
-#define LIGHTNING_LIGHTNINGD_ONCHAIN_ONCHAIN_TYPES_H
+#ifndef LIGHTNING_ONCHAIND_ONCHAIN_TYPES_H
+#define LIGHTNING_ONCHAIND_ONCHAIN_TYPES_H
 #include "config.h"
 
 /* Different transactions we care about. */
@@ -64,4 +64,4 @@ enum output_type {
 };
 
 
-#endif /* LIGHTNING_LIGHTNINGD_ONCHAIN_ONCHAIN_TYPES_H */
+#endif /* LIGHTNING_ONCHAIND_ONCHAIN_TYPES_H */

onchaind/onchain_wire.h

@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_LIGHTNINGD_ONCHAIN_ONCHAIN_WIRE_H
-#define LIGHTNING_LIGHTNINGD_ONCHAIN_ONCHAIN_WIRE_H
+#ifndef LIGHTNING_ONCHAIND_ONCHAIN_WIRE_H
+#define LIGHTNING_ONCHAIND_ONCHAIN_WIRE_H
 #include "config.h"
 #include <ccan/short_types/short_types.h>
 #include <ccan/tal/tal.h>
@@ -15,4 +15,4 @@ struct htlc_stub {
 void towire_htlc_stub(u8 **pptr, const struct htlc_stub *htlc_stub);
 void fromwire_htlc_stub(const u8 **cursor, size_t *max,
 			struct htlc_stub *htlc_stub);
-#endif /* LIGHTNING_LIGHTNINGD_ONCHAIN_ONCHAIN_WIRE_H */
+#endif /* LIGHTNING_ONCHAIND_ONCHAIN_WIRE_H */

wallet/db.h

@@ -1,5 +1,5 @@
-#ifndef WALLET_DB_H
-#define WALLET_DB_H
+#ifndef LIGHTNING_WALLET_DB_H
+#define LIGHTNING_WALLET_DB_H
 #include "config.h"
 
 #include <bitcoin/preimage.h>
@@ -156,4 +156,4 @@ bool sqlite3_column_sha256_double(sqlite3_stmt *stmt, int col,  struct sha256_do
 bool sqlite3_bind_sha256_double(sqlite3_stmt *stmt, int col, const struct sha256_double *p);
 struct secret *sqlite3_column_secrets(const tal_t *ctx,
 				      sqlite3_stmt *stmt, int col);
-#endif /* WALLET_DB_H */
+#endif /* LIGHTNING_WALLET_DB_H */

wallet/test/test_utils.h

@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_WALLET_TEST_UTILS_H
-#define LIGHTNING_WALLET_TEST_UTILS_H
+#ifndef LIGHTNING_WALLET_TEST_TEST_UTILS_H
+#define LIGHTNING_WALLET_TEST_TEST_UTILS_H
 
 /* Definitions "inspired" by libsecp256k1 */
 #define TEST_FAILURE(msg) do { \
@@ -21,4 +21,4 @@
 
 #define CHECK(cond) CHECK_MSG(cond,"test condition failed");
 
-#endif /* LIGHTNING_WALLET_TEST_UTILS_H */
+#endif /* LIGHTNING_WALLET_TEST_TEST_UTILS_H */

wallet/txfilter.h

@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_LIGHTNINGD_TXFILTER_H
-#define LIGHTNING_LIGHTNINGD_TXFILTER_H
+#ifndef LIGHTNING_WALLET_TXFILTER_H
+#define LIGHTNING_WALLET_TXFILTER_H
 #include "config.h"
 #include <bitcoin/pubkey.h>
 #include <bitcoin/tx.h>
@@ -61,4 +61,4 @@ bool outpointfilter_matches(struct outpointfilter *of,
 void outpointfilter_remove(struct outpointfilter *of,
 			   const struct bitcoin_txid *txid, const u32 outnum);
 
-#endif /* LIGHTNING_LIGHTNINGD_TXFILTER_H */
+#endif /* LIGHTNING_WALLET_TXFILTER_H */

wallet/wallet.h

@@ -1,5 +1,5 @@
-#ifndef WALLET_WALLET_H
-#define WALLET_WALLET_H
+#ifndef LIGHTNING_WALLET_WALLET_H
+#define LIGHTNING_WALLET_WALLET_H
 
 #include "config.h"
 #include "db.h"
@@ -792,4 +792,4 @@ void wallet_utxoset_add(struct wallet *w, const struct bitcoin_tx *tx,
 			const u32 outnum, const u32 blockheight,
 			const u32 txindex, const u8 *scriptpubkey,
 			const u64 satoshis);
-#endif /* WALLET_WALLET_H */
+#endif /* LIGHTNING_WALLET_WALLET_H */

wallet/walletrpc.h

@@ -1,5 +1,5 @@
-#ifndef WALLET_WALLETRPC_H
-#define WALLET_WALLETRPC_H
+#ifndef LIGHTNING_WALLET_WALLETRPC_H
+#define LIGHTNING_WALLET_WALLETRPC_H
 
 #include "config.h"
 
@@ -8,4 +8,4 @@
  * handlers are registered using AUTODATA.
  */
 
-#endif /* WALLET_WALLETRPC_H */
+#endif /* LIGHTNING_WALLET_WALLETRPC_H */