From: Jan Pospíšil <honik@ntc.zcu.cz>
Date: Thu, 9 Aug 2007 11:14:56 +0000 (+0000)
Subject: compatibility issue: avoid double uderscore at the beginning of symbol names (__GLITE... 
X-Git-Tag: glite-yaim-lb_R_4_0_0_3~2
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=d44bf8aca1e8fa2bd4d3ea626378e7f004a48678;p=jra1mw.git

compatibility issue: avoid double uderscore at the beginning of symbol names (__GLITE* etc.)
---

diff --git a/org.glite.jp.common/interface/attr.h b/org.glite.jp.common/interface/attr.h
index 6badff7..b8c559f 100644
--- a/org.glite.jp.common/interface/attr.h
+++ b/org.glite.jp.common/interface/attr.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_JP_ATTR
-#define __GLITE_JP_ATTR
+#ifndef GLITE_JP_ATTR_H
+#define GLITE_JP_ATTR_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -29,4 +29,4 @@ char * glite_jp_time2attr(time_t);
 #endif
 
 
-#endif
+#endif /* GLITE_JP_ATTR_H */
diff --git a/org.glite.jp.common/interface/context.h b/org.glite.jp.common/interface/context.h
index 75a71a3..4203f56 100644
--- a/org.glite.jp.common/interface/context.h
+++ b/org.glite.jp.common/interface/context.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_JP_CONTEXT
-#define __GLITE_JP_CONTEXT
+#ifndef GLITE_JP_CONTEXT_H
+#define GLITE_JP_CONTEXT_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -23,4 +23,4 @@ int glite_jp_run_deferred(glite_jp_context_t);
 };
 #endif
 
-#endif
+#endif /* GLITE_JP_CONTEXT_H */
diff --git a/org.glite.jp.common/interface/known_attr.h b/org.glite.jp.common/interface/known_attr.h
index b3c80ad..8876831 100644
--- a/org.glite.jp.common/interface/known_attr.h
+++ b/org.glite.jp.common/interface/known_attr.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_JP_KNOWN_ATTR
-#define __GLITE_JP_KNOWN_ATTR
+#ifndef GLITE_JP_KNOWN_ATTR_H
+#define GLITE_JP_KNOWN_ATTR_H
 
 /** Namespace of JP system attributes */
 #define GLITE_JP_SYSTEM_NS	"http://egee.cesnet.cz/en/Schema/JP/System"
@@ -38,4 +38,4 @@
 #define GLITE_JP_ISB_CONTENT_NS     GLITE_JP_ISB_NS ":content"
 #define GLITE_JP_OSB_CONTENT_NS     GLITE_JP_OSB_NS ":content"
 
-#endif
+#endif /* GLITE_JP_KNOWN_ATTR_H */
diff --git a/org.glite.jp.common/interface/type_plugin.h b/org.glite.jp.common/interface/type_plugin.h
index 8630be3..d3fffd2 100644
--- a/org.glite.jp.common/interface/type_plugin.h
+++ b/org.glite.jp.common/interface/type_plugin.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_JP_TYPEPLUGIN
-#define __GLITE_JP_TYPEPLUGIN
+#ifndef GLITE_JP_TYPEPLUGIN_H
+#define GLITE_JP_TYPEPLUGIN_H
 
 typedef struct _glite_jp_tplug_data_t {
 	
@@ -71,4 +71,4 @@ typedef int (*glite_jp_tplug_init_t)(
 	glite_jp_tplug_data_t	*plugin_data
 );
 
-#endif
+#endif /* GLITE_JP_TYPEPLUGIN_H */
diff --git a/org.glite.jp.common/interface/types.h b/org.glite.jp.common/interface/types.h
index e4208c1..8aaaaae 100644
--- a/org.glite.jp.common/interface/types.h
+++ b/org.glite.jp.common/interface/types.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_JP_TYPES
-#define __GLITE_JP_TYPES
+#ifndef GLITE_JP_TYPES_H
+#define GLITE_JP_TYPES_H
 
 #include <sys/time.h>
 
@@ -63,4 +63,4 @@ typedef struct {
 	glite_jp_attr_orig_t origin;
 } glite_jp_query_rec_t;
 
-#endif
+#endif /* GLITE_JP_TYPES_H */
diff --git a/org.glite.jp.primary/interface/file_plugin.h b/org.glite.jp.primary/interface/file_plugin.h
index f322d4d..eea7d05 100644
--- a/org.glite.jp.primary/interface/file_plugin.h
+++ b/org.glite.jp.primary/interface/file_plugin.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_JP_FILEPLUGIN
-#define __GLITE_JP_FILEPLUGIN
+#ifndef GLITE_JP_FILEPLUGIN_H
+#define GLITE_JP_FILEPLUGIN_H
 
 /** Methods of the file plugin. */
 
@@ -83,4 +83,4 @@ int glite_jpps_fplug_load(glite_jp_context_t ctx,int argc,char **argv);
 int glite_jpps_fplug_lookup(glite_jp_context_t ctx,const char *uri, glite_jpps_fplug_data_t ***plugin_data);
 int glite_jpps_fplug_lookup_byclass(glite_jp_context_t, const char *class,glite_jpps_fplug_data_t ***plugin_data);
 
-#endif
+#endif /* GLITE_JP_FILEPLUGIN_H */
diff --git a/org.glite.jp.primary/src/backend.h b/org.glite.jp.primary/src/backend.h
index 91e2ad2..8ca7064 100644
--- a/org.glite.jp.primary/src/backend.h
+++ b/org.glite.jp.primary/src/backend.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_JP_BACKEND
-#define __GLITE_JP_BACKEND
+#ifndef GLITE_JP_BACKEND_H
+#define GLITE_JP_BACKEND_H
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -160,4 +160,4 @@ int glite_jppsbe_read_feeds(
 	glite_jp_context_t ctx
 );
 
-#endif
+#endif /* GLITE_JP_BACKEND_H */
diff --git a/org.glite.jp.primary/src/feed.h b/org.glite.jp.primary/src/feed.h
index 05d64f5..57b3361 100644
--- a/org.glite.jp.primary/src/feed.h
+++ b/org.glite.jp.primary/src/feed.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_JP_FEED
-#define __GLITE_JP_FEED
+#ifndef GLITE_JP_FEED_H
+#define GLITE_JP_FEED_H
 
 
 struct jpfeed {
@@ -33,5 +33,4 @@ int glite_jpps_match_tag(glite_jp_context_t,const char *,const char *,const char
 int glite_jpps_run_feed(glite_jp_context_t,const char *,char const * const *,const glite_jp_query_rec_t *,int,char **);
 int glite_jpps_register_feed(glite_jp_context_t,const char *,char const * const *,const glite_jp_query_rec_t *,char **,time_t *);
 
-#endif
-
+#endif /* GLITE_JP_FEED_H */
diff --git a/org.glite.jp.primary/src/utils.h b/org.glite.jp.primary/src/utils.h
index b350ada..742098a 100644
--- a/org.glite.jp.primary/src/utils.h
+++ b/org.glite.jp.primary/src/utils.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_JP_UTILS
-#define __GLITE_JP_UTILS
+#ifndef GLITE_JP_UTILS_H
+#define GLITE_JP_UTILS_H
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -24,5 +24,4 @@ char* glite_jpps_get_namespace(
 	const char* attr
 );
 
-#endif
-
+#endif /* GLITE_JP_UTILS_H */
diff --git a/org.glite.lb.client/interface/Job.h b/org.glite.lb.client/interface/Job.h
index 3b26139..e0c878f 100644
--- a/org.glite.lb.client/interface/Job.h
+++ b/org.glite.lb.client/interface/Job.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_JOB_HPP__
-#define __GLITE_LB_JOB_HPP__
+#ifndef GLITE_LB_JOB_HPP
+#define GLITE_LB_JOB_HPP
 
 #ident "$Header$"
 
@@ -189,4 +189,4 @@ private:
 
 EWL_END_NAMESPACE
 
-#endif /* __GLITE_LB_JOB_HPP__ */
+#endif /* GLITE_LB_JOB_HPP */
diff --git a/org.glite.lb.client/interface/JobStatus.h.T b/org.glite.lb.client/interface/JobStatus.h.T
index 3c043e7..08e09fd 100644
--- a/org.glite.lb.client/interface/JobStatus.h.T
+++ b/org.glite.lb.client/interface/JobStatus.h.T
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_JOBSTATUS_HPP__
-#define __GLITE_LB_JOBSTATUS_HPP__
+#ifndef GLITE_LB_JOBSTATUS_HPP
+#define GLITE_LB_JOBSTATUS_HPP
 
 /*
 @@@AUTO
@@ -285,4 +285,4 @@ private:
 
 EWL_END_NAMESPACE;
 
-#endif /* __GLITE_LB_JOBSTATUS_HPP__ */
+#endif /* GLITE_LB_JOBSTATUS_HPP */
diff --git a/org.glite.lb.client/interface/Notification.h b/org.glite.lb.client/interface/Notification.h
index 876372e..8a0094b 100644
--- a/org.glite.lb.client/interface/Notification.h
+++ b/org.glite.lb.client/interface/Notification.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_NOTIFICATION_HPP__
-#define __GLITE_LB_NOTIFICATION_HPP__
+#ifndef GLITE_LB_NOTIFICATION_HPP
+#define GLITE_LB_NOTIFICATION_HPP
 
 
 #include "glite/wmsutils/jobid/JobId.h"
@@ -93,4 +93,4 @@ private:
 
 EWL_END_NAMESPACE
 
-#endif /* __GLITE_LB_NOTIFICATION_HPP__ */
+#endif /* GLITE_LB_NOTIFICATION_HPP */
diff --git a/org.glite.lb.client/interface/ServerConnection.h b/org.glite.lb.client/interface/ServerConnection.h
index 41112fb..8287a8d 100644
--- a/org.glite.lb.client/interface/ServerConnection.h
+++ b/org.glite.lb.client/interface/ServerConnection.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_SERVERCONNECTION_HPP__
-#define __GLITE_LB_SERVERCONNECTION_HPP__
+#ifndef GLITE_LB_SERVERCONNECTION_HPP
+#define GLITE_LB_SERVERCONNECTION_HPP
 
 #ident "$Header$"
 
@@ -732,4 +732,4 @@ private:
 
 EWL_END_NAMESPACE
 
-#endif /* __GLITE_LB_SERVERCONNECTION_HPP__ */
+#endif /* GLITE_LB_SERVERCONNECTION_HPP */
diff --git a/org.glite.lb.client/interface/connection.h b/org.glite.lb.client/interface/connection.h
index ba23adf..29350e3 100644
--- a/org.glite.lb.client/interface/connection.h
+++ b/org.glite.lb.client/interface/connection.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_CONNECTION_H__
-#define __GLITE_LB_CONNECTION_H__
+#ifndef GLITE_LB_CONNECTION_H
+#define GLITE_LB_CONNECTION_H
 
 #ident "$Header$"
 
@@ -21,4 +21,4 @@ int CloseConnection(edg_wll_Context ctx, int* conn_index);
 #define PROXY_CONNECT_RETRY 10 /* ms */
 
 
-#endif /* __GLITE_LB_CONNECTION_H__ */
+#endif /* GLITE_LB_CONNECTION_H */
diff --git a/org.glite.lb.client/interface/consumer.h b/org.glite.lb.client/interface/consumer.h
index 3561388..5420bcb 100644
--- a/org.glite.lb.client/interface/consumer.h
+++ b/org.glite.lb.client/interface/consumer.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_CONSUMER_H__
-#define __GLITE_LB_CONSUMER_H__
+#ifndef GLITE_LB_CONSUMER_H
+#define GLITE_LB_CONSUMER_H
 
 /*!
  * \file consumer.h
@@ -334,4 +334,4 @@ extern int set_server_name_and_port(
 }
 #endif
 
-#endif /* __GLITE_LB_CONSUMER_H__ */
+#endif /* GLITE_LB_CONSUMER_H */
diff --git a/org.glite.lb.client/interface/consumer_fake.h b/org.glite.lb.client/interface/consumer_fake.h
index f71c6f4..4bbcbcf 100644
--- a/org.glite.lb.client/interface/consumer_fake.h
+++ b/org.glite.lb.client/interface/consumer_fake.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_CONSUMER_FAKE_H__
-#define __GLITE_LB_CONSUMER_FAKE_H__
+#ifndef GLITE_LB_CONSUMER_FAKE_H
+#define GLITE_LB_CONSUMER_FAKE_H
 
 /* 
  * fake implementation of the consumer API 
@@ -23,4 +23,4 @@ void edg_wll_UnregisterTestQueryListener();
 }
 #endif
 
-#endif /* __GLITE_LB_CONSUMER_FAKE_H__ */
+#endif /* GLITE_LB_CONSUMER_FAKE_H */
diff --git a/org.glite.lb.client/interface/notification.h b/org.glite.lb.client/interface/notification.h
index 24f6681..5033733 100644
--- a/org.glite.lb.client/interface/notification.h
+++ b/org.glite.lb.client/interface/notification.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_NOTIFICATION_H__
-#define __GLITE_LB_NOTIFICATION_H__
+#ifndef GLITE_LB_NOTIFICATION_H
+#define GLITE_LB_NOTIFICATION_H
 
 #ident "$Header$"
 
@@ -166,4 +166,4 @@ int edg_wll_NotifCloseFd(
 }
 #endif
 
-#endif /* __GLITE_LB_NOTIFICATION_H__ */
+#endif /* GLITE_LB_NOTIFICATION_H */
diff --git a/org.glite.lb.client/interface/prod_proto.h b/org.glite.lb.client/interface/prod_proto.h
index f8f7350..9014259 100644
--- a/org.glite.lb.client/interface/prod_proto.h
+++ b/org.glite.lb.client/interface/prod_proto.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_PROD_PROTO_H__
-#define __GLITE_LB_PROD_PROTO_H__
+#ifndef GLITE_LB_PROD_PROTO_H
+#define GLITE_LB_PROD_PROTO_H
 
 #ident "$Header$"
 
@@ -118,4 +118,4 @@ int edg_wll_log_direct_read(edg_wll_Context ctx, edg_wll_GssConnection *conn);
 }
 #endif
 
-#endif /* __GLITE_LB_PROD_PROTO_H__ */
+#endif /* GLITE_LB_PROD_PROTO_H */
diff --git a/org.glite.lb.client/interface/producer.h.T b/org.glite.lb.client/interface/producer.h.T
index d7cb760..972f3fd 100644
--- a/org.glite.lb.client/interface/producer.h.T
+++ b/org.glite.lb.client/interface/producer.h.T
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_PRODUCER_H__
-#define __GLITE_LB_PRODUCER_H__
+#ifndef GLITE_LB_PRODUCER_H
+#define GLITE_LB_PRODUCER_H
 
 /**
  * \file producer.h
@@ -358,4 +358,4 @@ extern int edg_wll_ChangeACL(
 }
 #endif
 
-#endif /* __GLITE_LB_PRODUCER_H__ */
+#endif /* GLITE_LB_PRODUCER_H */
diff --git a/org.glite.lb.client/interface/producer_fake.h b/org.glite.lb.client/interface/producer_fake.h
index 0d13404..c06adb8 100644
--- a/org.glite.lb.client/interface/producer_fake.h
+++ b/org.glite.lb.client/interface/producer_fake.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_PRODUCER_FAKE_H__
-#define __GLITE_LB_PRODUCER_FAKE_H
+#ifndef GLITE_LB_PRODUCER_FAKE_H
+#define GLITE_LB_PRODUCER_FAKE_H
 
 /* 
  * fake implementation of the producer API
@@ -22,4 +22,4 @@ void edg_wll_UnregisterTestLoggingProxy();
 }
 #endif
 
-#endif /* __GLITE_LB_PRODUCER_FAKE_H__ */
+#endif /* GLITE_LB_PRODUCER_FAKE_H */
diff --git a/org.glite.lb.client/interface/statistics.h b/org.glite.lb.client/interface/statistics.h
index 4f26639..d5539e6 100644
--- a/org.glite.lb.client/interface/statistics.h
+++ b/org.glite.lb.client/interface/statistics.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_STATISTICS_H__
-#define __GLITE_LB_STATISTICS_H__
+#ifndef GLITE_LB_STATISTICS_H
+#define GLITE_LB_STATISTICS_H
 
 #include "glite/lb/consumer.h"
 
@@ -53,4 +53,4 @@ int edg_wll_StateDuration(
 }
 #endif
 
-#endif /* __GLITE_LB_CONSUMER_H__ */
+#endif /* GLITE_LB_CONSUMER_H */
diff --git a/org.glite.lb.common/interface/CountRef.h b/org.glite.lb.common/interface/CountRef.h
index 01cf974..d91fa01 100644
--- a/org.glite.lb.common/interface/CountRef.h
+++ b/org.glite.lb.common/interface/CountRef.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_COUNT_REF_HPP__
-#define __GLITE_LB_COUNT_REF_HPP__
+#ifndef GLITE_LB_COUNT_REF_HPP
+#define GLITE_LB_COUNT_REF_HPP
 
 /**
  * Switching into glite.lb namespace (couple with EWL_END_NAMESPACE).
@@ -77,4 +77,4 @@ void CountRef<T>::use(void)
 
 EWL_END_NAMESPACE
 
-#endif /* __GLITE_LB_COUNT_REF_HPP__ */
+#endif /* GLITE_LB_COUNT_REF_HPP */
diff --git a/org.glite.lb.common/interface/Event.h.T b/org.glite.lb.common/interface/Event.h.T
index 2a53264..db4c13f 100644
--- a/org.glite.lb.common/interface/Event.h.T
+++ b/org.glite.lb.common/interface/Event.h.T
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_EVENT_HPP__
-#define __GLITE_LB_EVENT_HPP__
+#ifndef GLITE_LB_EVENT_HPP
+#define GLITE_LB_EVENT_HPP
 
 
 #ident "$Header$"
@@ -274,4 +274,4 @@ private:
 
 EWL_END_NAMESPACE
 
-#endif /* __GLITE_LB_EVENT_HPP__ */
+#endif /* GLITE_LB_EVENT_HPP */
diff --git a/org.glite.lb.common/interface/LoggingExceptions.h b/org.glite.lb.common/interface/LoggingExceptions.h
index dde19da..b6d6493 100644
--- a/org.glite.lb.common/interface/LoggingExceptions.h
+++ b/org.glite.lb.common/interface/LoggingExceptions.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_LOGGING_EXCEPTIONS_HPP__
-#define __GLITE_LB_LOGGING_EXCEPTIONS_HPP__
+#ifndef GLITE_LB_LOGGING_EXCEPTIONS_HPP
+#define GLITE_LB_LOGGING_EXCEPTIONS_HPP
 
 #ident "$Header$"
 
@@ -276,4 +276,4 @@ public:
 
 EWL_END_NAMESPACE
 
-#endif /* __GLITE_LB_LOGGING_EXCEPTIONS_HPP__ */
+#endif /* GLITE_LB_LOGGING_EXCEPTIONS_HPP */
diff --git a/org.glite.lb.common/interface/authz.h b/org.glite.lb.common/interface/authz.h
index 2039d4b..6c67fa3 100644
--- a/org.glite.lb.common/interface/authz.h
+++ b/org.glite.lb.common/interface/authz.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_AUTHZ_H__
-#define __GLITE_LB_AUTHZ_H__
+#ifndef GLITE_LB_AUTHZ_H
+#define GLITE_LB_AUTHZ_H
 
 #ident "$Header$"
 
@@ -21,4 +21,4 @@ typedef struct _edg_wll_VomsGroups {
 }
 #endif
 
-#endif /* __GLITE_LB_AUTHZ_H__ */
+#endif /* GLITE_LB_AUTHZ_H */
diff --git a/org.glite.lb.common/interface/connpool.h b/org.glite.lb.common/interface/connpool.h
index 5c67284..2545436 100644
--- a/org.glite.lb.common/interface/connpool.h
+++ b/org.glite.lb.common/interface/connpool.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_CONNPOOL_H__
-#define __GLITE_LB_CONNPOOL_H__
+#ifndef GLITE_LB_CONNPOOL_H
+#define GLITE_LB_CONNPOOL_H
 
 #include "glite/security/glite_gss.h"
 #include "glite/lb/context.h"
@@ -98,4 +98,4 @@ edg_wll_Connections* edg_wll_initConnections();
 }
 #endif
 
-#endif /* __GLITE_LB_CONNPOOL_H__ */
+#endif /* GLITE_LB_CONNPOOL_H */
diff --git a/org.glite.lb.common/interface/context-int.h b/org.glite.lb.common/interface/context-int.h
index fdaef85..0505ced 100644
--- a/org.glite.lb.common/interface/context-int.h
+++ b/org.glite.lb.common/interface/context-int.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_CONTEXT_INT_H__
-#define __GLITE_LB_CONTEXT_INT_H__
+#ifndef GLITE_LB_CONTEXT_INT_H
+#define GLITE_LB_CONTEXT_INT_H
 
 #ident "$Header$"
 
@@ -177,4 +177,4 @@ extern void edg_wll_FreeParams(edg_wll_Context context);
 }
 #endif
 
-#endif /* __GLITE_LB_CONTEXT_INT_H__ */
+#endif /* GLITE_LB_CONTEXT_INT_H */
diff --git a/org.glite.lb.common/interface/context.h b/org.glite.lb.common/interface/context.h
index d306dc6..41ac6cb 100644
--- a/org.glite.lb.common/interface/context.h
+++ b/org.glite.lb.common/interface/context.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_CONTEXT_H__
-#define __GLITE_LB_CONTEXT_H__
+#ifndef GLITE_LB_CONTEXT_H
+#define GLITE_LB_CONTEXT_H
 
 /**
  * \file context.h
@@ -275,4 +275,4 @@ int edg_wll_GetLoggingJob(
 }
 #endif
 
-#endif /* __GLITE_LB_CONTEXT_H__ */
+#endif /* GLITE_LB_CONTEXT_H */
diff --git a/org.glite.lb.common/interface/escape.h b/org.glite.lb.common/interface/escape.h
index acaea56..5d4c603 100644
--- a/org.glite.lb.common/interface/escape.h
+++ b/org.glite.lb.common/interface/escape.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_ESCAPE_H__
-#define __GLITE_LB_ESCAPE_H__
+#ifndef GLITE_LB_ESCAPE_H
+#define GLITE_LB_ESCAPE_H
 /*!
  * \file Client/escape.h
  * \brief Prototypes for Client/escape.c
@@ -57,4 +57,4 @@ char *edg_wll_UnescapeXML(const char *);
 
 char *edg_wll_EscapeSQL(const char *);
 
-#endif /* __GLITE_LB_ESCAPE_H__ */
+#endif /* GLITE_LB_ESCAPE_H */
diff --git a/org.glite.lb.common/interface/events.h.T b/org.glite.lb.common/interface/events.h.T
index 65afcc8..76aea37 100644
--- a/org.glite.lb.common/interface/events.h.T
+++ b/org.glite.lb.common/interface/events.h.T
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_EVENTS_H__
-#define __GLITE_LB_EVENTS_H__
+#ifndef GLITE_LB_EVENTS_H
+#define GLITE_LB_EVENTS_H
 
 /**
  * \file events.h
@@ -425,4 +425,4 @@ enum edg_wll_UserIdType {
 }
 #endif
 
-#endif /* __GLITE_LB_EVENTS_H__ */
+#endif /* GLITE_LB_EVENTS_H */
diff --git a/org.glite.lb.common/interface/events_parse.h b/org.glite.lb.common/interface/events_parse.h
index 35e2d89..acc147c 100644
--- a/org.glite.lb.common/interface/events_parse.h
+++ b/org.glite.lb.common/interface/events_parse.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_EVENTS_PARSE_H__
-#define __GLITE_LB_EVENTS_PARSE_H__
+#ifndef GLITE_LB_EVENTS_PARSE_H
+#define GLITE_LB_EVENTS_PARSE_H
 
 #ident "$Header$"
 
@@ -94,4 +94,4 @@ extern edg_wll_LogLine edg_wll_UnparseNotifEvent(
 #endif
 
 
-#endif /* __GLITE_LB_EVENTS_PARSE_H__ */
+#endif /* GLITE_LB_EVENTS_PARSE_H */
diff --git a/org.glite.lb.common/interface/il_msg.h b/org.glite.lb.common/interface/il_msg.h
index 73d4c12..5ecd41e 100644
--- a/org.glite.lb.common/interface/il_msg.h
+++ b/org.glite.lb.common/interface/il_msg.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_IL_MSG_H__
-#define __GLITE_LB_IL_MSG_H__
+#ifndef GLITE_LB_IL_MSG_H
+#define GLITE_LB_IL_MSG_H
 
 #include "glite/lb/il_string.h"
 
@@ -50,4 +50,4 @@ enum {
   LB_TIME  = 900
 };
 
-#endif /* __GLITE_LB_IL_MSG_H__ */
+#endif /* GLITE_LB_IL_MSG_H */
diff --git a/org.glite.lb.common/interface/il_string.h b/org.glite.lb.common/interface/il_string.h
index 2d91521..75fdb5d 100644
--- a/org.glite.lb.common/interface/il_string.h
+++ b/org.glite.lb.common/interface/il_string.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_NET_STRING_H__
-#define __GLITE_LB_NET_STRING_H__
+#ifndef GLITE_LB_NET_STRING_H
+#define GLITE_LB_NET_STRING_H
 
 #ident "$Header$"
 
@@ -19,4 +19,4 @@ char *get_string(char *p, il_octet_string_t *s);
 int len_string(il_octet_string_t *s);
 int len_int(int d);
 
-#endif /* __GLITE_LB_NET_STRING_H__ */
+#endif /* GLITE_LB_NET_STRING_H */
diff --git a/org.glite.lb.common/interface/jobstat.h.T b/org.glite.lb.common/interface/jobstat.h.T
index 614ad02..5ca99d8 100644
--- a/org.glite.lb.common/interface/jobstat.h.T
+++ b/org.glite.lb.common/interface/jobstat.h.T
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_JOBSTAT_H__
-#define __GLITE_LB_JOBSTAT_H__
+#ifndef GLITE_LB_JOBSTAT_H
+#define GLITE_LB_JOBSTAT_H
 
 /*!
  * \file jobstat.h  
@@ -168,4 +168,4 @@ extern char *edg_wll_StatToString(edg_wll_JobStatCode);
 }
 #endif
 
-#endif /* __GLITE_LB_JOBSTAT_H__ */
+#endif /* GLITE_LB_JOBSTAT_H */
diff --git a/org.glite.lb.common/interface/lb_maildir.h b/org.glite.lb.common/interface/lb_maildir.h
index 0f599e8..49c5175 100644
--- a/org.glite.lb.common/interface/lb_maildir.h
+++ b/org.glite.lb.common/interface/lb_maildir.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_MAILDIR_H__
-#define __GLITE_LB_MAILDIR_H__
+#ifndef GLITE_LB_MAILDIR_H
+#define GLITE_LB_MAILDIR_H
 
 /*
  * Functions for reading and writing messages via
@@ -21,4 +21,4 @@ extern int edg_wll_MaildirRetryTransStart(const char *, time_t, time_t, char **,
 extern int edg_wll_MaildirTransStart(const char *, char **, char **);
 extern int edg_wll_MaildirTransEnd(const char *, char *, int);
 
-#endif /* __GLITE_LB_MAILDIR_H__ */
+#endif /* GLITE_LB_MAILDIR_H */
diff --git a/org.glite.lb.common/interface/lb_perftest.h b/org.glite.lb.common/interface/lb_perftest.h
index d40bf53..eb6c748 100644
--- a/org.glite.lb.common/interface/lb_perftest.h
+++ b/org.glite.lb.common/interface/lb_perftest.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_PERFTEST_H__
-#define __GLITE_LB_PERFTEST_H__ 
+#ifndef GLITE_LB_PERFTEST_H
+#define GLITE_LB_PERFTEST_H 
 
 #ident "$Header$"
 
@@ -40,4 +40,4 @@ glite_wll_perftest_createJobId(const char *bkserver,
 			       int job_num,
 			       edg_wlc_JobId *jobid);
 
-#endif /* __GLITE_LB_PERFTEST_H__ */
+#endif /* GLITE_LB_PERFTEST_H */
diff --git a/org.glite.lb.common/interface/lb_plain_io.h b/org.glite.lb.common/interface/lb_plain_io.h
index 3b9bad8..1043d53 100644
--- a/org.glite.lb.common/interface/lb_plain_io.h
+++ b/org.glite.lb.common/interface/lb_plain_io.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_PLAIN_IO_H__
-#define __GLITE_LB_PLAIN_IO_H__
+#ifndef GLITE_LB_PLAIN_IO_H
+#define GLITE_LB_PLAIN_IO_H
 
 
 #ifdef __cplusplus
@@ -43,4 +43,4 @@ int edg_wll_plain_write_full(
 } 
 #endif
 	
-#endif /* __GLITE_LB_PLAIN_IO_H__ */
+#endif /* GLITE_LB_PLAIN_IO_H */
diff --git a/org.glite.lb.common/interface/log_proto.h b/org.glite.lb.common/interface/log_proto.h
index cd67dfe..a9646cc 100644
--- a/org.glite.lb.common/interface/log_proto.h
+++ b/org.glite.lb.common/interface/log_proto.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_LOG_PROTO_H__
-#define __GLITE_LB_LOG_PROTO_H__
+#ifndef GLITE_LB_LOG_PROTO_H
+#define GLITE_LB_LOG_PROTO_H
 
 #ident "$Header$"
 
@@ -90,4 +90,4 @@ edg_wll_log_event_send(
 	struct timeval     *timeout);
 
 
-#endif /* __GLITE_LB_LOG_PROTO_H__ */
+#endif /* GLITE_LB_LOG_PROTO_H */
diff --git a/org.glite.lb.common/interface/mini_http.h b/org.glite.lb.common/interface/mini_http.h
index 4ceed7c..92ee170 100644
--- a/org.glite.lb.common/interface/mini_http.h
+++ b/org.glite.lb.common/interface/mini_http.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_MINI_HTTP_H__
-#define __GLITE_LB_MINI_HTTP_H__
+#ifndef GLITE_LB_MINI_HTTP_H
+#define GLITE_LB_MINI_HTTP_H
 
 #ident "$Header$"
 
@@ -60,4 +60,4 @@ extern edg_wll_ErrorCode edg_wll_http_send_proxy(
 	const char *		/* IN: message body */
 );
 
-#endif /* __GLITE_LB_MINI_HTTP_H__ */
+#endif /* GLITE_LB_MINI_HTTP_H */
diff --git a/org.glite.lb.common/interface/notif_rec.h b/org.glite.lb.common/interface/notif_rec.h
index 7a4b4a3..f2869c3 100644
--- a/org.glite.lb.common/interface/notif_rec.h
+++ b/org.glite.lb.common/interface/notif_rec.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_NOTIF_REC_H__
-#define __GLITE_LB_NOTIF_REC_H__
+#ifndef GLITE_LB_NOTIF_REC_H
+#define GLITE_LB_NOTIF_REC_H
 
 #ident "$Header$"
 
@@ -24,4 +24,4 @@ typedef enum _edg_wll_NotifChangeOp {
 }
 #endif
 
-#endif /* __GLITE_LB_NOTIF_REC_H__ */
+#endif /* GLITE_LB_NOTIF_REC_H */
diff --git a/org.glite.lb.common/interface/notifid.h b/org.glite.lb.common/interface/notifid.h
index 7ec644e..a372885 100644
--- a/org.glite.lb.common/interface/notifid.h
+++ b/org.glite.lb.common/interface/notifid.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_NOTIFID_H__
-#define __GLITE_LB_NOTIFID_H__
+#ifndef GLITE_LB_NOTIFID_H
+#define GLITE_LB_NOTIFID_H
 
 #ident "$Header$"
 
@@ -93,4 +93,4 @@ edg_wll_NotifId *edg_wll_NotifIdDup(const edg_wll_NotifId src);
 }
 #endif
 
-#endif /* __GLITE_LB_NOTIFID_H__ */
+#endif /* GLITE_LB_NOTIFID_H */
diff --git a/org.glite.lb.common/interface/query_rec.h b/org.glite.lb.common/interface/query_rec.h
index 3a78172..debce8c 100644
--- a/org.glite.lb.common/interface/query_rec.h
+++ b/org.glite.lb.common/interface/query_rec.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_QUERY_REC_H__
-#define __GLITE_LB_QUERY_REC_H__
+#ifndef GLITE_LB_QUERY_REC_H
+#define GLITE_LB_QUERY_REC_H
 
 /*!
  * \file consumer.h
@@ -187,4 +187,4 @@ typedef struct {
 }
 #endif
 
-#endif /* __GLITE_LB_QUERY_REC_H__ */
+#endif /* GLITE_LB_QUERY_REC_H */
diff --git a/org.glite.lb.common/interface/timeouts.h b/org.glite.lb.common/interface/timeouts.h
index 8ab65fc..25ff258 100644
--- a/org.glite.lb.common/interface/timeouts.h
+++ b/org.glite.lb.common/interface/timeouts.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_TIMEOUTS_H__
-#define __GLITE_LB_TIMEOUTS_H__
+#ifndef GLITE_LB_TIMEOUTS_H
+#define GLITE_LB_TIMEOUTS_H
 
 /** 
  * default and maximal notif timeout (in seconds)
@@ -21,4 +21,4 @@
 #define EDG_WLL_LOG_SYNC_TIMEOUT_DEFAULT	120
 #define EDG_WLL_LOG_SYNC_TIMEOUT_MAX		600
 
-#endif /* __GLITE_LB_TIMEOUTS_H__ */
+#endif /* GLITE_LB_TIMEOUTS_H */
diff --git a/org.glite.lb.common/interface/ulm_parse.h b/org.glite.lb.common/interface/ulm_parse.h
index 945378e..48c09d6 100644
--- a/org.glite.lb.common/interface/ulm_parse.h
+++ b/org.glite.lb.common/interface/ulm_parse.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_ULM_PARSE_H__
-#define __GLITE_LB_ULM_PARSE_H__
+#ifndef GLITE_LB_ULM_PARSE_H
+#define GLITE_LB_ULM_PARSE_H
 
 #ident "$Header$"
 
@@ -44,4 +44,4 @@ extern double 	edg_wll_ULMDateToDouble( const char *s );
 void 		edg_wll_ULMDateToTimeval( const char *s, struct timeval *tv );
 extern int 	edg_wll_ULMTimevalToDate( long sec, long usec, char *dstr );
 
-#endif /* __GLITE_LB_ULM_PARSE_H__ */
+#endif /* GLITE_LB_ULM_PARSE_H */
diff --git a/org.glite.lb.common/interface/xml_conversions.h b/org.glite.lb.common/interface/xml_conversions.h
index 257aeea..45ac500 100644
--- a/org.glite.lb.common/interface/xml_conversions.h
+++ b/org.glite.lb.common/interface/xml_conversions.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_XML_CONVERSIONS_H__
-#define __GLITE_LB_XML_CONVERSIONS_H__
+#ifndef GLITE_LB_XML_CONVERSIONS_H
+#define GLITE_LB_XML_CONVERSIONS_H
 
 #ident "$Header$"
 
@@ -143,4 +143,4 @@ char *edg_wll_NotifChangeOpToString(edg_wll_NotifChangeOp notifChangeOpConst);
 } // extern "C"
 #endif
 
-#endif /* __GLITE_LB_XML_CONVERSIONS_H__ */
+#endif /* GLITE_LB_XML_CONVERSIONS_H */
diff --git a/org.glite.lb.common/interface/xml_parse.h b/org.glite.lb.common/interface/xml_parse.h
index 1e77374..038dd67 100644
--- a/org.glite.lb.common/interface/xml_parse.h
+++ b/org.glite.lb.common/interface/xml_parse.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_XML_PARSE_H__
-#define __GLITE_LB_XML_PARSE_H__
+#ifndef GLITE_LB_XML_PARSE_H
+#define GLITE_LB_XML_PARSE_H
 
 #ident "$Header$"
 
@@ -68,4 +68,4 @@ extern int edg_wll_QuerySequenceCodeToXML(edg_wll_Context ctx, edg_wlc_JobId job
 }
 #endif
 
-#endif /* __GLITE_LB_XML_PARSE_H__ */
+#endif /* GLITE_LB_XML_PARSE_H */
diff --git a/org.glite.lb.server/interface/index.h b/org.glite.lb.server/interface/index.h
index ef9fa75..01341ba 100644
--- a/org.glite.lb.server/interface/index.h
+++ b/org.glite.lb.server/interface/index.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_INDEX_H__
-#define __GLITE_LB_INDEX_H__
+#ifndef GLITE_LB_INDEX_H
+#define GLITE_LB_INDEX_H
 
 #ident "$Header$"
 
@@ -32,4 +32,4 @@ extern int	lex_line;
 #define USR_PREFIX	"USR_"
 #define TIME_PREFIX	"TIME_"
 
-#endif /* __GLITE_LB_INDEX_H__ */
+#endif /* GLITE_LB_INDEX_H */
diff --git a/org.glite.lb.server/interface/lb_authz.h b/org.glite.lb.server/interface/lb_authz.h
index aebca26..4ae1836 100644
--- a/org.glite.lb.server/interface/lb_authz.h
+++ b/org.glite.lb.server/interface/lb_authz.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_LB_AUTHZ_H__
-#define __GLITE_LB_LB_AUTHZ_H__
+#ifndef GLITE_LB_LB_AUTHZ_H
+#define GLITE_LB_LB_AUTHZ_H
 
 #ident "$Header$"
 
@@ -58,4 +58,4 @@ edg_wll_SetVomsGroups(edg_wll_Context, edg_wll_GssConnection *, char *, char *,
 extern void
 edg_wll_FreeVomsGroups(edg_wll_VomsGroups *);
 
-#endif /* __GLITE_LB_LB_AUTHZ_H__ */
+#endif /* GLITE_LB_LB_AUTHZ_H */
diff --git a/org.glite.lb.server/interface/lbs_db.h b/org.glite.lb.server/interface/lbs_db.h
index 8ffc0fa..eca2136 100644
--- a/org.glite.lb.server/interface/lbs_db.h
+++ b/org.glite.lb.server/interface/lbs_db.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_LBS_DB_H__
-#define __GLITE_LB_LBS_DB_H__
+#ifndef GLITE_LB_LBS_DB_H
+#define GLITE_LB_LBS_DB_H
 
 #ident "$Header$"
 
@@ -132,4 +132,4 @@ edg_wll_ErrorCode edg_wll_bufferedInsertClose(edg_wll_bufInsert *bi);
 }
 #endif
 
-#endif /* __GLITE_LB_LBS_DB_H__ */
+#endif /* GLITE_LB_LBS_DB_H */
diff --git a/org.glite.lb.server/interface/query.h b/org.glite.lb.server/interface/query.h
index c717b6d..9c9ba07 100644
--- a/org.glite.lb.server/interface/query.h
+++ b/org.glite.lb.server/interface/query.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_QUERY_H__
-#define __GLITE_LB_QUERY_H__
+#ifndef GLITE_LB_QUERY_H
+#define GLITE_LB_QUERY_H
 
 #ident "$Header$"
 
@@ -14,4 +14,4 @@ int match_status(edg_wll_Context, const edg_wll_JobStat *stat,const edg_wll_Quer
 
 #define NOTIF_ALL_JOBS	"all_jobs"
 
-#endif /* __GLITE_LB_QUERY_H__ */
+#endif /* GLITE_LB_QUERY_H */
diff --git a/org.glite.lb.server/interface/srv_perf.h b/org.glite.lb.server/interface/srv_perf.h
index d311859..feb315b 100644
--- a/org.glite.lb.server/interface/srv_perf.h
+++ b/org.glite.lb.server/interface/srv_perf.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_SRV_PERF_H__
-#define __GLITE_LB_SRV_PERF_H__
+#ifndef GLITE_LB_SRV_PERF_H
+#define GLITE_LB_SRV_PERF_H
 
 #ident "$Header$"
 
@@ -27,4 +27,4 @@ enum lb_srv_perf_sink {
 
 extern enum lb_srv_perf_sink sink_mode;
 
-#endif /* __GLITE_LB_SRV_PERF_H__ */
+#endif /* GLITE_LB_SRV_PERF_H */
diff --git a/org.glite.lb.server/interface/store.h b/org.glite.lb.server/interface/store.h
index 8b25900..ec08892 100644
--- a/org.glite.lb.server/interface/store.h
+++ b/org.glite.lb.server/interface/store.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_STORE_H__
-#define __GLITE_LB_STORE_H__
+#ifndef GLITE_LB_STORE_H
+#define GLITE_LB_STORE_H
 
 #ident "$Header$"
 
@@ -56,4 +56,4 @@ int edg_wll_delete_event(edg_wll_Context,const char *, int);
 }
 #endif
 
-#endif /* __GLITE_LB_STORE_H__ */
+#endif /* GLITE_LB_STORE_H */
diff --git a/org.glite.lb.server/src/get_events.h b/org.glite.lb.server/src/get_events.h
index c3e0a18..af60075 100644
--- a/org.glite.lb.server/src/get_events.h
+++ b/org.glite.lb.server/src/get_events.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_GET_EVENTS_H__
-#define __GLITE_LB_GET_EVENTS_H__
+#ifndef GLITE_LB_GET_EVENTS_H
+#define GLITE_LB_GET_EVENTS_H
 #ident "$Header$"
 
 #include "glite/lb/context.h"
@@ -38,4 +38,4 @@ void edg_wll_SortPEvents(edg_wll_Event **);
 }
 #endif
 
-#endif /* __GLITE_LB_GET_EVENTS_H__ */
+#endif /* GLITE_LB_GET_EVENTS_H */
diff --git a/org.glite.lb.server/src/il_lbproxy.h b/org.glite.lb.server/src/il_lbproxy.h
index c4b5420..53aa931 100644
--- a/org.glite.lb.server/src/il_lbproxy.h
+++ b/org.glite.lb.server/src/il_lbproxy.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_IL_LBPROXY_H__
-#define __GLITE_LB_IL_LBPROXY_H__
+#ifndef GLITE_LB_IL_LBPROXY_H
+#define GLITE_LB_IL_LBPROXY_H
 
 #include "glite/lb/context.h"
 
@@ -16,4 +16,4 @@ int edg_wll_EventSendProxy(edg_wll_Context ctx, const edg_wlc_JobId jobid, const
 }
 #endif
 
-#endif /* __GLITE_LB_IL_LBPROXY_H__ */
+#endif /* GLITE_LB_IL_LBPROXY_H */
diff --git a/org.glite.lb.server/src/il_notification.h b/org.glite.lb.server/src/il_notification.h
index da85806..b008007 100644
--- a/org.glite.lb.server/src/il_notification.h
+++ b/org.glite.lb.server/src/il_notification.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_IL_NOTIFICATION_H__
-#define __GLITE_LB_IL_NOTIFICATION_H__
+#ifndef GLITE_LB_IL_NOTIFICATION_H
+#define GLITE_LB_IL_NOTIFICATION_H
 
 #ident "$Header$"
 
@@ -96,4 +96,4 @@ edg_wll_NotifCancelRegId(edg_wll_Context context,
 }
 #endif
 
-#endif /* __GLITE_LB_IL_NOTIFICATION_H__ */
+#endif /* GLITE_LB_IL_NOTIFICATION_H */
diff --git a/org.glite.lb.server/src/jobstat.h b/org.glite.lb.server/src/jobstat.h
index 753cade..2059a1a 100644
--- a/org.glite.lb.server/src/jobstat.h
+++ b/org.glite.lb.server/src/jobstat.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_LBS_JOBSTAT_H__
-#define __GLITE_LB_LBS_JOBSTAT_H__
+#ifndef GLITE_LB_LBS_JOBSTAT_H
+#define GLITE_LB_LBS_JOBSTAT_H
 
 #ident "$Header$"
 
@@ -123,4 +123,4 @@ void init_intJobStat(intJobStat *p);
 edg_wll_ErrorCode edg_wll_GetSubjobHistogram(edg_wll_Context, edg_wlc_JobId parent_jobid, int *hist);
 edg_wll_ErrorCode edg_wll_StoreSubjobHistogram(edg_wll_Context, edg_wlc_JobId parent_jobid, intJobStat *ijs);
 
-#endif /* __GLITE_LB_LBS_JOBSTAT_H__*/
+#endif /* GLITE_LB_LBS_JOBSTAT_H*/
diff --git a/org.glite.lb.server/src/jp_job_attrs.xsl b/org.glite.lb.server/src/jp_job_attrs.xsl
index 249cadc..0df2f3d 100644
--- a/org.glite.lb.server/src/jp_job_attrs.xsl
+++ b/org.glite.lb.server/src/jp_job_attrs.xsl
@@ -8,8 +8,8 @@
 <xsl:output method="text"/>
 
 <xsl:template match="xs:schema">
-#ifndef __GLITE_LB_JP_JOB_ATTR_H
-#define __GLITE_LB_JP_JOB_ATTR_H
+#ifndef GLITE_LB_JP_JOB_ATTR_H
+#define GLITE_LB_JP_JOB_ATTR_H
 #define GLITE_JP_LB_NS "http://egee.cesnet.cz/en/Schema/LB/Attributes"
 #define GLITE_JP_LB_JDL_NS "http://egee.cesnet.cz/en/Schema/LB/Attributes:JDL"
 	<xsl:apply-templates select="xs:element"/>
diff --git a/org.glite.lb.server/src/lb_html.h b/org.glite.lb.server/src/lb_html.h
index 57c1685..ada457c 100644
--- a/org.glite.lb.server/src/lb_html.h
+++ b/org.glite.lb.server/src/lb_html.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_HTML_H__
-#define __GLITE_LB_HTML_H__
+#ifndef GLITE_LB_HTML_H
+#define GLITE_LB_HTML_H
 
 #ident "$Header$"
 
@@ -12,4 +12,4 @@ int edg_wll_JobStatusToHTML(edg_wll_Context, edg_wll_JobStat, char **);
 int edg_wll_UserJobsToHTML(edg_wll_Context, edg_wlc_JobId *, char **);
 char *edg_wll_ErrorToHTML(edg_wll_Context,int);
 
-#endif /* __GLITE_LB_HTML_H__ */
+#endif /* GLITE_LB_HTML_H */
diff --git a/org.glite.lb.server/src/lb_http.h b/org.glite.lb.server/src/lb_http.h
index c63745d..421beea 100644
--- a/org.glite.lb.server/src/lb_http.h
+++ b/org.glite.lb.server/src/lb_http.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_HTTP_H__
-#define __GLITE_LB_HTTP_H__
+#ifndef GLITE_LB_HTTP_H
+#define GLITE_LB_HTTP_H
 
 #ident "$Header$"
 
@@ -8,4 +8,4 @@
 int edg_wll_ServerHTTP(edg_wll_Context);
 int edg_wll_ServerHTTPProxy(edg_wll_Context);
 
-#endif /* __GLITE_LB_HTTP_H__ */
+#endif /* GLITE_LB_HTTP_H */
diff --git a/org.glite.lb.server/src/lb_proto.h b/org.glite.lb.server/src/lb_proto.h
index 80f75e3..614be71 100644
--- a/org.glite.lb.server/src/lb_proto.h
+++ b/org.glite.lb.server/src/lb_proto.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_PROTO_H__
-#define __GLITE_LB_PROTO_H__
+#ifndef GLITE_LB_PROTO_H
+#define GLITE_LB_PROTO_H
 
 #ident "$Header$"
 
@@ -24,4 +24,4 @@ extern edg_wll_ErrorCode edg_wll_Proto(
 
 extern char *edg_wll_HTTPErrorMessage(int);
 
-#endif /* __GLITE_LB_PROTO_H__ */
+#endif /* GLITE_LB_PROTO_H */
diff --git a/org.glite.lb.server/src/lb_xml_parse.h b/org.glite.lb.server/src/lb_xml_parse.h
index 8171c59..e924de9 100644
--- a/org.glite.lb.server/src/lb_xml_parse.h
+++ b/org.glite.lb.server/src/lb_xml_parse.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_LB_XML_PARSE_H__
-#define __GLITE_LB_LB_XML_PARSE_H__
+#ifndef GLITE_LB_LB_XML_PARSE_H
+#define GLITE_LB_LB_XML_PARSE_H
 
 #ident "$Header$"
 
@@ -42,4 +42,4 @@ int parseStatsRequest(edg_wll_Context,char *,char **,edg_wll_QueryRec ***,edg_wl
 }
 #endif
 	
-#endif /* __GLITE_LB_LB_XML_PARSE_H__ */
+#endif /* GLITE_LB_LB_XML_PARSE_H */
diff --git a/org.glite.lb.server/src/lb_xml_parse_V21.h b/org.glite.lb.server/src/lb_xml_parse_V21.h
index 0ffb29e..617ed45 100644
--- a/org.glite.lb.server/src/lb_xml_parse_V21.h
+++ b/org.glite.lb.server/src/lb_xml_parse_V21.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_LB_XML_PARSE_V21_H__
-#define __GLITE_LB_LB_XML_PARSE_V21_H__
+#ifndef GLITE_LB_LB_XML_PARSE_V21_H
+#define GLITE_LB_LB_XML_PARSE_V21_H
 
 #ident "$Header$"
 
@@ -20,4 +20,4 @@ int edg_wll_UserJobsToXMLV21(edg_wll_Context, edg_wlc_JobId *, char **);
 int edg_wll_PurgeResultToXMLV21(edg_wll_Context ctx, edg_wll_PurgeResult *result, char **message);
 int edg_wll_DumpResultToXMLV21(edg_wll_Context ctx, edg_wll_DumpResult *result, char **message);
 
-#endif /* __GLITE_LB_LB_XML_PARSE_V21_H__ */
+#endif /* GLITE_LB_LB_XML_PARSE_V21_H */
diff --git a/org.glite.lb.server/src/lock.h b/org.glite.lb.server/src/lock.h
index 1d2318a..693485c 100644
--- a/org.glite.lb.server/src/lock.h
+++ b/org.glite.lb.server/src/lock.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_LOCK_H__
-#define __GLITE_LB_LOCK_H__
+#ifndef GLITE_LB_LOCK_H
+#define GLITE_LB_LOCK_H
 
 #ident "$Header$"
 
@@ -11,4 +11,4 @@
 int edg_wll_LockUnlockJob(const edg_wll_Context,const edg_wlc_JobId,int);
 int edg_wll_JobSemaphore(const edg_wll_Context ctx, const edg_wlc_JobId job);
 
-#endif /* __GLITE_LB_LOCK_H__ */
+#endif /* GLITE_LB_LOCK_H */
diff --git a/org.glite.lb.server/src/purge.h b/org.glite.lb.server/src/purge.h
index 2904927..697acdf 100644
--- a/org.glite.lb.server/src/purge.h
+++ b/org.glite.lb.server/src/purge.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_PURGE_H__
-#define __GLITE_LB_PURGE_H__
+#ifndef GLITE_LB_PURGE_H
+#define GLITE_LB_PURGE_H
 
 #ident "$Header"
 
@@ -58,4 +58,4 @@ extern int edg_wll_CreateFileStorage(
 #define edg_wll_CreateDumpFile(ctx, f)		edg_wll_CreateFileStorage(ctx,FILE_TYPE_DUMP,NULL,f)
 #define edg_wll_CreatePurgeFile(ctx, f)		edg_wll_CreateFileStorage(ctx,FILE_TYPE_PURGE,NULL,f)
 
-#endif /* __GLITE_LB_PURGE_H__ */
+#endif /* GLITE_LB_PURGE_H */
diff --git a/org.glite.lb.server/src/server_state.h b/org.glite.lb.server/src/server_state.h
index f661b84..c3ded6d 100644
--- a/org.glite.lb.server/src/server_state.h
+++ b/org.glite.lb.server/src/server_state.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_SERVER_STATE_H__
-#define __GLITE_LB_SERVER_STATE_H__
+#ifndef GLITE_LB_SERVER_STATE_H
+#define GLITE_LB_SERVER_STATE_H
 
 #ident "$Header$"
 
@@ -9,4 +9,4 @@
 int edg_wll_GetServerState(edg_wll_Context,const char *,char **);
 int edg_wll_SetServerState(edg_wll_Context,const char *,const char *);
 
-#endif /* __GLITE_LB_SERVER_STATE_H__ */
+#endif /* GLITE_LB_SERVER_STATE_H */
diff --git a/org.glite.lb.server/src/stats.h b/org.glite.lb.server/src/stats.h
index a32c738..05d79e7 100644
--- a/org.glite.lb.server/src/stats.h
+++ b/org.glite.lb.server/src/stats.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_STATS_H__
-#define __GLITE_LB_STATS_H__
+#ifndef GLITE_LB_STATS_H
+#define GLITE_LB_STATS_H
 
 #ident "$Header$"
 
@@ -74,4 +74,4 @@ int edg_wll_StateDurationServer(
 	int	*res_to
 );
 
-#endif /* __GLITE_LB_STATS_H__ */
+#endif /* GLITE_LB_STATS_H */
diff --git a/org.glite.lb.server/src/ws_fault.h b/org.glite.lb.server/src/ws_fault.h
index 9120fca..e6988e8 100644
--- a/org.glite.lb.server/src/ws_fault.h
+++ b/org.glite.lb.server/src/ws_fault.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_WS_FAULT_H__
-#define __GLITE_LB_WS_FAULT_H__
+#ifndef GLITE_LB_WS_FAULT_H
+#define GLITE_LB_WS_FAULT_H
 
 #ident "$Header$"
 
@@ -8,4 +8,4 @@
 extern void edg_wll_ErrToFault(const edg_wll_Context, struct soap *);
 extern void edg_wll_FaultToErr(const struct soap *, edg_wll_Context);
 
-#endif /* __GLITE_LB_WS_FAULT_H__ */
+#endif /* GLITE_LB_WS_FAULT_H */
diff --git a/org.glite.lb.server/src/ws_typemap.h b/org.glite.lb.server/src/ws_typemap.h
index 06679f9..6e2e5fb 100644
--- a/org.glite.lb.server/src/ws_typemap.h
+++ b/org.glite.lb.server/src/ws_typemap.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_WS_TYPEMAP_H__
-#define __GLITE_LB_WS_TYPEMAP_H__
+#ifndef GLITE_LB_WS_TYPEMAP_H
+#define GLITE_LB_WS_TYPEMAP_H
 
 #ident "$Header"
 
@@ -66,4 +66,4 @@
 
 #endif
 
-#endif /* __GLITE_LB_WS_TYPEMAP_H__ */
+#endif /* GLITE_LB_WS_TYPEMAP_H */
diff --git a/org.glite.lb.server/src/ws_typeref.h b/org.glite.lb.server/src/ws_typeref.h
index 2b8515c..d5e9294 100644
--- a/org.glite.lb.server/src/ws_typeref.h
+++ b/org.glite.lb.server/src/ws_typeref.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_LB_WS_TYPEREF_H__
-#define __GLITE_LB_WS_TYPEREF_H__
+#ifndef GLITE_LB_WS_TYPEREF_H
+#define GLITE_LB_WS_TYPEREF_H
 
 #ident "$Header"
 
@@ -91,4 +91,4 @@ extern void edg_wll_FreeSoapEvent(struct soap *, struct lbt__event *);
 }
 #endif
 
-#endif /* __GLITE_LB_WS_TYPEREF_H__ */
+#endif /* GLITE_LB_WS_TYPEREF_H */
diff --git a/org.glite.security.gsoap-plugin/interface/glite_gsplugin.h b/org.glite.security.gsoap-plugin/interface/glite_gsplugin.h
index ac501b1..7bee0f2 100644
--- a/org.glite.security.gsoap-plugin/interface/glite_gsplugin.h
+++ b/org.glite.security.gsoap-plugin/interface/glite_gsplugin.h
@@ -1,5 +1,5 @@
-#ifndef __GLITE_GSOAP_PLUGIN_H__
-#define __GLITE_GSOAP_PLUGIN_H__
+#ifndef GLITE_SECURITY_GSOAP_PLUGIN_H
+#define GLITE_SECURITY_GSOAP_PLUGIN_H
 
 #include <stdsoap2.h>
 
@@ -30,4 +30,4 @@ extern char *glite_gsplugin_errdesc(struct soap *);
 }
 #endif
 
-#endif
+#endif /* GLITE_SECURITY_GSOAP_PLUGIN_H */