diff --git a/library/Makefile.am b/library/Makefile.am
index da71938..2700ae9 100644
--- a/library/Makefile.am
+++ b/library/Makefile.am
@@ -37,7 +37,7 @@ all-local: $(DOC_STAMPS)
 install-data-local: $(DOC_STAMPS)
 	if test -d doc/man/man3; then \
 		install -d -m 755 $(DESTDIR)$(mandir)/man3; \
-		$(INSTALL) -m 644 doc/man/man3/globus*.3 $(DESTDIR)$(mandir)/man3 ; \
+		$(INSTALL) -m 644 doc/man/man3/[Gg][Ll][Oo][Bb][Uu][Ss]*.3 $(DESTDIR)$(mandir)/man3 ; \
 	fi
 	if test -d doc/html; then \
 		for dir in `(cd doc; find html -type d)`; do \
diff --git a/library/Makefile.in b/library/Makefile.in
index da71938..2700ae9 100644
--- a/library/Makefile.in
+++ b/library/Makefile.in
@@ -37,7 +37,7 @@ all-local: $(DOC_STAMPS)
 install-data-local: $(DOC_STAMPS)
 	if test -d doc/man/man3; then \
 		install -d -m 755 $(DESTDIR)$(mandir)/man3; \
-		$(INSTALL) -m 644 doc/man/man3/globus*.3 $(DESTDIR)$(mandir)/man3 ; \
+		$(INSTALL) -m 644 doc/man/man3/[Gg][Ll][Oo][Bb][Uu][Ss]*.3 $(DESTDIR)$(mandir)/man3 ; \
 	fi
 	if test -d doc/html; then \
 		for dir in `(cd doc; find html -type d)`; do \
diff --git a/library/globus_gsi_proxy.c b/library/globus_gsi_proxy.c
index 8c6f3ba..8d62e08 100644
--- a/library/globus_gsi_proxy.c
+++ b/library/globus_gsi_proxy.c
@@ -14,10 +14,13 @@
  * limitations under the License.
  */
 
+#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
 /**
- * @file globus_gsi_proxy.c GSI Proxy Implementation
+ * @file globus_gsi_proxy.c
+ * @brief GSI Proxy Implementation
  * @author Sam Lang, Sam Meder
  */
+#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
 
 #define PROXY_NAME                      "proxy"
 #define LIMITED_PROXY_NAME              "limited proxy"
diff --git a/library/globus_gsi_proxy.h b/library/globus_gsi_proxy.h
index c182362..2a6172e 100644
--- a/library/globus_gsi_proxy.h
+++ b/library/globus_gsi_proxy.h
@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 
-/** @file globus_gsi_proxy.h Globus GSI Proxy API */
+/**
+ * @file globus_gsi_proxy.h
+ * @brief Globus GSI Proxy API
+ */
 
 #ifndef GLOBUS_GLOBUS_GSI_PROXY_H
 #define GLOBUS_GLOBUS_GSI_PROXY_H
diff --git a/library/globus_gsi_proxy_constants.h b/library/globus_gsi_proxy_constants.h
index cf96414..13fbf1f 100644
--- a/library/globus_gsi_proxy_constants.h
+++ b/library/globus_gsi_proxy_constants.h
@@ -16,7 +16,11 @@
 
 #ifndef GLOBUS_GSI_PROXY_CONSTANTS_H
 #define GLOBUS_GSI_PROXY_CONSTANTS_H
-/** @file globus_gsi_proxy_constants.h GSI Proxy Constants */
+
+/**
+ * @file globus_gsi_proxy_constants.h
+ * @brief GSI Proxy Constants
+ */
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/library/globus_gsi_proxy_error.c b/library/globus_gsi_proxy_error.c
index 69d7011..6f8aebd 100644
--- a/library/globus_gsi_proxy_error.c
+++ b/library/globus_gsi_proxy_error.c
@@ -14,13 +14,16 @@
  * limitations under the License.
  */
 
-/** @file globus_gsi_proxy_error.c GSI Proxy Error Handling */
+#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+
+/**
+ * @file globus_gsi_proxy_error.c
+ * @brief GSI Proxy Error Handling
+ */
 
 #include "globus_i_gsi_proxy.h"
 #include "globus_gsi_proxy_constants.h"
 
-#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
-
 static char * 
 globus_l_gsi_proxy_error_strings[GLOBUS_GSI_PROXY_ERROR_LAST] =
 {
diff --git a/library/globus_gsi_proxy_handle.c b/library/globus_gsi_proxy_handle.c
index 951105a..f07ec74 100644
--- a/library/globus_gsi_proxy_handle.c
+++ b/library/globus_gsi_proxy_handle.c
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
+#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
 /**
  * @file globus_gsi_proxy_handle.c
+ * @brief @brief GSI Proxy Handle
  * @author Sam Meder, Sam Lang
  */
-
+#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
 
 #define GLOBUS_GSI_PROXY_HANDLE_MALLOC_ERROR(_LENGTH_) \
     globus_error_put(globus_error_wrap_errno_error( \
diff --git a/library/globus_gsi_proxy_handle_attrs.c b/library/globus_gsi_proxy_handle_attrs.c
index aae4a9b..fd2e533 100644
--- a/library/globus_gsi_proxy_handle_attrs.c
+++ b/library/globus_gsi_proxy_handle_attrs.c
@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
+#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
 /**
- * @file globus_gsi_proxy_handle_attrs.c GSI Proxy Handle Attributes
+ * @file globus_gsi_proxy_handle_attrs.c
+ * @brief GSI Proxy Handle Attributes
  */
+#endif
 
 #include "globus_i_gsi_proxy.h"
 #include <errno.h>
diff --git a/library/globus_i_gsi_proxy.h b/library/globus_i_gsi_proxy.h
index ef67b6a..df2e075 100644
--- a/library/globus_i_gsi_proxy.h
+++ b/library/globus_i_gsi_proxy.h
@@ -14,8 +14,11 @@
  * limitations under the License.
  */
 
+#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+
 /**
- * @file globus_i_gsi_proxy.h Globus GSI Proxy Library Internals
+ * @file globus_i_gsi_proxy.h
+ * @brief Globus GSI Proxy Library Internals
  * @author Sam Meder, Sam Lang
  */
 
@@ -185,7 +188,7 @@ extern FILE *                           globus_i_gsi_proxy_debug_fstream;
  */
 
 /**
- * GSI Proxy handle attributes implementation
+ * @brief GSI Proxy handle attributes implementation
  * @ingroup globus_gsi_proxy_handle
  * @internal
  *
@@ -224,7 +227,7 @@ typedef struct globus_l_gsi_proxy_handle_attrs_s
 } globus_i_gsi_proxy_handle_attrs_t;
 
 /**
- * GSI Proxy handle implementation
+ * @brief GSI Proxy handle implementation
  * @ingroup globus_gsi_proxy_handle
  * @internal
  *
@@ -308,3 +311,5 @@ globus_i_gsi_proxy_error_chain_result(
 #endif
 
 #endif /* GLOBUS_I_GSI_PROXY_H */
+
+#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */