diff -ur globus_common-10.2.orig/library/globus_callback.h globus_common-10.2/library/globus_callback.h

--- globus_common-10.2.orig/library/globus_callback.h	2009-11-08 13:52:51.214078077 +0100

+++ globus_common-10.2/library/globus_callback.h	2009-11-08 13:53:51.862079194 +0100

@@ -16,7 +16,7 @@

 #ifndef GLOBUS_INCLUDE_GLOBUS_CALLBACK

 #define GLOBUS_INCLUDE_GLOBUS_CALLBACK

-/**

+/*

  * @file globus_callback.h Globus Callback API

  *

  * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_callback.h,v $

diff -ur globus_common-10.2.orig/library/globus_thread_common.h globus_common-10.2/library/globus_thread_common.h

--- globus_common-10.2.orig/library/globus_thread_common.h	2009-11-08 13:52:51.214078077 +0100

+++ globus_common-10.2/library/globus_thread_common.h	2009-11-08 13:54:25.901243275 +0100

@@ -14,7 +14,7 @@

  * limitations under the License.

  */

-/**

+/*

  * @file globus_thread_common.h Common Thread Interface

  *

  * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_thread_common.h,v $

diff -ur globus_common-10.2.orig/scripts/Makefile.am globus_common-10.2/scripts/Makefile.am

--- globus_common-10.2.orig/scripts/Makefile.am	2005-12-07 10:37:45.000000000 +0100

+++ globus_common-10.2/scripts/Makefile.am	2009-11-08 14:12:37.139329290 +0100

@@ -7,8 +7,7 @@

 bin_SCRIPTS = \

 	globus-hostname \

 	globus-domainname \

-	globus-makefile-header \

-	globus-makefile-header.gpt1

+	globus-makefile-header

 globus-domainname: globus-hostname

 	cp $(srcdir)/globus-hostname $(builddir)/globus-domainname