[hipl-commit] [trunk] Rev 3660: Unified all header file declarations with sed and scripting.

  • From: Miika Komu <miika@xxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Wed, 17 Feb 2010 15:08:44 +0200

Committer: Miika Komu <miika@xxxxxx>
Date: Wed Feb 17 15:08:39 2010 +0200
Revision: 3660
Revision-id: miika@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk

Log:
  Unified all header file declarations with sed and scripting.

Modified:
  M  agent/agent.h
  M  agent/connhipd.h
  M  agent/gui_interface.h
  M  agent/hitdb.h
  M  agent/lang_english.h
  M  agent/lang_finnish.h
  M  agent/language.h
  M  agent/str_var.h
  M  agent/tools.h
  M  firewall/cache.h
  M  firewall/cache_port.h
  M  firewall/common_hipd_msg.h
  M  firewall/common_types.h
  M  firewall/conntrack.h
  M  firewall/datapkt.h
  M  firewall/dlist.h
  M  firewall/esp_prot_api.h
  M  firewall/esp_prot_config.h
  M  firewall/esp_prot_conntrack.h
  M  firewall/esp_prot_defines.h
  M  firewall/esp_prot_fw_msg.h
  M  firewall/firewall.h
  M  firewall/firewall_control.h
  M  firewall/firewall_defines.h
  M  firewall/firewalldb.h
  M  firewall/helpers.h
  M  firewall/hslist.h
  M  firewall/lsi.h
  M  firewall/midauth.h
  M  firewall/opptcp.h
  M  firewall/pisa.h
  M  firewall/pisa_cert.h
  M  firewall/proxy.h
  M  firewall/proxyconndb.h
  M  firewall/proxydb.h
  M  firewall/rule_management.h
  M  firewall/sava_api.h
  M  firewall/savah_gateway.h
  M  firewall/sysopp.h
  M  firewall/user_ipsec_api.h
  M  firewall/user_ipsec_esp.h
  M  firewall/user_ipsec_fw_msg.h
  M  firewall/user_ipsec_sadb.h
  M  hipd/accessor.h
  M  hipd/blind.h
  M  hipd/bos.h
  M  hipd/cert.h
  M  hipd/close.h
  M  hipd/configfilereader.h
  M  hipd/cookie.h
  M  hipd/dh.h
  M  hipd/dht.h
  M  hipd/dhtqueue.h
  M  hipd/esp_prot_anchordb.h
  M  hipd/esp_prot_hipd_msg.h
  M  hipd/esp_prot_light_update.h
  M  hipd/hadb.h
  M  hipd/hadb_legacy.h
  M  hipd/heartbeat.h
  M  hipd/hi3.h
  M  hipd/hidb.h
  M  hipd/hipd.h
  M  hipd/hiprelay.h
  M  hipd/hit_to_ip.h
  M  hipd/icookie.h
  M  hipd/init.h
  M  hipd/input.h
  M  hipd/keymat.h
  M  hipd/maintenance.h
  M  hipd/nat.h
  M  hipd/netdev.h
  M  hipd/nsupdate.h
  M  hipd/oppdb.h
  M  hipd/oppipdb.h
  M  hipd/output.h
  M  hipd/pfkeyapi.h
  M  hipd/pisa.h
  M  hipd/registration.h
  M  hipd/tcptimeout.h
  M  hipd/update.h
  M  hipd/update_legacy.h
  M  hipd/user.h
  M  hipd/user_ipsec_hipd_msg.h
  M  hipd/user_ipsec_sadb_api.h
  M  hipsock/af_hip.h
  M  hipsock/debug.h
  M  hipsock/eid_db.h
  M  hipsock/usercompat.h
  M  lib/conf/hipconf.h
  M  lib/core/builder.h
  M  lib/core/certtools.h
  M  lib/core/common_defines.h
  M  lib/core/crypto.h
  M  lib/core/debug.h
  M  lib/core/esp_prot_common.h
  M  lib/core/getendpointinfo.h
  M  lib/core/hashchain.h
  M  lib/core/hashchain_store.h
  M  lib/core/hashtable.h
  M  lib/core/hashtree.h
  M  lib/core/hip_capability.h
  M  lib/core/hip_statistics.h
  M  lib/core/icomm.h
  M  lib/core/ife.h
  M  lib/core/kerncompat.h
  M  lib/core/linkedlist.h
  M  lib/core/list.h
  M  lib/core/message.h
  M  lib/core/misc.h
  M  lib/core/protodefs.h
  M  lib/core/sqlitedbapi.h
  M  lib/core/state.h
  M  lib/core/utils.h
  M  lib/dht/libhipdht.h
  M  lib/dht/libhipdhtxml.h
  M  lib/gui/create.h
  M  lib/gui/dragndrop.h
  M  lib/gui/events.h
  M  lib/gui/hipgui.h
  M  lib/gui/tools.h
  M  lib/gui/widgets.h
  M  lib/ipsec/libpfkey.h
  M  lib/opphip/wrap_db.h
  M  lib/performance/performance.h
  M  lib/tool/lutil.h
  M  lib/tool/nlink.h
  M  lib/tool/pk.h
  M  lib/tool/xfrmapi.h
  M  test/conntest.h
  M  test/first_test.h
  M  test/hipsetup.h
  M  test/misc_install.h

=== modified file 'agent/agent.h'
--- agent/agent.h       2010-02-10 20:46:32 +0000
+++ agent/agent.h       2010-02-17 13:08:39 +0000
@@ -5,8 +5,8 @@
  *  Authors: Antti Partanen <aehparta@xxxxxxxxx>
  */
 
-#ifndef AGENT_H
-#define AGENT_H
+#ifndef HIP_AGENT_AGENT_H
+#define HIP_AGENT_AGENT_H
 
 
 
/******************************************************************************/

=== modified file 'agent/connhipd.h'
--- agent/connhipd.h    2010-02-10 20:46:32 +0000
+++ agent/connhipd.h    2010-02-17 13:08:39 +0000
@@ -5,8 +5,8 @@
  *  Authors: Antti Partanen <aehparta@xxxxxxxxx>
  */
 
-#ifndef CONNHIPD_H
-#define CONNHIPD_H
+#ifndef HIP_AGENT_CONNHIPD_H
+#define HIP_AGENT_CONNHIPD_H
 
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
@@ -24,4 +24,4 @@
 #endif /* __cplusplus */
 
 
-#endif /*CONNHIPD_H */
+#endif /*HIP_AGENT_CONNHIPD_H */

=== modified file 'agent/gui_interface.h'
--- agent/gui_interface.h       2010-02-10 20:46:32 +0000
+++ agent/gui_interface.h       2010-02-17 13:08:39 +0000
@@ -5,8 +5,8 @@
  *  Authors: Antti Partanen <aehparta@xxxxxxxxx>
  */
 
-#ifndef GUI_INTERFACE_H
-#define GUI_INTERFACE_H
+#ifndef HIP_AGENT_GUI_INTERFACE_H
+#define HIP_AGENT_GUI_INTERFACE_H
 
 #include "hitdb.h"
 
@@ -23,4 +23,4 @@
 }
 #endif
 
-#endif /* GUI_INTERFACE_H */
+#endif /* HIP_AGENT_GUI_INTERFACE_H */

=== modified file 'agent/hitdb.h'
--- agent/hitdb.h       2010-02-10 20:46:32 +0000
+++ agent/hitdb.h       2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIT_DB_H
-#define HIT_DB_H
+#ifndef HIP_AGENT_HITDB_H
+#define HIP_AGENT_HITDB_H
 
 #include <netinet/in.h>
 #include <string.h>
@@ -122,4 +122,4 @@
 }
 #endif
 
-#endif /* HIT_DB_H */
+#endif /* HIP_AGENT_HITDB_H */

=== modified file 'agent/lang_english.h'
--- agent/lang_english.h        2010-02-10 20:46:32 +0000
+++ agent/lang_english.h        2010-02-17 13:08:39 +0000
@@ -7,8 +7,8 @@
  *  Authors: Antti Partanen <aehparta@xxxxxxxxx>
  */
 
-#ifndef LANG_ENGLISH_H
-#define LANG_ENGLISH_H
+#ifndef HIP_AGENT_LANG_ENGLISH_H
+#define HIP_AGENT_LANG_ENGLISH_H
 
 #include <stdio.h>
 
@@ -169,4 +169,4 @@
 };
 
 
-#endif /* LANG_ENGLISH_H */
+#endif /* HIP_AGENT_LANG_ENGLISH_H */

=== modified file 'agent/lang_finnish.h'
--- agent/lang_finnish.h        2010-02-10 20:46:32 +0000
+++ agent/lang_finnish.h        2010-02-17 13:08:39 +0000
@@ -7,8 +7,8 @@
  *  Authors: Antti Partanen <aehparta@xxxxxxxxx>
  */
 
-#ifndef LANG_FINNISH_H
-#define LANG_FINNISH_H
+#ifndef HIP_AGENT_LANG_FINNISH_H
+#define HIP_AGENT_LANG_FINNISH_H
 
 #include <stdio.h>
 
@@ -169,4 +169,4 @@
 };
 
 
-#endif /* LANG_FINNISH_H */
+#endif /* HIP_AGENT_LANG_FINNISH_H */

=== modified file 'agent/language.h'
--- agent/language.h    2010-02-10 20:46:32 +0000
+++ agent/language.h    2010-02-17 13:08:39 +0000
@@ -4,10 +4,10 @@
  *  License: GNU/GPL
  *  Authors: Antti Partanen <aehparta@xxxxxxxxx>
  */
-#ifndef LANGUAGE_H
-#define LANGUAGE_H
+#ifndef HIP_AGENT_LANGUAGE_H
+#define HIP_AGENT_LANGUAGE_H
 
 int lang_init(const char *, const char *);
 char *lang_get(const char *);
 
-#endif /* LANGUAGE_H */
+#endif /* HIP_AGENT_LANGUAGE_H */

=== modified file 'agent/str_var.h'
--- agent/str_var.h     2010-02-17 10:57:25 +0000
+++ agent/str_var.h     2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef STR_VAR_H
-#define STR_VAR_H
+#ifndef HIP_AGENT_STR_VAR_H
+#define HIP_AGENT_STR_VAR_H
 /*
  *  HIP Agent
  *
@@ -32,4 +32,4 @@
 int str_var_valid(const char *);
 int str_var_empty(const char *);
 
-#endif /* STR_VAR_H */
+#endif /* HIP_AGENT_STR_VAR_H */

=== modified file 'agent/tools.h'
--- agent/tools.h       2010-02-10 20:46:32 +0000
+++ agent/tools.h       2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef AGENT_TOOLS_H
-#define AGENT_TOOLS_H
+#ifndef HIP_AGENT_TOOLS_H
+#define HIP_AGENT_TOOLS_H
 /*
  *  HIP Agent
  *

=== modified file 'firewall/cache.h'
--- firewall/cache.h    2010-02-10 23:02:52 +0000
+++ firewall/cache.h    2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_CACHE_H
-#define HIP_CACHE_H
+#ifndef HIP_FIREWALL_CACHE_H
+#define HIP_FIREWALL_CACHE_H
 
 #include "lib/core/icomm.h"
 
@@ -20,4 +20,4 @@
 
 
 
-#endif /* HIP_CACHE_H */
+#endif /* HIP_FIREWALL_CACHE_H */

=== modified file 'firewall/cache_port.h'
--- firewall/cache_port.h       2010-02-10 23:02:52 +0000
+++ firewall/cache_port.h       2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_CACHE_PORT_H
-#define HIP_CACHE_PORT_H
+#ifndef HIP_FIREWALL_CACHE_PORT_H
+#define HIP_FIREWALL_CACHE_PORT_H
 
 #include "lib/core/icomm.h"
 

=== modified file 'firewall/common_hipd_msg.h'
--- firewall/common_hipd_msg.h  2010-02-10 23:02:52 +0000
+++ firewall/common_hipd_msg.h  2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef COMMON_HIPD_MSG_H_
-#define COMMON_HIPD_MSG_H_
+#ifndef HIP_FIREWALL_COMMON_HIPD_MSG_H
+#define HIP_FIREWALL_COMMON_HIPD_MSG_H
 
 #include "lib/core/protodefs.h"
 
@@ -10,4 +10,4 @@
                                hip_lsi_t *src_lsi,
                                hip_lsi_t *dst_lsi);
 
-#endif /* COMMON_HIPD_MSG_H_ */
+#endif /* HIP_FIREWALL_COMMON_HIPD_MSG_H */

=== modified file 'firewall/common_types.h'
--- firewall/common_types.h     2010-02-10 23:02:52 +0000
+++ firewall/common_types.h     2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef TYPES_H_
-#define TYPES_H_
+#ifndef HIP_FIREWALL_COMMON_TYPES_H
+#define HIP_FIREWALL_COMMON_TYPES_H
 
 typedef struct _SList SList;
 struct _SList {
@@ -21,4 +21,4 @@
     long tv_usec;
 };
 
-#endif /*TYPES_H_*/
+#endif /*HIP_FIREWALL_COMMON_TYPES_H*/

=== modified file 'firewall/conntrack.h'
--- firewall/conntrack.h        2010-02-10 23:02:52 +0000
+++ firewall/conntrack.h        2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef CONNTRACK_H
-#define CONNTRACK_H
+#ifndef HIP_FIREWALL_CONNTRACK_H
+#define HIP_FIREWALL_CONNTRACK_H
 
 #include <netinet/in.h>
 #include <netinet/ip.h>

=== modified file 'firewall/datapkt.h'
--- firewall/datapkt.h  2010-02-10 23:02:52 +0000
+++ firewall/datapkt.h  2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_DATAPKT_H
-#define HIP_DATAPKT_H
+#ifndef HIP_FIREWALL_DATAPKT_H
+#define HIP_FIREWALL_DATAPKT_H
 
 #include "firewall_defines.h"
 
@@ -9,4 +9,4 @@
 int hip_fw_userspace_datapacket_output(const hip_fw_context_t *ctx);
 int hip_handle_data_signature(struct hip_common *common);
 
-#endif /* HIP_DATAPKT_H */
+#endif /* HIP_FIREWALL_DATAPKT_H */

=== modified file 'firewall/dlist.h'
--- firewall/dlist.h    2010-02-10 23:02:52 +0000
+++ firewall/dlist.h    2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef LIST_H_
-#define LIST_H_
+#ifndef HIP_FIREWALL_DLIST_H
+#define HIP_FIREWALL_DLIST_H
 
 #include <stdlib.h>
 #include "common_types.h"
@@ -33,4 +33,4 @@
 
 unsigned int list_length(DList *list);
 
-#endif /*LIST_H_*/
+#endif /*HIP_FIREWALL_DLIST_H*/

=== modified file 'firewall/esp_prot_api.h'
--- firewall/esp_prot_api.h     2010-02-10 23:02:52 +0000
+++ firewall/esp_prot_api.h     2010-02-17 13:08:39 +0000
@@ -13,8 +13,8 @@
  *
  */
 
-#ifndef ESP_PROT_API_H_
-#define ESP_PROT_API_H_
+#ifndef HIP_FIREWALL_ESP_PROT_API_H
+#define HIP_FIREWALL_ESP_PROT_API_H
 
 #include "user_ipsec_sadb.h"
 
@@ -87,4 +87,4 @@
 int esp_prot_get_data_offset(const hip_sa_entry_t *entry);
 int esp_prot_sadb_maintenance(hip_sa_entry_t *entry);
 
-#endif /*ESP_PROT_API_H_*/
+#endif /*HIP_FIREWALL_ESP_PROT_API_H*/

=== modified file 'firewall/esp_prot_config.h'
--- firewall/esp_prot_config.h  2010-02-10 23:02:52 +0000
+++ firewall/esp_prot_config.h  2010-02-17 13:08:39 +0000
@@ -13,8 +13,8 @@
  *
  */
 
-#ifndef ESP_PROT_CONFIG_H_
-#define ESP_PROT_CONFIG_H_
+#ifndef HIP_FIREWALL_ESP_PROT_CONFIG_H
+#define HIP_FIREWALL_ESP_PROT_CONFIG_H
 
 #ifdef HAVE_CONFIG_H
   #include "config.h"
@@ -35,4 +35,4 @@
 int esp_prot_sender_config(const config_t *cfg);
 int esp_prot_verifier_config(const config_t *cfg);
 
-#endif /* ESP_PROT_CONFIG_H_ */
+#endif /* HIP_FIREWALL_ESP_PROT_CONFIG_H */

=== modified file 'firewall/esp_prot_conntrack.h'
--- firewall/esp_prot_conntrack.h       2010-02-10 23:02:52 +0000
+++ firewall/esp_prot_conntrack.h       2010-02-17 13:08:39 +0000
@@ -11,8 +11,8 @@
  *
  */
 
-#ifndef ESP_PROT_CONNTRACK_H_
-#define ESP_PROT_CONNTRACK_H_
+#ifndef HIP_FIREWALL_ESP_PROT_CONNTRACK_H
+#define HIP_FIREWALL_ESP_PROT_CONNTRACK_H
 
 #include "lib/core/protodefs.h"
 #include "conntrack.h"
@@ -44,4 +44,4 @@
 int esp_prot_conntrack_verify(const hip_fw_context_t *ctx,
                               struct esp_tuple *esp_tuple);
 
-#endif /* ESP_PROT_CONNTRACK_H_ */
+#endif /* HIP_FIREWALL_ESP_PROT_CONNTRACK_H */

=== modified file 'firewall/esp_prot_defines.h'
--- firewall/esp_prot_defines.h 2010-02-10 23:02:52 +0000
+++ firewall/esp_prot_defines.h 2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef ESP_PROT_DEFINES_H_
-#define ESP_PROT_DEFINES_H_
+#ifndef HIP_FIREWALL_ESP_PROT_DEFINES_H
+#define HIP_FIREWALL_ESP_PROT_DEFINES_H
 
 #include "lib/core/hashchain.h"
 
@@ -27,4 +27,4 @@
 
 typedef struct esp_cumulative_item esp_cumulative_item_t;
 
-#endif /* ESP_PROT_DEFINES_H_ */
+#endif /* HIP_FIREWALL_ESP_PROT_DEFINES_H */

=== modified file 'firewall/esp_prot_fw_msg.h'
--- firewall/esp_prot_fw_msg.h  2010-02-10 23:02:52 +0000
+++ firewall/esp_prot_fw_msg.h  2010-02-17 13:08:39 +0000
@@ -11,8 +11,8 @@
  *
  */
 
-#ifndef ESP_PROT_FW_MSG_H_
-#define ESP_PROT_FW_MSG_H_
+#ifndef HIP_FIREWALL_ESP_PROT_FW_MSG_H
+#define HIP_FIREWALL_ESP_PROT_FW_MSG_H
 
 #include "lib/core/hashchain_store.h"
 #include "user_ipsec_sadb.h"
@@ -34,4 +34,4 @@
                        unsigned char (*esp_prot_anchors)[MAX_HASH_LENGTH],
                        uint32_t *hash_item_length);
 
-#endif /* ESP_PROT_FW_MSG_H_ */
+#endif /* HIP_FIREWALL_ESP_PROT_FW_MSG_H */

=== modified file 'firewall/firewall.h'
--- firewall/firewall.h 2010-02-10 23:02:52 +0000
+++ firewall/firewall.h 2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_FIREWALL_H
-#define HIP_FIREWALL_H
+#ifndef HIP_FIREWALL_FIREWALL_H
+#define HIP_FIREWALL_FIREWALL_H
 
 #ifdef HAVE_CONFIG_H
   #include "config.h"

=== modified file 'firewall/firewall_control.h'
--- firewall/firewall_control.h 2010-02-10 23:02:52 +0000
+++ firewall/firewall_control.h 2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef FIREWALL_CONTROL_H_
-#define FIREWALL_CONTROL_H_
+#ifndef HIP_FIREWALL_FIREWALL_CONTROL_H
+#define HIP_FIREWALL_FIREWALL_CONTROL_H
 
 #ifdef HAVE_CONFIG_H
   #include "config.h"
@@ -15,4 +15,4 @@
 int handle_sava_i2_state_update(struct hip_common *msg, int hip_lsi_support);
 #endif
 
-#endif /*FIREWALL_CONTROL_H_*/
+#endif /*HIP_FIREWALL_FIREWALL_CONTROL_H*/

=== modified file 'firewall/firewall_defines.h'
--- firewall/firewall_defines.h 2010-02-10 23:02:52 +0000
+++ firewall/firewall_defines.h 2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef FIREWALL_DEFINES_H_
-#define FIREWALL_DEFINES_H_
+#ifndef HIP_FIREWALL_FIREWALL_DEFINES_H
+#define HIP_FIREWALL_FIREWALL_DEFINES_H
 
 #include <sys/time.h>
 #include <libipq.h>
@@ -198,4 +198,4 @@
     return chksum;
 }
 
-#endif /*FIREWALL_DEFINES_H_*/
+#endif /*HIP_FIREWALL_FIREWALL_DEFINES_H*/

=== modified file 'firewall/firewalldb.h'
--- firewall/firewalldb.h       2010-02-10 23:02:52 +0000
+++ firewall/firewalldb.h       2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_FIREWALLDB_H
-#define HIP_FIREWALLDB_H
+#ifndef HIP_FIREWALL_FIREWALLDB_H
+#define HIP_FIREWALL_FIREWALLDB_H
 
 #include <netinet/ip_icmp.h>
 #include "lib/core/icomm.h"
@@ -25,4 +25,4 @@
                               const struct in6_addr *dst_hit,
                               u8 *msg, u16 len, int proto, int ttl);
 
-#endif /* HIP_FIREWALLDB_H */
+#endif /* HIP_FIREWALL_FIREWALLDB_H */

=== modified file 'firewall/helpers.h'
--- firewall/helpers.h  2010-02-10 23:02:52 +0000
+++ firewall/helpers.h  2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HELPERS_H
-#define HELPERS_H
+#ifndef HIP_FIREWALL_HELPERS_H
+#define HIP_FIREWALL_HELPERS_H
 
 #include <netinet/in.h>
 

=== modified file 'firewall/hslist.h'
--- firewall/hslist.h   2010-02-10 23:02:52 +0000
+++ firewall/hslist.h   2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef SLIST_H_
-#define SLIST_H_
+#ifndef HIP_FIREWALL_HSLIST_H
+#define HIP_FIREWALL_HSLIST_H
 
 #include <stdlib.h>
 #include "common_types.h"
@@ -19,4 +19,4 @@
 
 SList *slist_last(SList *list);
 
-#endif /*SLIST_H_*/
+#endif /*HIP_FIREWALL_HSLIST_H*/

=== modified file 'firewall/lsi.h'
--- firewall/lsi.h      2010-02-10 23:02:52 +0000
+++ firewall/lsi.h      2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_LSI_H
-#define HIP_LSI_H
+#ifndef HIP_FIREWALL_LSI_H
+#define HIP_FIREWALL_LSI_H
 
 #include <libipq.h>
 #include <netinet/ip_icmp.h>

=== modified file 'firewall/midauth.h'
--- firewall/midauth.h  2010-02-10 23:02:52 +0000
+++ firewall/midauth.h  2010-02-17 13:08:39 +0000
@@ -3,8 +3,8 @@
  *
  * @author Thomas Jansen
  */
-#ifndef HIP_MIDAUTH_H
-#define HIP_MIDAUTH_H
+#ifndef HIP_FIREWALL_MIDAUTH_H
+#define HIP_FIREWALL_MIDAUTH_H
 
 #include <netinet/ip6.h>
 #include <netinet/ip.h>

=== modified file 'firewall/opptcp.h'
--- firewall/opptcp.h   2010-02-10 23:02:52 +0000
+++ firewall/opptcp.h   2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_OPPTCP
-#define HIP_OPPTCP
+#ifndef HIP_FIREWALL_OPPTCP_H
+#define HIP_FIREWALL_OPPTCP_H
 
 int hip_fw_examine_incoming_tcp_packet(void *hdr, int ip_version,
                                        int header_size);

=== modified file 'firewall/pisa.h'
--- firewall/pisa.h     2010-02-10 23:02:52 +0000
+++ firewall/pisa.h     2010-02-17 13:08:39 +0000
@@ -3,8 +3,8 @@
  *
  * @author Thomas Jansen
  */
-#ifndef HIP_PISA_H
-#define HIP_PISA_H
+#ifndef HIP_FIREWALL_PISA_H
+#define HIP_FIREWALL_PISA_H
 
 #include "midauth.h"
 

=== modified file 'firewall/pisa_cert.h'
--- firewall/pisa_cert.h        2010-02-10 23:02:52 +0000
+++ firewall/pisa_cert.h        2010-02-17 13:08:39 +0000
@@ -3,8 +3,8 @@
  *
  * @author Thomas Jansen
  */
-#ifndef HIP_PISA_CERT_H
-#define HIP_PISA_CERT_H
+#ifndef HIP_FIREWALL_PISA_CERT_H
+#define HIP_FIREWALL_PISA_CERT_H
 
 #include <time.h>
 #include <arpa/inet.h>

=== modified file 'firewall/proxy.h'
--- firewall/proxy.h    2010-02-10 23:02:52 +0000
+++ firewall/proxy.h    2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_PROXY_H
-#define HIP_PROXY_H
+#ifndef HIP_FIREWALL_PROXY_H
+#define HIP_FIREWALL_PROXY_H
 
 #include <libipq.h>
 
@@ -21,4 +21,4 @@
 int handle_proxy_inbound_traffic(const ipq_packet_msg_t *m,
                                  const struct in6_addr *src_addr);
 
-#endif /* HIP_PROXY_H */
+#endif /* HIP_FIREWALL_PROXY_H */

=== modified file 'firewall/proxyconndb.h'
--- firewall/proxyconndb.h      2010-02-10 23:02:52 +0000
+++ firewall/proxyconndb.h      2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_CONNDB_H
-#define HIP_CONNDB_H
+#ifndef HIP_FIREWALL_PROXYCONNDB_H
+#define HIP_FIREWALL_PROXYCONNDB_H
 
 #include "lib/core/debug.h"
 
@@ -37,4 +37,4 @@
                              const int port_peer,
                              const int state);
 
-#endif /*  HIP_CONNDB_H */
+#endif /*  HIP_FIREWALL_PROXYCONNDB_H */

=== modified file 'firewall/proxydb.h'
--- firewall/proxydb.h  2010-02-10 23:02:52 +0000
+++ firewall/proxydb.h  2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef PROXYDB_H
-#define PROXYDB_H
+#ifndef HIP_FIREWALL_PROXYDB_H
+#define HIP_FIREWALL_PROXYDB_H
 
 #include <sys/types.h>
 #include <unistd.h>
@@ -42,4 +42,4 @@
 void hip_uninit_proxy_db(void);
 
 
-#endif /* PROXYDB_H */
+#endif /* HIP_FIREWALL_PROXYDB_H */

=== modified file 'firewall/rule_management.h'
--- firewall/rule_management.h  2010-02-10 23:02:52 +0000
+++ firewall/rule_management.h  2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef RULE_MANAGEMENT_H
-#define RULE_MANAGEMENT_H
+#ifndef HIP_FIREWALL_RULE_MANAGEMENT_H
+#define HIP_FIREWALL_RULE_MANAGEMENT_H
 
 #include "dlist.h"
 //#include "helpers.h"

=== modified file 'firewall/sava_api.h'
--- firewall/sava_api.h 2010-02-10 23:02:52 +0000
+++ firewall/sava_api.h 2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_SAVA_API
-#define HIP_SAVA_API
+#ifndef HIP_FIREWALL_SAVA_API_H
+#define HIP_FIREWALL_SAVA_API_H
 
 #include "lib/core/hashtable.h"
 #include "lib/core/ife.h"
@@ -27,4 +27,4 @@
 int request_savah_status(int mode);
 int handle_sava_i2_state_update(struct hip_common *msg);
 int sava_check_state(struct in6_addr *src, struct in6_addr *hitr);
-#endif //HIP_SAVA_API
+#endif //HIP_FIREWALL_SAVA_API_H

=== modified file 'firewall/savah_gateway.h'
--- firewall/savah_gateway.h    2010-02-10 23:02:52 +0000
+++ firewall/savah_gateway.h    2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef SAVAH_GATEWAY_H
-#define SAVAH_GATEWAY_H
+#ifndef HIP_FIREWALL_SAVAH_GATEWAY_H
+#define HIP_FIREWALL_SAVAH_GATEWAY_H
 
 #include <stdio.h>
 #include <netinet/in.h>

=== modified file 'firewall/sysopp.h'
--- firewall/sysopp.h   2010-02-10 23:02:52 +0000
+++ firewall/sysopp.h   2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_SYSOPP_H_
-#define HIP_SYSOPP_H_
+#ifndef HIP_FIREWALL_SYSOPP_H
+#define HIP_FIREWALL_SYSOPP_H
 
 #include "firewall_defines.h"
 #include "lib/core/protodefs.h"
@@ -9,4 +9,4 @@
 int hip_fw_sys_opp_set_peer_hit(const struct hip_common *msg);
 void hip_fw_flush_system_based_opp_chains(void);
 
-#endif /* HIP_SYSOPP_H_ */
+#endif /* HIP_FIREWALL_SYSOPP_H */

=== modified file 'firewall/user_ipsec_api.h'
--- firewall/user_ipsec_api.h   2010-02-11 17:21:17 +0000
+++ firewall/user_ipsec_api.h   2010-02-17 13:08:39 +0000
@@ -11,8 +11,8 @@
  *
  */
 
-#ifndef USER_IPSEC_API_H_
-#define USER_IPSEC_API_H_
+#ifndef HIP_FIREWALL_USER_IPSEC_API_H
+#define HIP_FIREWALL_USER_IPSEC_API_H
 
 #include <netinet/udp.h>
 #include <openssl/evp.h>
@@ -36,4 +36,4 @@
 int hip_fw_userspace_ipsec_input(const hip_fw_context_t *ctx);
 int hip_fw_userspace_ipsec_output(const hip_fw_context_t *ctx);
 
-#endif /* USER_IPSEC_API_H_ */
+#endif /* HIP_FIREWALL_USER_IPSEC_API_H */

=== modified file 'firewall/user_ipsec_esp.h'
--- firewall/user_ipsec_esp.h   2010-02-11 17:21:17 +0000
+++ firewall/user_ipsec_esp.h   2010-02-17 13:08:39 +0000
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef USER_IPSEC_ESP_H_
-#define USER_IPSEC_ESP_H_
+#ifndef HIP_FIREWALL_USER_IPSEC_ESP_H
+#define HIP_FIREWALL_USER_IPSEC_ESP_H
 
 #include "user_ipsec_sadb.h"
 #include "firewall_defines.h"
@@ -55,4 +55,4 @@
                      const struct in6_addr *dst_addr, const uint16_t 
packet_len,
                      const uint8_t next_hdr);
 
-#endif /* USER_IPSEC_ESP_H_*/
+#endif /* HIP_FIREWALL_USER_IPSEC_ESP_H*/

=== modified file 'firewall/user_ipsec_fw_msg.h'
--- firewall/user_ipsec_fw_msg.h        2010-02-11 17:21:17 +0000
+++ firewall/user_ipsec_fw_msg.h        2010-02-17 13:08:39 +0000
@@ -10,8 +10,8 @@
  * @author Rene Hummen <rene.hummen@xxxxxxxxxxxxxx>
  */
 
-#ifndef USER_IPSEC_FW_MSG_H_
-#define USER_IPSEC_FW_MSG_H_
+#ifndef HIP_FIREWALL_USER_IPSEC_FW_MSG_H
+#define HIP_FIREWALL_USER_IPSEC_FW_MSG_H
 
 #include "lib/core/protodefs.h"
 
@@ -20,4 +20,4 @@
 int handle_sa_delete_request(const struct hip_common *msg);
 int handle_sa_flush_all_request(const struct hip_common *msg);
 
-#endif /* USER_IPSEC_FW_MSG_H_ */
+#endif /* HIP_FIREWALL_USER_IPSEC_FW_MSG_H */

=== modified file 'firewall/user_ipsec_sadb.h'
--- firewall/user_ipsec_sadb.h  2010-02-10 23:02:52 +0000
+++ firewall/user_ipsec_sadb.h  2010-02-17 13:08:39 +0000
@@ -12,8 +12,8 @@
  *
  */
 
-#ifndef USER_IPSEC_SADB_H_
-#define USER_IPSEC_SADB_H_
+#ifndef HIP_FIREWALL_USER_IPSEC_SADB_H
+#define HIP_FIREWALL_USER_IPSEC_SADB_H
 
 #include <openssl/des.h>                /* des_key_schedule */
 #include <openssl/aes.h>                /* aes_key */
@@ -108,4 +108,4 @@
                                            const struct in6_addr *dst_hit);
 void hip_sadb_print(void);
 
-#endif /* USER_IPSEC_SADB_H_ */
+#endif /* HIP_FIREWALL_USER_IPSEC_SADB_H */

=== modified file 'hipd/accessor.h'
--- hipd/accessor.h     2010-02-10 22:32:46 +0000
+++ hipd/accessor.h     2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIPD_ACCESSOR_H
-#define HIPD_ACCESSOR_H
+#ifndef HIP_HIPD_ACCESSOR_H
+#define HIP_HIPD_ACCESSOR_H
 
 #include "hipd.h" /* @todo: header recursion: hipd.h calls accessor.h */
 
@@ -63,4 +63,4 @@
 
 extern unsigned int opportunistic_mode;
 
-#endif /* HIPD_ACCESSOR_H */
+#endif /* HIP_HIPD_ACCESSOR_H */

=== modified file 'hipd/blind.h'
--- hipd/blind.h        2010-02-16 21:54:14 +0000
+++ hipd/blind.h        2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef BLIND_H
-#define BLIND_H
+#ifndef HIP_HIPD_BLIND_H
+#define HIP_HIPD_BLIND_H
 
 #include "lib/core/debug.h"
 #include "lib/core/crypto.h"

=== modified file 'hipd/bos.h'
--- hipd/bos.h  2010-02-10 22:32:46 +0000
+++ hipd/bos.h  2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_BOS_NEW_H
-#define HIP_BOS_NEW_H
+#ifndef HIP_HIPD_BOS_H
+#define HIP_HIPD_BOS_H
 
 #include <sys/types.h>
 #include <netdb.h>
@@ -22,4 +22,4 @@
                    hip_ha_t *entry, hip_portpair_t *);
 
 
-#endif /* HIP_BOS_NEW_H */
+#endif /* HIP_HIPD_BOS_H */

=== modified file 'hipd/cert.h'
--- hipd/cert.h 2010-02-11 17:21:17 +0000
+++ hipd/cert.h 2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_CERT_H
-#define HIP_CERT_H
+#ifndef HIP_HIPD_CERT_H
+#define HIP_HIPD_CERT_H
 
 /** @file
  * A header file for cert.c
@@ -65,4 +65,4 @@
 #define sk_CONF_VALUE_value(st, i) SKM_sk_value(CONF_VALUE, (st), (i))
 #endif
 
-#endif /* HIP_CERT_H */
+#endif /* HIP_HIPD_CERT_H */

=== modified file 'hipd/close.h'
--- hipd/close.h        2010-02-16 21:54:14 +0000
+++ hipd/close.h        2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_CLOSE_H
-#define HIP_CLOSE_H
+#ifndef HIP_HIPD_CLOSE_H
+#define HIP_HIPD_CLOSE_H
 
 #include "hadb.h"
 #include "lib/core/misc.h"
@@ -20,4 +20,4 @@
 int hip_receive_close(struct hip_common *close, hip_ha_t *entry);
 int hip_receive_close_ack(struct hip_common *close_ack, hip_ha_t *entry);
 
-#endif /* HIP_CLOSE_H */
+#endif /* HIP_HIPD_CLOSE_H */

=== modified file 'hipd/configfilereader.h'
--- hipd/configfilereader.h     2010-02-10 22:32:46 +0000
+++ hipd/configfilereader.h     2010-02-17 13:08:39 +0000
@@ -55,8 +55,8 @@
  * @date    14.02.2008
  * @note    Distributed under <a 
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
  */
-#ifndef CONFIGFILEREADER_H
-#define CONFIGFILEREADER_H
+#ifndef HIP_HIPD_CONFIGFILEREADER_H
+#define HIP_HIPD_CONFIGFILEREADER_H
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -95,4 +95,4 @@
                                         hip_configfilevalue_t *current);
 void print_node(hip_configfilevalue_t *node);
 
-#endif /* CONFIGFILEREADER_H */
+#endif /* HIP_HIPD_CONFIGFILEREADER_H */

=== modified file 'hipd/cookie.h'
--- hipd/cookie.h       2010-02-15 17:29:10 +0000
+++ hipd/cookie.h       2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_COOKIE_H
-#define HIP_COOKIE_H
+#ifndef HIP_HIPD_COOKIE_H
+#define HIP_HIPD_COOKIE_H
 
 #include "lib/core/debug.h"
 #include "lib/core/builder.h"
@@ -37,4 +37,4 @@
 int hip_dec_cookie_difficulty(hip_hit_t *not_used);
 int hip_get_puzzle_difficulty_msg(struct hip_common *msg);
 int hip_set_puzzle_difficulty_msg(struct hip_common *msg);
-#endif /* HIP_COOKIE_H */
+#endif /* HIP_HIPD_COOKIE_H */

=== modified file 'hipd/dh.h'
--- hipd/dh.h   2010-02-16 21:54:14 +0000
+++ hipd/dh.h   2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_SECURITY_H
-#define HIP_SECURITY_H
+#ifndef HIP_HIPD_DH_H
+#define HIP_HIPD_DH_H
 
 #include "hadb.h"
 #include "lib/core/crypto.h"
@@ -11,4 +11,4 @@
                                 signed int len,
                                 unsigned char *buffer,
                                 int bufsize);
-#endif /* HIP_SECURITY_H */
+#endif /* HIP_HIPD_DH_H */

=== modified file 'hipd/dht.h'
--- hipd/dht.h  2010-01-19 13:10:46 +0000
+++ hipd/dht.h  2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIPD_DHT_H_
-#define HIPD_DHT_H_
+#ifndef HIP_HIPD_DHT_H
+#define HIP_HIPD_DHT_H
 
 /** @file
  * A header file for dht.c
@@ -28,4 +28,4 @@
 
 void hip_send_packet_to_lookup_from_queue(void);
 
-#endif /* HIPD_DHT_H_ */
+#endif /* HIP_HIPD_DHT_H */

=== modified file 'hipd/dhtqueue.h'
--- hipd/dhtqueue.h     2010-02-17 10:57:25 +0000
+++ hipd/dhtqueue.h     2010-02-17 13:08:39 +0000
@@ -6,12 +6,12 @@
  * @note    Distributed under <a 
href="http://www.gnu.org/licenses/gpl.txt";>GNU/GPL</a>
  */
 
-#ifndef HIP_HIPQUEUE
-#define HIP_HIPQUEUE
+#ifndef HIP_HIPD_DHTQUEUE_H
+#define HIP_HIPD_DHTQUEUE_H
 
 int hip_init_dht_queue(void);
 int hip_write_to_dht_queue(void *, int);
 int hip_read_from_dht_queue(void *);
 void hip_dht_queue_uninit(void);
 
-#endif /* HIPQUEUE */
+#endif /* HIP_HIPD_DHTQUEUE_H */

=== modified file 'hipd/esp_prot_anchordb.h'
--- hipd/esp_prot_anchordb.h    2010-02-10 22:32:46 +0000
+++ hipd/esp_prot_anchordb.h    2010-02-17 13:08:39 +0000
@@ -14,8 +14,8 @@
  *
  */
 
-#ifndef ESP_PROT_ANCHORDB_H_
-#define ESP_PROT_ANCHORDB_H_
+#ifndef HIP_HIPD_ESP_PROT_ANCHORDB_H
+#define HIP_HIPD_ESP_PROT_ANCHORDB_H
 
 #include "lib/core/protodefs.h"
 
@@ -27,4 +27,4 @@
 int anchor_db_get_anchor_length(const uint8_t transform);
 int anchor_db_get_hash_item_length(const uint8_t transform);
 
-#endif /*ESP_PROT_ANCHORDB_H_*/
+#endif /*HIP_HIPD_ESP_PROT_ANCHORDB_H*/

=== modified file 'hipd/esp_prot_hipd_msg.h'
--- hipd/esp_prot_hipd_msg.h    2010-02-10 22:32:46 +0000
+++ hipd/esp_prot_hipd_msg.h    2010-02-17 13:08:39 +0000
@@ -12,8 +12,8 @@
  *
  */
 
-#ifndef ESP_PROT_HIPD_MSG_H_
-#define ESP_PROT_HIPD_MSG_H_
+#ifndef HIP_HIPD_ESP_PROT_HIPD_MSG_H
+#define HIP_HIPD_ESP_PROT_HIPD_MSG_H
 
 #include "lib/core/protodefs.h"
 #include "lib/core/state.h"
@@ -40,4 +40,4 @@
                                   const in6_addr_t *dst_ip,
                                   uint32_t *spi);
 
-#endif /*ESP_PROT_HIPD_MSG_H_*/
+#endif /*HIP_HIPD_ESP_PROT_HIPD_MSG_H*/

=== modified file 'hipd/esp_prot_light_update.h'
--- hipd/esp_prot_light_update.h        2010-02-10 22:32:46 +0000
+++ hipd/esp_prot_light_update.h        2010-02-17 13:08:39 +0000
@@ -12,8 +12,8 @@
  *
  */
 
-#ifndef ESP_PROT_LIGHT_UPDATE_H_
-#define ESP_PROT_LIGHT_UPDATE_H_
+#ifndef HIP_HIPD_ESP_PROT_LIGHT_UPDATE_H
+#define HIP_HIPD_ESP_PROT_LIGHT_UPDATE_H
 
 #include "lib/core/protodefs.h"
 
@@ -28,4 +28,4 @@
                                   const in6_addr_t *dst_addr,
                                   hip_ha_t *entry);
 
-#endif /* ESP_PROT_LIGHT_UPDATE_H_ */
+#endif /* HIP_HIPD_ESP_PROT_LIGHT_UPDATE_H */

=== modified file 'hipd/hadb.h'
--- hipd/hadb.h 2010-02-10 22:32:46 +0000
+++ hipd/hadb.h 2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_HADB_H
-#define HIP_HADB_H
+#ifndef HIP_HIPD_HADB_H
+#define HIP_HIPD_HADB_H
 
 #ifdef HAVE_CONFIG_H
   #include "config.h"
@@ -161,4 +161,4 @@
 hip_rcv_func_set_t *hip_get_rcv_default_func_set(void);
 hip_handle_func_set_t *hip_get_handle_default_func_set(void);
 
-#endif /* HIP_HADB_H */
+#endif /* HIP_HIPD_HADB_H */

=== modified file 'hipd/hadb_legacy.h'
--- hipd/hadb_legacy.h  2010-02-10 22:32:46 +0000
+++ hipd/hadb_legacy.h  2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HADB_LEGACY_H
-#define HADB_LEGACY_H
+#ifndef HIP_HIPD_HADB_LEGACY_H
+#define HIP_HIPD_HADB_LEGACY_H
 
 #include "hadb.h"
 
@@ -22,4 +22,4 @@
 
 void hip_hadb_delete_peer_addrlist_one_old(hip_ha_t *ha, struct in6_addr 
*addr);
 
-#endif /* HADB_LEGACY_H */
+#endif /* HIP_HIPD_HADB_LEGACY_H */

=== modified file 'hipd/heartbeat.h'
--- hipd/heartbeat.h    2010-01-19 09:28:42 +0000
+++ hipd/heartbeat.h    2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HEARTBEAT_H
-#define HEARTBEAT_H
+#ifndef HIP_HIPD_HEARTBEAT_H
+#define HIP_HIPD_HEARTBEAT_H
 
 #include "lib/core/state.h"
 
@@ -7,4 +7,4 @@
 int hip_send_heartbeat(hip_ha_t *entry, void *opaq);
 int hip_icmp_recvmsg(int sockfd);
 
-#endif /* HEARTBEAT_H */
+#endif /* HIP_HIPD_HEARTBEAT_H */

=== modified file 'hipd/hi3.h'
--- hipd/hi3.h  2010-02-17 13:00:40 +0000
+++ hipd/hi3.h  2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_HI3_H
-#define HIP_HI3_H
+#ifndef HIP_HIPD_HI3_H
+#define HIP_HIPD_HI3_H
 
 #ifdef HAVE_CONFIG_H
   #include "config.h"
@@ -51,4 +51,4 @@
 int hip_do_i3_stuff_for_i2(struct hip_locator *locator, hip_portpair_t 
*i2_info,
                            in6_addr_t *i2_saddr, in6_addr_t *i2_daddr);
 
-#endif /* HIP_HI3_H */
+#endif /* HIP_HIPD_HI3_H */

=== modified file 'hipd/hidb.h'
--- hipd/hidb.h 2010-02-17 10:57:25 +0000
+++ hipd/hidb.h 2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_DB
-#define HIP_DB
+#ifndef HIP_HIPD_HIDB
+#define HIP_HIPD_HIDB
 
 #include <asm/types.h>
 #include <sys/errno.h>
@@ -86,4 +86,4 @@
 int hip_get_default_hit_msg(struct hip_common *msg);
 int hip_get_default_lsi(struct in_addr *lsi);
 
-#endif /* HIP_DB */
+#endif /* HIP_HIPD_HIDB */

=== modified file 'hipd/hipd.h'
--- hipd/hipd.h 2010-02-16 21:54:14 +0000
+++ hipd/hipd.h 2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIPD_H
-#define HIPD_H
+#ifndef HIP_HIPD_HIPD_H
+#define HIP_HIPD_HIPD_H
 
 #include <signal.h>     /* signal() */
 #include <stdio.h>      /* stderr and others */
@@ -197,4 +197,4 @@
 
 #define IPV4_HDR_SIZE 20
 
-#endif /* HIPD_H */
+#endif /* HIP_HIPD_HIPD_H */

=== modified file 'hipd/hiprelay.h'
--- hipd/hiprelay.h     2010-02-12 15:40:01 +0000
+++ hipd/hiprelay.h     2010-02-17 13:08:39 +0000
@@ -67,8 +67,8 @@
  *          draft-ietf-hip-nat-traversal-03</a>
  * @note    Distributed under <a 
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
  */
-#ifndef HIP_HIPRELAY_H
-#define HIP_HIPRELAY_H
+#ifndef HIP_HIPD_HIPRELAY_H
+#define HIP_HIPD_HIPRELAY_H
 
 #include <time.h> /* For timing. */
 #include <openssl/lhash.h> /* For LHASH. */
@@ -498,4 +498,4 @@
                         const hip_portpair_t *i1_info,
                         const uint8_t);
 
-#endif /* HIP_HIPRELAY_H */
+#endif /* HIP_HIPD_HIPRELAY_H */

=== modified file 'hipd/hit_to_ip.h'
--- hipd/hit_to_ip.h    2010-02-11 17:21:17 +0000
+++ hipd/hit_to_ip.h    2010-02-17 13:08:39 +0000
@@ -9,8 +9,8 @@
  * @author Oleg Ponomarev <oleg.ponomarev@xxxxxxx>
  */
 
-#ifndef HIT_TO_IP_H
-#define HIT_TO_IP_H
+#ifndef HIP_HIPD_HIT_TO_IP_H
+#define HIP_HIPD_HIT_TO_IP_H
 
 int hip_hit_to_ip(hip_hit_t *hit, struct in6_addr *retval);
 
@@ -18,4 +18,4 @@
 int hip_get_hit_to_ip_status(void);
 void hip_hit_to_ip_set(const char *zone);
 
-#endif /* HIT_TO_IP_H */
+#endif /* HIP_HIPD_HIT_TO_IP_H */

=== modified file 'hipd/icookie.h'
--- hipd/icookie.h      2009-12-11 22:49:11 +0000
+++ hipd/icookie.h      2010-02-17 13:08:39 +0000
@@ -1,6 +1,6 @@
-#ifndef HIP_ICOOKIE_H
-#define HIP_ICOOKIE_H
+#ifndef HIP_HIPD_ICOOKIE_H
+#define HIP_HIPD_ICOOKIE_H
 
 #include "cookie.h"
 
-#endif /* HIP_ICOOKIE_H  */
+#endif /* HIP_HIPD_ICOOKIE_H  */

=== modified file 'hipd/init.h'
--- hipd/init.h 2010-02-17 10:57:25 +0000
+++ hipd/init.h 2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIPD_INIT
-#define HIPD_INIT
+#ifndef HIP_HIPD_INIT_H
+#define HIP_HIPD_INIT_H
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
@@ -55,4 +55,4 @@
 void hip_close(int signal);
 void hip_exit(int signal);
 int hip_init_dht(void);
-#endif /* _HIP_INIT */
+#endif /* HIP_HIPD_INIT_H */

=== modified file 'hipd/input.h'
--- hipd/input.h        2010-02-17 13:00:40 +0000
+++ hipd/input.h        2010-02-17 13:08:39 +0000
@@ -12,8 +12,8 @@
  * @author  Rene Hummen
  * @note    Distributed under <a 
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
  */
-#ifndef HIP_INPUT_H
-#define HIP_INPUT_H
+#ifndef HIP_HIPD_INPUT_H
+#define HIP_HIPD_INPUT_H
 
 #ifdef HAVE_CONFIG_H
   #include "config.h"
@@ -145,4 +145,4 @@
                   in6_addr_t *i2_daddr, hip_ha_t *entry, hip_portpair_t 
*i2_info,
                   in6_addr_t *dest, const in_port_t dest_port);
 
-#endif /* HIP_INPUT_H */
+#endif /* HIP_HIPD_INPUT_H */

=== modified file 'hipd/keymat.h'
--- hipd/keymat.h       2010-02-16 21:54:14 +0000
+++ hipd/keymat.h       2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_KEYMAT_H
-#define HIP_KEYMAT_H
+#ifndef HIP_HIPD_KEYMAT_H
+#define HIP_HIPD_KEYMAT_H
 
 #include "lib/core/list.h"
 #include "lib/core/misc.h"
@@ -18,4 +18,4 @@
 int hip_keymat_draw_and_copy(unsigned char *dst,
                              struct hip_keymat_keymat *keymat,
                              int len);
-#endif /* HIP_KEYMAT_H */
+#endif /* HIP_HIPD_KEYMAT_H */

=== modified file 'hipd/maintenance.h'
--- hipd/maintenance.h  2010-02-10 22:32:46 +0000
+++ hipd/maintenance.h  2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIPD_MAINTENANCE_H
-#define HIPD_MAINTENANCE_H
+#ifndef HIP_HIPD_MAINTENANCE_H
+#define HIP_HIPD_MAINTENANCE_H
 
 #include <stdlib.h>
 #include <fcntl.h>
@@ -38,4 +38,4 @@
                              struct in6_addr *hit_r,
                              struct in6_addr *src,
                              struct in6_addr *dst);
-#endif /* HIPD_MAINTENANCE_H */
+#endif /* HIP_HIPD_MAINTENANCE_H */

=== modified file 'hipd/nat.h'
--- hipd/nat.h  2010-02-17 10:57:25 +0000
+++ hipd/nat.h  2010-02-17 13:08:39 +0000
@@ -15,8 +15,8 @@
  * @note    Distributed under <a 
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
  * @note    All Doxygen comments have been added in version 1.1.
  */
-#ifndef NAT_H
-#define NAT_H
+#ifndef HIP_HIPD_NAT_H
+#define HIP_HIPD_NAT_H
 
 #include "lib/core/state.h"
 
@@ -44,4 +44,4 @@
 hip_transform_suite_t hip_nat_set_control(hip_ha_t *entry, 
hip_transform_suite_t mode);
 int hip_user_nat_mode(int nat_mode);
 hip_transform_suite_t hip_nat_get_control(hip_ha_t *entry);
-#endif /* NAT_H */
+#endif /* HIP_HIPD_NAT_H */

=== modified file 'hipd/netdev.h'
--- hipd/netdev.h       2010-02-16 08:35:10 +0000
+++ hipd/netdev.h       2010-02-17 13:08:39 +0000
@@ -2,8 +2,8 @@
  * The component provides interface to receive IP address and IF
  * events over netlink from the kernel.
  */
-#ifndef NETDEV_H
-#define NETDEV_H
+#ifndef HIP_HIPD_NETDEV_H
+#define HIP_HIPD_NETDEV_H
 
 #include <sys/socket.h>
 #ifndef __u32
@@ -59,4 +59,4 @@
 
 int hip_map_id_to_addr(hip_hit_t *hit, hip_lsi_t *lsi, struct in6_addr *addr);
 
-#endif /* NETDEV_H */
+#endif /* HIP_HIPD_NETDEV_H */

=== modified file 'hipd/nsupdate.h'
--- hipd/nsupdate.h     2010-02-11 17:21:17 +0000
+++ hipd/nsupdate.h     2010-02-17 13:08:39 +0000
@@ -13,12 +13,12 @@
  * @author Oleg Ponomarev <oleg.ponomarev@xxxxxxx>
  */
 
-#ifndef HIP_NSUPDATE_H
-#define HIP_NSUPDATE_H
+#ifndef HIP_HIPD_NSUPDATE_H
+#define HIP_HIPD_NSUPDATE_H
 
 void hip_set_nsupdate_status(int status);
 int hip_get_nsupdate_status(void);
 
 int nsupdate(const int start);
 
-#endif /* HIP_NSUPDATE_H */
+#endif /* HIP_HIPD_NSUPDATE_H */

=== modified file 'hipd/oppdb.h'
--- hipd/oppdb.h        2010-02-10 22:32:46 +0000
+++ hipd/oppdb.h        2010-02-17 13:08:39 +0000
@@ -7,8 +7,8 @@
  *
  */
 
-#ifndef HIP_OPPDB_H
-#define HIP_OPPDB_H
+#ifndef HIP_HIPD_OPPDB_H
+#define HIP_HIPD_OPPDB_H
 
 #include <sys/socket.h>
 #include <sys/un.h>

=== modified file 'hipd/oppipdb.h'
--- hipd/oppipdb.h      2010-02-10 22:32:46 +0000
+++ hipd/oppipdb.h      2010-02-17 13:08:39 +0000
@@ -6,8 +6,8 @@
  * @note    Distributed under <a 
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
  */
 
-#ifndef HIP_OPPIPDB_H
-#define HIP_OPPIPDB_H
+#ifndef HIP_HIPD_OPPIPDB_H
+#define HIP_HIPD_OPPIPDB_H
 
 #include "lib/core/debug.h"
 #include "hidb.h"
@@ -23,4 +23,4 @@
 void hip_oppipdb_delentry(const struct in6_addr *ip_peer);
 void hip_oppipdb_uninit(void);
 
-#endif /* HIP_OPPIPDB_H */
+#endif /* HIP_HIPD_OPPIPDB_H */

=== modified file 'hipd/output.h'
--- hipd/output.h       2010-02-17 13:00:40 +0000
+++ hipd/output.h       2010-02-17 13:08:39 +0000
@@ -8,8 +8,8 @@
  * @author Rene Hummen
  * @note    Distributed under <a 
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
  */
-#ifndef HIP_OUTPUT_H
-#define HIP_OUTPUT_H
+#ifndef HIP_HIPD_OUTPUT_H
+#define HIP_HIPD_OUTPUT_H
 #include <netinet/ip6.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
@@ -103,4 +103,4 @@
                 struct hip_common *, hip_ha_t *, int);
 #endif /* CONFIG_HIP_I3 */
 
-#endif /* HIP_OUTPUT_H */
+#endif /* HIP_HIPD_OUTPUT_H */

=== modified file 'hipd/pfkeyapi.h'
--- hipd/pfkeyapi.h     2010-01-19 11:26:32 +0000
+++ hipd/pfkeyapi.h     2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef PFKEYAPI_H
-#define PFKEYAPI_H
+#ifndef HIP_HIPD_PFKEYAPI_H
+#define HIP_HIPD_PFKEYAPI_H
 
 #ifdef HAVE_CONFIG_H
   #include "config.h"
@@ -7,4 +7,4 @@
 
 #include "lib/tool/xfrmapi.h"
 
-#endif /* PFKEYAPI_H */
+#endif /* HIP_HIPD_PFKEYAPI_H */

=== modified file 'hipd/pisa.h'
--- hipd/pisa.h 2010-02-08 15:18:06 +0000
+++ hipd/pisa.h 2010-02-17 13:08:39 +0000
@@ -3,8 +3,8 @@
  *
  * @author Thomas Jansen
  */
-#ifndef HIP_PISA_H
-#define HIP_PISA_H
+#ifndef HIP_HIPD_PISA_H
+#define HIP_HIPD_PISA_H
 
 /**
  * Get the certificate text that will be appended to R2 and U2 packets
@@ -13,4 +13,4 @@
  */
 char *hip_pisa_get_certificate(void);
 
-#endif /* HIP_PISA_H */
+#endif /* HIP_HIPD_PISA_H */

=== modified file 'hipd/registration.h'
--- hipd/registration.h 2010-02-10 22:32:46 +0000
+++ hipd/registration.h 2010-02-17 13:08:39 +0000
@@ -11,8 +11,8 @@
  * @see     hiprelay.h
  * @see     escrow.h
  */
-#ifndef HIP_REGISTRATION_H
-#define HIP_REGISTRATION_H
+#ifndef HIP_HIPD_REGISTRATION_H
+#define HIP_HIPD_REGISTRATION_H
 
 #include "lib/core/misc.h"
 #include "lib/core/builder.h" // For lifetime conversions.
@@ -74,4 +74,4 @@
 
 int hip_handle_reg_from(hip_ha_t *entry, struct hip_common *msg);
 
-#endif /* HIP_REGISTRATION_H */
+#endif /* HIP_HIPD_REGISTRATION_H */

=== modified file 'hipd/tcptimeout.h'
--- hipd/tcptimeout.h   2010-02-10 22:32:46 +0000
+++ hipd/tcptimeout.h   2010-02-17 13:08:39 +0000
@@ -7,12 +7,12 @@
  * @note    Distributed under <a 
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
  * */
 
-#ifndef HIP_TCPTIMEOUT
-#define HIP_TCPTIMEOUT
+#ifndef HIP_HIPD_TCPTIMEOUT_H
+#define HIP_HIPD_TCPTIMEOUT_H
 
 int set_new_tcptimeout_parameters_value(void);
 
 int reset_default_tcptimeout_parameters_value(void);
 
 
-#endif /* HIP_TCPTIMEOUT */
+#endif /* HIP_HIPD_TCPTIMEOUT_H */

=== modified file 'hipd/update.h'
--- hipd/update.h       2010-02-10 22:32:46 +0000
+++ hipd/update.h       2010-02-17 13:08:39 +0000
@@ -6,8 +6,8 @@
  * @date    3.5.2009
  * @note    Distributed under <a 
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
  */
-#ifndef HIP_UPDATE_H
-#define HIP_UPDATE_H
+#ifndef HIP_HIPD_UPDATE_H
+#define HIP_HIPD_UPDATE_H
 
 #include "lib/core/builder.h"
 #include "hadb.h"
@@ -48,4 +48,4 @@
                                   struct hip_locator_info_addr_item *locators,
                                   int type);
 
-#endif /* HIP_UPDATE_H */
+#endif /* HIP_HIPD_UPDATE_H */

=== modified file 'hipd/update_legacy.h'
--- hipd/update_legacy.h        2010-02-08 15:18:06 +0000
+++ hipd/update_legacy.h        2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef UPDATE_LEGACY_H
-#define UPDATE_LEGACY_H
+#ifndef HIP_HIPD_UPDATE_LEGACY_H
+#define HIP_HIPD_UPDATE_LEGACY_H
 
 #include "update.h"
 
@@ -13,4 +13,4 @@
  */
 int hip_build_locators_old(struct hip_common *msg, uint32_t spi);
 
-#endif /* UPDATE_LEGACY_H */
+#endif /* HIP_HIPD_UPDATE_LEGACY_H */

=== modified file 'hipd/user.h'
--- hipd/user.h 2010-02-17 13:00:40 +0000
+++ hipd/user.h 2010-02-17 13:08:39 +0000
@@ -8,8 +8,8 @@
  * @author  Rene Hummen
  * @note    Distributed under <a 
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
  */
-#ifndef HIP_USER_H
-#define HIP_USER_H
+#ifndef HIP_HIPD_USER_H
+#define HIP_HIPD_USER_H
 
 #include <stdio.h>
 #include <stdint.h> // For uint8_t
@@ -31,4 +31,4 @@
 
 int hip_handle_netlink_msg(const struct nlmsghdr *msg, int len, void *arg);
 
-#endif /* HIP_USER_H */
+#endif /* HIP_HIPD_USER_H */

=== modified file 'hipd/user_ipsec_hipd_msg.h'
--- hipd/user_ipsec_hipd_msg.h  2010-02-11 17:21:17 +0000
+++ hipd/user_ipsec_hipd_msg.h  2010-02-17 13:08:39 +0000
@@ -10,8 +10,8 @@
  * @author Rene Hummen <rene.hummen@xxxxxxxxxxxxxx>
  */
 
-#ifndef USER_IPSEC_HIPD_MSG_H_
-#define USER_IPSEC_HIPD_MSG_H_
+#ifndef HIP_HIPD_USER_IPSEC_HIPD_MSG_H
+#define HIP_HIPD_USER_IPSEC_HIPD_MSG_H
 
 #include "lib/core/protodefs.h"
 
@@ -34,4 +34,4 @@
                                         const int dst_port);
 struct hip_common *create_flush_all_sa_msg(void);
 
-#endif /*USER_IPSEC_HIPD_MSG_H_*/
+#endif /*HIP_HIPD_USER_IPSEC_HIPD_MSG_H*/

=== modified file 'hipd/user_ipsec_sadb_api.h'
--- hipd/user_ipsec_sadb_api.h  2010-02-11 17:21:17 +0000
+++ hipd/user_ipsec_sadb_api.h  2010-02-17 13:08:39 +0000
@@ -12,8 +12,8 @@
  *
  */
 
-#ifndef USER_IPSEC_SADB_API_H_
-#define USER_IPSEC_SADB_API_H_
+#ifndef HIP_HIPD_USER_IPSEC_SADB_API_H
+#define HIP_HIPD_USER_IPSEC_SADB_API_H
 
 #include "lib/core/protodefs.h"
 
@@ -55,4 +55,4 @@
 
 int hip_userspace_ipsec_setup_default_sp_prefix_pair(void);
 
-#endif /*USER_IPSEC_SADB_API_H_*/
+#endif /*HIP_HIPD_USER_IPSEC_SADB_API_H*/

=== modified file 'hipsock/af_hip.h'
--- hipsock/af_hip.h    2010-02-17 13:08:16 +0000
+++ hipsock/af_hip.h    2010-02-17 13:08:39 +0000
@@ -23,8 +23,8 @@
 #include "debug.h"
 #include "ife.h"
 
-#ifndef IPPROTO_HIP
-#  define IPPROTO_HIP             139 /* Also in libinet6/include/netinet/in.h 
*/
+#ifndef HIP_HIPSOCK_AF_HIP_H
+#  define HIP_HIPSOCK_AF_HIP_H             139 /* Also in 
libinet6/include/netinet/in.h */
 #endif
 
 extern struct net_proto_family hip_family_ops;

=== modified file 'hipsock/debug.h'
--- hipsock/debug.h     2010-02-17 13:00:40 +0000
+++ hipsock/debug.h     2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_KERNEL_DEBUG_H
-#define HIP_KERNEL_DEBUG_H
+#ifndef HIP_HIPSOCK_DEBUG_H
+#define HIP_HIPSOCK_DEBUG_H
 
 #include <linux/ipv6.h>
 #include <linux/skbuff.h>
@@ -66,5 +66,5 @@
 uint64_t hton64(uint64_t i);
 uint64_t ntoh64(uint64_t i);
 
-#endif /* HIP_KERNEL_DEBUG_H */
+#endif /* HIP_HIPSOCK_DEBUG_H */
 

=== modified file 'hipsock/eid_db.h'
--- hipsock/eid_db.h    2010-02-17 13:00:40 +0000
+++ hipsock/eid_db.h    2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef EID_DB_H
-#define EID_DB_H
+#ifndef HIP_HIPSOCK_EID_DB_H
+#define HIP_HIPSOCK_EID_DB_H
 
 #include <linux/list.h>
 #include <linux/spinlock.h>
@@ -41,4 +41,4 @@
 int hip_socket_handle_set_my_eid(struct hip_common *msg);
 int hip_socket_handle_set_peer_eid(struct hip_common *msg);
 
-#endif /* EID_DB_H */
+#endif /* HIP_HIPSOCK_EID_DB_H */

=== modified file 'hipsock/usercompat.h'
--- hipsock/usercompat.h        2010-02-08 15:18:06 +0000
+++ hipsock/usercompat.h        2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_USER_COMPAT_H
-#define  HIP_USER_COMPAT_H
+#ifndef HIP_HIPSOCK_USERCOMPAT_H
+#define  HIP_HIPSOCK_USERCOMPAT_H
 
 #include <linux/in.h>
 #include <linux/in6.h>
@@ -36,4 +36,4 @@
 static inline int hip_build_digest(const int type, const void *in, int in_len, 
void *out) {return -1;}
 static inline int hip_write_hmac(int type, void *key, void *in, int in_len, 
void *out) {return -1;}
 
-#endif /* HIP_USER_COMPAT_H  */
+#endif /* HIP_HIPSOCK_USERCOMPAT_H  */

=== modified file 'lib/conf/hipconf.h'
--- lib/conf/hipconf.h  2010-02-10 22:47:31 +0000
+++ lib/conf/hipconf.h  2010-02-17 13:08:39 +0000
@@ -12,8 +12,8 @@
  * @author  Tao Wan <twan@xxxxxxxxx>
  * @note    Distributed under <a 
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
  */
-#ifndef HIPCONF_H
-#define HIPCONF_H
+#ifndef HIP_LIB_CONF_HIPCONF_H
+#define HIP_LIB_CONF_HIPCONF_H
 
 #ifdef HAVE_CONFIG_H
   #include "config.h"

=== modified file 'lib/core/builder.h'
--- lib/core/builder.h  2010-02-10 23:55:24 +0000
+++ lib/core/builder.h  2010-02-17 13:08:39 +0000
@@ -7,8 +7,8 @@
  * @version 1.0
  * @note    Distributed under <a 
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
  */
-#ifndef BUILDER_H
-#define BUILDER_H
+#ifndef HIP_LIB_CORE_BUILDER_H
+#define HIP_LIB_CORE_BUILDER_H
 
 #ifndef __KERNEL__
 #include <openssl/rsa.h>
@@ -311,4 +311,4 @@
                              hip_tlv_type_t hipparam);
 struct in6_addr *hip_get_locator_item_address(void *item);
 
-#endif /* BUILDER_H */
+#endif /* HIP_LIB_CORE_BUILDER_H */

=== modified file 'lib/core/certtools.h'
--- lib/core/certtools.h        2010-02-11 17:21:17 +0000
+++ lib/core/certtools.h        2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_CERTTOOLS_H
-#define HIP_CERTTOOLS_H
+#ifndef HIP_LIB_CORE_CERTTOOLS_H
+#define HIP_LIB_CORE_CERTTOOLS_H
 
 /** @file
  * A header file for certtools.c
@@ -75,4 +75,4 @@
 void hip_cert_free_conf(CONF *);
 int hip_cert_regex(char *, char *, int *, int *);
 
-#endif /* HIP_CERTTOOLS_H */
+#endif /* HIP_LIB_CORE_CERTTOOLS_H */

=== modified file 'lib/core/common_defines.h'
--- lib/core/common_defines.h   2010-02-10 23:55:24 +0000
+++ lib/core/common_defines.h   2010-02-17 13:08:39 +0000
@@ -4,8 +4,8 @@
  * Author: Rene Hummen <rene.hummen@xxxxxxxxxxxxxx>
  */
 
-#ifndef COMMON_DEFINES_H_
-#define COMMON_DEFINES_H_
+#ifndef HIP_LIB_CORE_COMMON_DEFINES_H
+#define HIP_LIB_CORE_COMMON_DEFINES_H
 
 #include <stdint.h>
 
@@ -73,4 +73,4 @@
     uint8_t esp_next;
 } __attribute__ ((packed));
 
-#endif /* COMMON_DEFINES_H_ */
+#endif /* HIP_LIB_CORE_COMMON_DEFINES_H */

=== modified file 'lib/core/crypto.h'
--- lib/core/crypto.h   2010-02-16 21:54:14 +0000
+++ lib/core/crypto.h   2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIPD_CRYPTO_H
-#define HIPD_CRYPTO_H
+#ifndef HIP_LIB_CORE_CRYPTO_H
+#define HIP_LIB_CORE_CRYPTO_H
 
 #ifdef HAVE_CONFIG_H
   #include "config.h"
@@ -104,4 +104,4 @@
 int hip_crypto_encrypted(void *data, const void *iv, int enc_alg, int enc_len,
                          void *enc_key, int direction);
 
-#endif /* HIPD_CRYPTO_H */
+#endif /* HIP_LIB_CORE_CRYPTO_H */

=== modified file 'lib/core/debug.h'
--- lib/core/debug.h    2010-02-10 23:55:24 +0000
+++ lib/core/debug.h    2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef DEBUG_H
-#define DEBUG_H
+#ifndef HIP_LIB_CORE_DEBUG_H
+#define HIP_LIB_CORE_DEBUG_H
 
 #include <stdio.h>
 #include <errno.h>
@@ -280,4 +280,4 @@
     return str;
 }
 
-#endif /* DEBUG_H */
+#endif /* HIP_LIB_CORE_DEBUG_H */

=== modified file 'lib/core/esp_prot_common.h'
--- lib/core/esp_prot_common.h  2010-02-10 23:55:24 +0000
+++ lib/core/esp_prot_common.h  2010-02-17 13:08:39 +0000
@@ -13,8 +13,8 @@
  *
  */
 
-#ifndef EXT_ESP_PROT_COMMON_H_
-#define EXT_ESP_PROT_COMMON_H_
+#ifndef HIP_LIB_CORE_ESP_PROT_COMMON_H
+#define HIP_LIB_CORE_ESP_PROT_COMMON_H
 
 #include <inttypes.h>
 
@@ -38,4 +38,4 @@
                              const uint8_t *preferred_transforms,
                              const uint8_t transform);
 
-#endif /*EXT_ESP_PROT_COMMON_H_*/
+#endif /*HIP_LIB_CORE_ESP_PROT_COMMON_H*/

=== modified file 'lib/core/getendpointinfo.h'
--- lib/core/getendpointinfo.h  2010-02-12 10:47:40 +0000
+++ lib/core/getendpointinfo.h  2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef GETENDPOINTINFO_H
-#define GETENDPOINTINFO_H
+#ifndef HIP_LIB_CORE_GETENDPOINTINFO_H
+#define HIP_LIB_CORE_GETENDPOINTINFO_H
 
 #include <stdint.h>
 #include <net/if.h>
@@ -78,4 +78,4 @@
 
 int get_local_hits(const char *servname, struct gaih_addrtuple **adr);
 
-#endif /* GETENDPOINTINFO_H */
+#endif /* HIP_LIB_CORE_GETENDPOINTINFO_H */

=== modified file 'lib/core/hashchain.h'
--- lib/core/hashchain.h        2010-02-10 23:55:24 +0000
+++ lib/core/hashchain.h        2010-02-17 13:08:39 +0000
@@ -12,8 +12,8 @@
  *
  */
 
-#ifndef HASH_CHAIN_H
-#define HASH_CHAIN_H
+#ifndef HIP_LIB_CORE_HASHCHAIN_H
+#define HIP_LIB_CORE_HASHCHAIN_H
 
 #include <stdlib.h>
 
@@ -27,7 +27,7 @@
 #endif
 
 /* hash function used for the creation and verification of the hash chain */
-#ifndef CONFIG_HIP_MAEMO
+#ifndef HIP_LIB_CORE_HASHCHAIN_H
 typedef unsigned char * (*hash_function_t)(const unsigned char *,
                                            size_t,
                                            unsigned char *);
@@ -79,4 +79,4 @@
 int hchain_free(hash_chain_t *hash_chain);
 int hchain_get_num_remaining(const hash_chain_t *hash_chain);
 
-#endif /*HASH_CHAIN_H*/
+#endif /*HIP_LIB_CORE_HASHCHAIN_H*/

=== modified file 'lib/core/hashchain_store.h'
--- lib/core/hashchain_store.h  2010-02-10 23:55:24 +0000
+++ lib/core/hashchain_store.h  2010-02-17 13:08:39 +0000
@@ -13,8 +13,8 @@
  *
  */
 
-#ifndef HASHCHAIN_STORE_H
-#define HASHCHAIN_STORE_H
+#ifndef HIP_LIB_CORE_HASHCHAIN_STORE_H
+#define HIP_LIB_CORE_HASHCHAIN_STORE_H
 
 #include "linkedlist.h"
 #include "hashchain.h"
@@ -97,4 +97,4 @@
                             const int function_id,
                             const int hash_length_id);
 
-#endif /* HASHCHAIN_STORE_H */
+#endif /* HIP_LIB_CORE_HASHCHAIN_STORE_H */

=== modified file 'lib/core/hashtable.h'
--- lib/core/hashtable.h        2010-02-10 23:55:24 +0000
+++ lib/core/hashtable.h        2010-02-17 13:08:39 +0000
@@ -7,8 +7,8 @@
 #include "debug.h"
 #include "list.h"
 
-#ifndef HIP_LHASHTABLE_H
-#define HIP_LHASHTABLE_H
+#ifndef HIP_LIB_CORE_HASHTABLE_H
+#define HIP_LIB_CORE_HASHTABLE_H
 
 /* OpenSSL 1.0.0 introduced backwards incompatible changes to the lhash.
  * These backwards compatibility hacks can be removed when all platforms

=== modified file 'lib/core/hashtree.h'
--- lib/core/hashtree.h 2010-02-10 23:55:24 +0000
+++ lib/core/hashtree.h 2010-02-17 13:08:39 +0000
@@ -12,8 +12,8 @@
  *
  */
 
-#ifndef HASH_TREE_H_
-#define HASH_TREE_H_
+#ifndef HIP_LIB_CORE_HASHTREE_H
+#define HIP_LIB_CORE_HASHTREE_H
 
 #include <inttypes.h>
 
@@ -129,4 +129,4 @@
 void htree_print_data(const hash_tree_t *tree);
 void htree_print_nodes(const hash_tree_t *tree);
 
-#endif /* HASH_TREE_H_ */
+#endif /* HIP_LIB_CORE_HASHTREE_H */

=== modified file 'lib/core/hip_capability.h'
--- lib/core/hip_capability.h   2010-02-10 23:55:24 +0000
+++ lib/core/hip_capability.h   2010-02-17 13:08:39 +0000
@@ -4,9 +4,9 @@
  * @author  Tobias Heer  <heer@xxxxxxxxxxxxxxxxx> (header file only)
  * @note    Distributed under <a 
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
  */
-#ifndef HIP_CAPABILITY_H
-#define HIP_CAPABILITY_H
+#ifndef HIP_LIB_CORE_HIP_CAPABILITY_H
+#define HIP_LIB_CORE_HIP_CAPABILITY_H
 
 int hip_set_lowcapability(int run_as_sudo);
 
-#endif /*HIP_CAPABILITY_H*/
+#endif /*HIP_LIB_CORE_HIP_CAPABILITY_H*/

=== modified file 'lib/core/hip_statistics.h'
--- lib/core/hip_statistics.h   2010-02-11 10:06:54 +0000
+++ lib/core/hip_statistics.h   2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_STATISTICS_H_
-#define HIP_STATISTICS_H_
+#ifndef HIP_LIB_CORE_HIP_STATISTICS_H
+#define HIP_LIB_CORE_HIP_STATISTICS_H
 
 #include <stdlib.h>
 #include <inttypes.h>
@@ -28,4 +28,4 @@
                      double *std_dev,
                      double scaling_factor);
 
-#endif /* HIP_STATISTICS_H_ */
+#endif /* HIP_LIB_CORE_HIP_STATISTICS_H */

=== modified file 'lib/core/icomm.h'
--- lib/core/icomm.h    2010-02-17 10:57:25 +0000
+++ lib/core/icomm.h    2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_ICOMM
-#define HIP_ICOMM
+#ifndef HIP_LIB_CORE_ICOMM_H
+#define HIP_LIB_CORE_ICOMM_H
 
 /* Workaround for kernels before 2.6.15.3. */
 #ifndef IPV6_2292PKTINFO
@@ -256,4 +256,4 @@
 };
 typedef struct firewall_port_cache_hl firewall_port_cache_hl_t;
 
-#endif /* HIP_ICOMM */
+#endif /* HIP_LIB_CORE_ICOMM_H */

=== modified file 'lib/core/ife.h'
--- lib/core/ife.h      2010-02-17 10:57:25 +0000
+++ lib/core/ife.h      2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_CORE_IFE
-#define HIP_CORE_IFE
+#ifndef HIP_LIB_CORE_IFE_H
+#define HIP_LIB_CORE_IFE_H
 
 #define GOTO_OUT -3
 /** A generic HIP error. This should be a value whose value does not overlap
@@ -95,4 +95,4 @@
 
 /** @} */
 
-#endif /* HIP_CORE_IFE */
+#endif /* HIP_LIB_CORE_IFE_H */

=== modified file 'lib/core/kerncompat.h'
--- lib/core/kerncompat.h       2010-02-17 10:57:25 +0000
+++ lib/core/kerncompat.h       2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_KERN_COMPATIBILITY
-#define HIP_KERN_COMPATIBILITY
+#ifndef HIP_LIB_CORE_KERNCOMPAT_H
+#define HIP_LIB_CORE_KERNCOMPAT_H
 
 #include <netinet/in.h>
 #include <sys/time.h>
@@ -68,4 +68,4 @@
 #define write_unlock_irqrestore(a, b) do {} while (0)
 #define read_unlock_irqrestore(a, b) do {} while (0)
 
-#endif /* HIP_KERN_COMPATIBILITY */
+#endif /* HIP_LIB_CORE_KERNCOMPAT_H */

=== modified file 'lib/core/linkedlist.h'
--- lib/core/linkedlist.h       2010-02-10 23:55:24 +0000
+++ lib/core/linkedlist.h       2010-02-17 13:08:39 +0000
@@ -18,8 +18,8 @@
  * @date    21.04.2008
  * @note    Distributed under <a 
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
  */
-#ifndef HIP_LL_H
-#define HIP_LL_H
+#ifndef HIP_LIB_CORE_LINKEDLIST_H
+#define HIP_LIB_CORE_LINKEDLIST_H
 
 /** Linked list node. */
 typedef struct hip_ll_node {
@@ -246,4 +246,4 @@
 hip_ll_node_t *hip_ll_iterate(const hip_ll_t *linkedlist,
                               hip_ll_node_t *current);
 
-#endif /* HIP_LL_H */
+#endif /* HIP_LIB_CORE_LINKEDLIST_H */

=== modified file 'lib/core/list.h'
--- lib/core/list.h     2010-02-10 23:55:24 +0000
+++ lib/core/list.h     2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef QLIST_H
-#define QLIST_H
+#ifndef HIP_LIB_CORE_LIST_H
+#define HIP_LIB_CORE_LIST_H
 
 #include <openssl/lhash.h>
 //#include "kerncompat.h"
@@ -82,4 +82,4 @@
 #define list_del(entry, head) lh_delete(head, entry)
 #endif
 
-#endif /* QLIST_H */
+#endif /* HIP_LIB_CORE_LIST_H */

=== modified file 'lib/core/message.h'
--- lib/core/message.h  2010-02-10 23:55:24 +0000
+++ lib/core/message.h  2010-02-17 13:08:39 +0000
@@ -6,8 +6,8 @@
  * @version 1.0
  * @note    Distributed under <a 
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
  */
-#ifndef HIP_MESSAGE_H
-#define HIP_MESSAGE_H
+#ifndef HIP_LIB_CORE_MESSAGE_H
+#define HIP_LIB_CORE_MESSAGE_H
 
 #if HAVE_CONFIG_H
 #include <config.h>
@@ -168,4 +168,4 @@
                                         in6_addr_t *src_addr,
                                         in_port_t port);
 
-#endif /* HIP_MESSAGE_H */
+#endif /* HIP_LIB_CORE_MESSAGE_H */

=== modified file 'lib/core/misc.h'
--- lib/core/misc.h     2010-02-12 15:40:01 +0000
+++ lib/core/misc.h     2010-02-17 13:08:39 +0000
@@ -7,8 +7,8 @@
  * @note   Distributed under <a 
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
  * @see    misc.h
  */
-#ifndef HIP_MISC_H
-#define HIP_MISC_H
+#ifndef HIP_LIB_CORE_MISC_H
+#define HIP_LIB_CORE_MISC_H
 
 #ifdef HAVE_CONFIG_H
   #include "config.h"
@@ -324,4 +324,4 @@
 int hip_host_id_entry_to_hit_info(struct hip_host_id_entry *entry,
                                   void *msg);
 
-#endif /* HIP_MISC_H */
+#endif /* HIP_LIB_CORE_MISC_H */

=== modified file 'lib/core/protodefs.h'
--- lib/core/protodefs.h        2010-02-17 10:57:25 +0000
+++ lib/core/protodefs.h        2010-02-17 13:08:39 +0000
@@ -2,8 +2,8 @@
  * This file defines a Host Identity Protocol (HIP) header and parameter
  * related constants and structures.
  */
-#ifndef HIP_PROTODEFS
-#define HIP_PROTODEFS
+#ifndef HIP_LIB_CORE_PROTODEFS_H
+#define HIP_LIB_CORE_PROTODEFS_H
 
 #ifdef __KERNEL__
 #  include "usercompat.h"
@@ -1055,4 +1055,4 @@
 } __attribute__ ((packed));
 
 
-#endif /* HIP_PROTODEFS */
+#endif /* HIP_LIB_CORE_PROTODEFS_H */

=== modified file 'lib/core/sqlitedbapi.h'
--- lib/core/sqlitedbapi.h      2010-02-10 23:55:24 +0000
+++ lib/core/sqlitedbapi.h      2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_SQLITEDBAPI_H
-#define HIP_SQLITEDBAPI_H
+#ifndef HIP_LIB_CORE_SQLITEDBAPI_H
+#define HIP_LIB_CORE_SQLITEDBAPI_H
 
 /** @file
  * A header file for sqlitedbapi.c
@@ -72,4 +72,4 @@
 int hip_sqlite_delete_from_table(sqlite3 *, const char *);
 int hip_sqlite_insert_into_table(sqlite3 *, const char *);
 int hip_sqlite_create_table(sqlite3 *, const char *);
-#endif /* HIP_SQLITEDBAPI_H */
+#endif /* HIP_LIB_CORE_SQLITEDBAPI_H */

=== modified file 'lib/core/state.h'
--- lib/core/state.h    2010-02-17 13:08:16 +0000
+++ lib/core/state.h    2010-02-17 13:08:39 +0000
@@ -4,8 +4,8 @@
  *
  * @note Distributed under <a 
href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
  */
-#ifndef HIP_STATE_H
-#define HIP_STATE_H
+#ifndef HIP_LIB_CORE_STATE_H
+#define HIP_LIB_CORE_STATE_H
 
 #ifdef HAVE_CONFIG_H
   #include "config.h"
@@ -793,4 +793,4 @@
 
 /* @} */
 
-#endif /* HIP_STATE_H */
+#endif /* HIP_LIB_CORE_STATE_H */

=== modified file 'lib/core/utils.h'
--- lib/core/utils.h    2010-02-17 10:57:25 +0000
+++ lib/core/utils.h    2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_CORE_UTILS
-#define HIP_CORE_UTILS
+#ifndef HIP_LIB_CORE_UTILS_H
+#define HIP_LIB_CORE_UTILS_H
 
 #ifdef HAVE_CONFIG_H
   #include "config.h"
@@ -102,4 +102,4 @@
 # define HIP_CREATE_FILE(x)     open((x), O_RDWR | O_CREAT, 0644)
 #endif
 
-#endif /* HIP_CORE_UTILS */
+#endif /* HIP_LIB_CORE_UTILS_H */

=== modified file 'lib/dht/libhipdht.h'
--- lib/dht/libhipdht.h 2010-02-10 23:13:03 +0000
+++ lib/dht/libhipdht.h 2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef lib_opendht
-#define lib_opendht
+#ifndef HIP_LIB_DHT_LIBHIPDHT_H
+#define HIP_LIB_DHT_LIBHIPDHT_H
 
 #ifdef HAVE_CONFIG_H
   #include "config.h"
@@ -65,4 +65,4 @@
                     struct in6_addr *rhit,
                     void *final_key);
 int verify_hddr_lib(struct hip_common *hipcommonmsg, struct in6_addr *addrkey);
-#endif /* lib_opendht */
+#endif /* HIP_LIB_DHT_LIBHIPDHT_H */

=== modified file 'lib/dht/libhipdhtxml.h'
--- lib/dht/libhipdhtxml.h      2010-02-10 23:13:03 +0000
+++ lib/dht/libhipdhtxml.h      2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_LIBHIPOPENDHTXML_H
-#define HIP_LIBHIPOPENDHTXML_H
+#ifndef HIP_LIB_DHT_LIBHIPDHTXML_H
+#define HIP_LIB_DHT_LIBHIPDHTXML_H
 
 /** @file
  * A header file for libhipopendhtxml.c
@@ -35,4 +35,4 @@
     char addrs[440];
 };
 
-#endif /* HIP_LIBHIPOPENDHTXML_H */
+#endif /* HIP_LIB_DHT_LIBHIPDHTXML_H */

=== modified file 'lib/gui/create.h'
--- lib/gui/create.h    2010-02-17 10:57:25 +0000
+++ lib/gui/create.h    2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_GUI_CREATE_H
-#define HIP_GUI_CREATE_H
+#ifndef HIP_LIB_GUI_CREATE_H
+#define HIP_LIB_GUI_CREATE_H
 /*
  * HIPL GTK GUI
  *
@@ -14,4 +14,4 @@
 int create_content_nhdlg(void);
 int create_content_execdlg(void);
 
-#endif /* HIP_GUI_CREATE_H */
+#endif /* HIP_LIB_GUI_CREATE_H */

=== modified file 'lib/gui/dragndrop.h'
--- lib/gui/dragndrop.h 2010-02-11 00:05:35 +0000
+++ lib/gui/dragndrop.h 2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef DRAGNDROP_H
-#define DRAGNDROP_H
+#ifndef HIP_LIB_GUI_DRAGNDROP_H
+#define HIP_LIB_GUI_DRAGNDROP_H
 /*
  * HIPL GTK GUI
  *
@@ -38,4 +38,4 @@
                             guint info,
                             guint t,
                             gpointer data);
-#endif /* DRAGNDROP_H */
+#endif /* HIP_LIB_GUI_DRAGNDROP_H */

=== modified file 'lib/gui/events.h'
--- lib/gui/events.h    2010-02-17 10:57:25 +0000
+++ lib/gui/events.h    2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_GUI_EVENTS_H
-#define HIP_GUI_EVENTS_H
+#ifndef HIP_LIB_GUI_EVENTS_H
+#define HIP_LIB_GUI_EVENTS_H
 /*
  * HIPL GTK GUI
  *
@@ -69,4 +69,4 @@
 void e_local_edit(GtkWidget *, char *);
 
 
-#endif /* HIP_GUI_EVENTS_H */
+#endif /* HIP_LIB_GUI_EVENTS_H */

=== modified file 'lib/gui/hipgui.h'
--- lib/gui/hipgui.h    2010-02-17 10:57:25 +0000
+++ lib/gui/hipgui.h    2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef GUIAPI_H
-#define GUIAPI_H
+#ifndef HIP_LIB_GUI_HIPGUI_H
+#define HIP_LIB_GUI_HIPGUI_H
 /*
  * HIPL GTK GUI
  *
@@ -45,4 +45,4 @@
 /*! @} addtogroup libhipgui */
 
 
-#endif /* GUIAPI_H */
+#endif /* HIP_LIB_GUI_HIPGUI_H */

=== modified file 'lib/gui/tools.h'
--- lib/gui/tools.h     2010-02-17 10:57:25 +0000
+++ lib/gui/tools.h     2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_GUI_TOOLS_H
-#define HIP_GUI_TOOLS_H
+#ifndef HIP_LIB_GUI_TOOLS_H
+#define HIP_LIB_GUI_TOOLS_H
 /*
  * HIPL GTK GUI
  *
@@ -51,4 +51,4 @@
 
 void exec_application(void);
 
-#endif /* HIP_GUI_TOOLS_H */
+#endif /* HIP_LIB_GUI_TOOLS_H */

=== modified file 'lib/gui/widgets.h'
--- lib/gui/widgets.h   2010-02-11 00:05:35 +0000
+++ lib/gui/widgets.h   2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef GUI_WIDGETS_H
-#define GUI_WIDGETS_H
+#ifndef HIP_LIB_GUI_WIDGETS_H
+#define HIP_LIB_GUI_WIDGETS_H
 /*
  *  HIP Agent
  *
@@ -124,4 +124,4 @@
 
 /*! @} addtogroup libhipgui */
 
-#endif /* GUI_WIDGETS_H */
+#endif /* HIP_LIB_GUI_WIDGETS_H */

=== modified file 'lib/ipsec/libpfkey.h'
--- lib/ipsec/libpfkey.h        2010-02-17 10:57:25 +0000
+++ lib/ipsec/libpfkey.h        2010-02-17 13:08:39 +0000
@@ -34,8 +34,8 @@
 #ifndef LIBPFKEY_H
 #define LIBPFKEY_H
 
-#ifndef KAMELIBPFKEY_H
-#define KAMELIBPFKEY_H
+#ifndef KAME_LIBPFKEY_H
+#define KAME_LIBPFKEY_H
 
 #define PRIORITY_LOW        0xC0000000
 #define PRIORITY_DEFAULT    0x80000000
@@ -213,6 +213,6 @@
 
 #endif
 
-#endif /* KAMELIBPFKEY_H */
+#endif /* KAME_LIBPFKEY_H */
 
 #endif /* LIBPFKEY_H */

=== modified file 'lib/opphip/wrap_db.h'
--- lib/opphip/wrap_db.h        2010-02-11 00:11:39 +0000
+++ lib/opphip/wrap_db.h        2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef WRAP_DB_H
-#define WRAP_DB_H
+#ifndef HIP_LIB_OPPHIP_WRAP_DB_H
+#define HIP_LIB_OPPHIP_WRAP_DB_H
 
 struct hip_opp_socket_entry {
     pid_t                   pid;

=== modified file 'lib/performance/performance.h'
--- lib/performance/performance.h       2010-02-11 00:04:28 +0000
+++ lib/performance/performance.h       2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef performance_h
-#define performance_h
+#ifndef HIP_LIB_PERFORMANCE_PERFORMANCE_H
+#define HIP_LIB_PERFORMANCE_PERFORMANCE_H
 
 /*
  * Primitive performance measurement

=== modified file 'lib/tool/lutil.h'
--- lib/tool/lutil.h    2010-02-17 10:57:25 +0000
+++ lib/tool/lutil.h    2010-02-17 13:08:39 +0000
@@ -7,8 +7,8 @@
  * @note    Distributed under
  * <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>.
  */
-#ifndef LIBINET6_UTIL_H
-#define LIBINET6_UTIL_H
+#ifndef HIP_LIB_TOOL_LUTIL_H
+#define HIP_LIB_TOOL_LUTIL_H
 
 #ifdef HAVE_CONFIG_H
   #include "config.h"
@@ -81,4 +81,4 @@
  */
 void extractsubstrings(char *string, List *list);
 
-#endif
+#endif /* HIP_LIB_TOOL_LUTIL_H */

=== modified file 'lib/tool/nlink.h'
--- lib/tool/nlink.h    2010-02-17 10:57:25 +0000
+++ lib/tool/nlink.h    2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_NLINK_H
-#define HIP_NLINK_H
+#ifndef HIP_LIB_TOOL_NLINK_H
+#define HIP_LIB_TOOL_NLINK_H
 
 #include <stdio.h>
 #include <stdint.h>
@@ -111,4 +111,4 @@
                     char *name, const unsigned char *key,
                     int key_len, int max);
 
-#endif /* HIP_NLINK_H */
+#endif /* HIP_LIB_TOOL_NLINK_H */

=== modified file 'lib/tool/pk.h'
--- lib/tool/pk.h       2010-02-16 21:54:14 +0000
+++ lib/tool/pk.h       2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_PK_H
-#define HIP_PK_H
+#ifndef HIP_LIB_TOOL_PK_H
+#define HIP_LIB_TOOL_PK_H
 
 #include "hipd/hidb.h"
 #include "lib/core/crypto.h"
@@ -10,4 +10,4 @@
 int hip_rsa_sign(void *peer_pub, struct hip_common *msg);
 int bn2bin_safe(const BIGNUM *a, unsigned char *to, int len);
 
-#endif /* HIP_PK_H */
+#endif /* HIP_LIB_TOOL_PK_H */

=== modified file 'lib/tool/xfrmapi.h'
--- lib/tool/xfrmapi.h  2010-02-11 00:01:07 +0000
+++ lib/tool/xfrmapi.h  2010-02-17 13:08:39 +0000
@@ -3,8 +3,8 @@
  * management of IPsec SAs and BEET API is for management of
  * HIT<->SPI,IP mappings.
  */
-#ifndef HIP_BEET_H
-#define HIP_BEET_H
+#ifndef HIP_LIB_TOOL_XFRMAPI_H
+#define HIP_LIB_TOOL_XFRMAPI_H
 
 #include <time.h>
 #include <netdb.h>
@@ -88,4 +88,4 @@
 int hip_setup_default_sp_prefix_pair(void);
 
 
-#endif /* HIP_BEET_H */
+#endif /* HIP_LIB_TOOL_XFRMAPI_H */

=== modified file 'test/conntest.h'
--- test/conntest.h     2010-02-10 23:43:06 +0000
+++ test/conntest.h     2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef CONNTEST_H
-#define CONNTEST_H
+#ifndef HIP_TEST_CONNTEST_H
+#define HIP_TEST_CONNTEST_H
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -30,4 +30,4 @@
                     int hints);
 int main_client_native(int socktype, char *peer_name, char *peer_port_name);
 
-#endif /* CONNTEST_H */
+#endif /* HIP_TEST_CONNTEST_H */

=== modified file 'test/first_test.h'
--- test/first_test.h   2010-02-16 21:54:14 +0000
+++ test/first_test.h   2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIP_FIRST_TEST_H
-#define HIP_FIRST_TEST_H
+#ifndef HIP_TEST_FIRST_TEST_H
+#define HIP_TEST_FIRST_TEST_H
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -12,4 +12,4 @@
 
 #define DEFAULT_PORT 1111
 
-#endif /*HIP_FIRST_TEST_H*/
+#endif /*HIP_TEST_FIRST_TEST_H*/

=== modified file 'test/hipsetup.h'
--- test/hipsetup.h     2010-01-19 09:28:42 +0000
+++ test/hipsetup.h     2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef HIPSETUPNEW_H
-#define HIPSETUPNEW_H
+#ifndef HIP_TEST_HIPSETUP_H
+#define HIP_TEST_HIPSETUP_H
 
 #include "lib/core/protodefs.h"
 
@@ -9,4 +9,4 @@
 void init_deamon(void);
 
 
-#endif /*HIPSETUPNEW_H*/
+#endif /*HIP_TEST_HIPSETUP_H*/

=== modified file 'test/misc_install.h'
--- test/misc_install.h 2010-02-16 21:54:14 +0000
+++ test/misc_install.h 2010-02-17 13:08:39 +0000
@@ -1,5 +1,5 @@
-#ifndef MISC_INSTALL_H
-#define MISC_INSTALL_H
+#ifndef HIP_TEST_MISC_INSTALL_H
+#define HIP_TEST_MISC_INSTALL_H
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -14,4 +14,4 @@
 int add_hi_default(struct hip_common *msg);
 int main_install(struct hip_common *msg);
 
-#endif /*MISC_INSTALL_H*/
+#endif /*HIP_TEST_MISC_INSTALL_H*/

Other related posts:

  • » [hipl-commit] [trunk] Rev 3660: Unified all header file declarations with sed and scripting. - Miika Komu