Cleanup pass on documentation that was dumping garbage into doxygen output.

(bzr r10696)

38 files changed, 223 insertions, 172 deletions

diff --git a/src/dom/css.h b/src/dom/css.h
index f62b93588..5ea71ce95 100644
--- a/src/dom/css.h
+++ b/src/dom/css.h
@@ -1,4 +1,5 @@
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -6,7 +7,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -36,8 +38,8 @@
      
  */
 
-#ifndef __CSS_H__
-#define __CSS_H__
+#ifndef SEEN_CSS_H
+#define SEEN_CSS_H
 
 #include "dom.h"
 #include "stylesheets.h"
@@ -4663,7 +4665,7 @@ public:
 }  //namespace org
 
 
-#endif /* __CSS_H__ */
+#endif // SEEN_CSS_H
 
 /*#########################################################################
 ## E N D    O F    F I L E
diff --git a/src/dom/cssreader.h b/src/dom/cssreader.h
index 149db31ef..0a9a7c031 100644
--- a/src/dom/cssreader.h
+++ b/src/dom/cssreader.h
@@ -1,6 +1,7 @@
-#ifndef __CSSREADER_H__
-#define __CSSREADER_H__
+#ifndef SEEN_CSSREADER_H
+#define SEEN_CSSREADER_H
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -8,7 +9,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -283,7 +285,7 @@ void getColumnAndRow(int p, int &col, int &row, int &lastNL);
 
 
 
-#endif /* __CSSREADER_H__ */
+#endif // SEEN_CSSREADER_H
 //#########################################################################
 //# E N D    O F    F I L E
 //#########################################################################
diff --git a/src/dom/dom.h b/src/dom/dom.h
index 674a84186..c12c02869 100644
--- a/src/dom/dom.h
+++ b/src/dom/dom.h
@@ -1,6 +1,7 @@
-#ifndef __DOM_H__
-#define __DOM_H__
+#ifndef SEEN_DOM_H
+#define SEEN_DOM_H
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -12,7 +13,8 @@
  * More thorough explanations of the various classes and their algorithms
  * can be found there.
  *     
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -2743,7 +2745,7 @@ public:
 }  //namespace org
 
 
-#endif // __DOM_H__
+#endif // SEEN_DOM_H
 
 
 /*#########################################################################
diff --git a/src/dom/domimpl.h b/src/dom/domimpl.h
index dbf81757e..4e17ce5ba 100644
--- a/src/dom/domimpl.h
+++ b/src/dom/domimpl.h
@@ -1,6 +1,7 @@
-#ifndef __DOMIMPL_H__
-#define __DOMIMPL_H__
+#ifndef SEEN_DOMIMPL_H
+#define SEEN_DOMIMPL_H
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -8,7 +9,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -2015,7 +2017,7 @@ protected:
 }  //namespace org
 
 
-#endif // __DOMIMPL_H__
+#endif // SEEN_DOMIMPL_H
 
 
 /*#########################################################################
diff --git a/src/dom/domptr.h b/src/dom/domptr.h
index aaf1220f3..5a1299867 100644
--- a/src/dom/domptr.h
+++ b/src/dom/domptr.h
@@ -1,6 +1,7 @@
-#ifndef __DOMPTR_H__
-#define __DOMPTR_H__
+#ifndef SEEN_DOMPTR_H
+#define SEEN_DOMPTR_H
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -12,7 +13,8 @@
  * More thorough explanations of the various classes and their algorithms
  * can be found there.
  *     
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -325,7 +327,7 @@ template<class T, class U> Ptr<T>
 }  //namespace org
 
 
-#endif // __DOMPTR_H__
+#endif // SEEN_DOMPTR_H
 
 
 /*#########################################################################
diff --git a/src/dom/domstring.h b/src/dom/domstring.h
index a963e9850..0002bd9b5 100644
--- a/src/dom/domstring.h
+++ b/src/dom/domstring.h
@@ -1,6 +1,7 @@
-#ifndef __DOMSTRING_H__
-#define __DOMSTRING_H__
+#ifndef SEEN_DOMSTRING_H
+#define SEEN_DOMSTRING_H
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -8,7 +9,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -306,7 +308,7 @@ DOMString &operator +(const char *b, DOMString &a);
 }  //namespace w3c
 }  //namespace org
 
-#endif // __DOMSTRING_H__
+#endif // SEEN_DOMSTRING_H
 //#########################################################################
 //## E N D    O F    F I L E
 //#########################################################################
diff --git a/src/dom/events.h b/src/dom/events.h
index e6a8e0d6c..c4000ec29 100644
--- a/src/dom/events.h
+++ b/src/dom/events.h
@@ -1,7 +1,8 @@
-#ifndef __EVENTS_H__
-#define __EVENTS_H__
+#ifndef SEEN_EVENTS_H
+#define SEEN_EVENTS_H
 
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -9,7 +10,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -1601,7 +1603,7 @@ protected:
 }  //namespace w3c
 }  //namespace org
 
-#endif   /* __EVENTS_H__ */
+#endif // SEEN_EVENTS_H
 
 /*#########################################################################
 ## E N D    O F    F I L E
diff --git a/src/dom/io/base64stream.h b/src/dom/io/base64stream.h
index c6d0ad35d..93bb5c7e5 100644
--- a/src/dom/io/base64stream.h
+++ b/src/dom/io/base64stream.h
@@ -1,7 +1,8 @@
-#ifndef __DOM_IO_BASE64STREAM_H__
-#define __DOM_IO_BASE64STREAM_H__
+#ifndef SEEN_DOM_IO_BASE64STREAM_H
+#define SEEN_DOM_IO_BASE64STREAM_H
 
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * Base64-enabled input and output streams
@@ -11,7 +12,8 @@
  * the implementation from the user.
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -143,4 +145,4 @@ private:
 }  //namespace org
 
 
-#endif /* __INKSCAPE_IO_BASE64STREAM_H__ */
+#endif // SEEN_DOM_IO_BASE64STREAM_H
diff --git a/src/dom/io/bufferstream.h b/src/dom/io/bufferstream.h
index bdf4eb2ab..9a36b30e2 100644
--- a/src/dom/io/bufferstream.h
+++ b/src/dom/io/bufferstream.h
@@ -1,6 +1,7 @@
-#ifndef __BUFFERSTREAM_H__
-#define __BUFFERSTREAM_H__
+#ifndef SEEN_BUFFERSTREAM_H
+#define SEEN_BUFFERSTREAM_H
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -8,7 +9,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -130,4 +132,4 @@ private:
 
 
 
-#endif /* __BUFFERSTREAM_H__ */
+#endif // SEEN_BUFFERSTREAM_H
diff --git a/src/dom/io/domstream.h b/src/dom/io/domstream.h
index 0c60aca7a..b2e308653 100644
--- a/src/dom/io/domstream.h
+++ b/src/dom/io/domstream.h
@@ -1,6 +1,7 @@
-#ifndef __DOMSTREAM_H__
-#define __DOMSTREAM_H__
+#ifndef SEEN_DOMSTREAM_H
+#define SEEN_DOMSTREAM_H
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -8,7 +9,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -677,7 +679,7 @@ void pipeStream(InputStream &source, OutputStream &dest);
 }  //namespace org
 
 
-#endif /* __DOMSTREAM_H__ */
+#endif // SEEN_DOMSTREAM_H
 
 //#########################################################################
 //# E N D    O F    F I L E
diff --git a/src/dom/io/gzipstream.h b/src/dom/io/gzipstream.h
index ea0807f32..6e82c3531 100644
--- a/src/dom/io/gzipstream.h
+++ b/src/dom/io/gzipstream.h
@@ -1,12 +1,13 @@
-#ifndef __GZIPSTREAM_H__
-#define __GZIPSTREAM_H__
+#ifndef SEEN_GZIPSTREAM_H
+#define SEEN_GZIPSTREAM_H
 /**
  * Zlib-enabled input and output streams
  *
  * This provides a simple mechanism for reading and
  * writing Gzip files.   We use our own 'ZipTool' class
  * to accomplish this, avoiding a zlib dependency.
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -122,4 +123,4 @@ private:
 } // namespace org
 
 
-#endif /* __GZIPSTREAM_H__ */
+#endif // SEEN_GZIPSTREAM_H
diff --git a/src/dom/io/stringstream.h b/src/dom/io/stringstream.h
index 38aaf7235..f6ed89e65 100644
--- a/src/dom/io/stringstream.h
+++ b/src/dom/io/stringstream.h
@@ -1,6 +1,7 @@
-#ifndef __STRINGSTREAM_H__
-#define __STRINGSTREAM_H__
+#ifndef SEEN_STRINGSTREAM_H
+#define SEEN_STRINGSTREAM_H
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -8,7 +9,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -126,4 +128,4 @@ private:
 
 
 
-#endif /* __STRINGSTREAM_H__ */
+#endif // SEEN_STRINGSTREAM_H
diff --git a/src/dom/io/uristream.h b/src/dom/io/uristream.h
index a885726e4..8d60468a5 100644
--- a/src/dom/io/uristream.h
+++ b/src/dom/io/uristream.h
@@ -1,5 +1,5 @@
-#ifndef __URISTREAM_H__
-#define __URISTREAM_H__
+#ifndef SEEN_URISTREAM_H
+#define SEEN_URISTREAM_H
 
 /**
  * Phoebe DOM Implementation.
@@ -9,7 +9,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -203,4 +204,4 @@ private:
 #########################################################################*/
 
 
-#endif /* __URISTREAM_H__ */
+#endif // SEEN_URISTREAM_H
diff --git a/src/dom/ls.h b/src/dom/ls.h
index c4bdf1120..fd224ea6b 100644
--- a/src/dom/ls.h
+++ b/src/dom/ls.h
@@ -1,6 +1,7 @@
-#ifndef __LS_H__
-#define __LS_H__
+#ifndef SEEN_LS_H
+#define SEEN_LS_H
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -8,7 +9,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -937,7 +939,7 @@ public:
 }  //namespace org
 
 
-#endif // __LS_H__
+#endif // SEEN_LS_H
 
 /*#########################################################################
 ## E N D    O F    F I L E
diff --git a/src/dom/lsimpl.h b/src/dom/lsimpl.h
index b87498517..621a5577a 100644
--- a/src/dom/lsimpl.h
+++ b/src/dom/lsimpl.h
@@ -1,6 +1,7 @@
-#ifndef __LSIMPL_H__
-#define __LSIMPL_H__
+#ifndef SEEN_LSIMPL_H
+#define SEEN_LSIMPL_H
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -8,7 +9,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -372,7 +374,7 @@ protected:
 
 
 
-#endif   /* __LSIMPL_H__ */
+#endif // SEEN_LSIMPL_H
 
 /*#########################################################################
 ## E N D    O F    F I L E
diff --git a/src/dom/odf/odfdocument.h b/src/dom/odf/odfdocument.h
index 0f892acb0..168df11c7 100644
--- a/src/dom/odf/odfdocument.h
+++ b/src/dom/odf/odfdocument.h
@@ -1,12 +1,6 @@
-#ifndef __ODF_DOCUMENT_H__
-#define __ODF_DOCUMENT_H__
-/**
- *
- * This class contains an ODF Document.
- * Initially, we are just concerned with .odg content.xml + resources
- *
- * ---------------------------------------------------------------------
- *
+#ifndef SEEN_ODF_DOCUMENT_H
+#define SEEN_ODF_DOCUMENT_H
+/*
  * Copyright (C) 2006 Bob Jamison
  *
  * This program is free software; you can redistribute it and/or modify
@@ -103,6 +97,8 @@ private:
 
 /**
  *
+ * This class contains an ODF Document.
+ * Initially, we are just concerned with .odg content.xml + resources
  */
 class OdfDocument
 {
@@ -146,7 +142,7 @@ private:
 
 
 
-#endif /*__ODF_DOCUMENT_H__*/
+#endif // SEEN_ODF_DOCUMENT_H
 
 //########################################################################
 //# E N D    O F    F I L E
diff --git a/src/dom/smil.h b/src/dom/smil.h
index c9de6ccb7..15bc361ac 100644
--- a/src/dom/smil.h
+++ b/src/dom/smil.h
@@ -1,6 +1,7 @@
-#ifndef __SMIL_H__
-#define __SMIL_H__
+#ifndef SEEN_SMIL_H
+#define SEEN_SMIL_H
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -8,7 +9,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -2486,7 +2488,7 @@ public:
 }  //namespace w3c
 }  //namespace org
 
-#endif   /* __SMIL_H__ */
+#endif // SEEN_SMIL_H
 
 /*#########################################################################
 ## E N D    O F    F I L E
diff --git a/src/dom/smilimpl.h b/src/dom/smilimpl.h
index cb06eb5f5..d71df020a 100644
--- a/src/dom/smilimpl.h
+++ b/src/dom/smilimpl.h
@@ -1,5 +1,5 @@
-#ifndef __SMILIMPL_H__
-#define __SMILIMPL_H__
+#ifndef SEEN_SMILIMPL_H
+#define SEEN_SMILIMPL_H
 /**
  * Phoebe DOM Implementation.
  *
@@ -8,7 +8,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -757,7 +758,7 @@ public:
 }  //namespace w3c
 }  //namespace org
 
-#endif    /* __SMILIMPL_H__ */
+#endif // SEEN_SMILIMPL_H
 
 /*#########################################################################
 ## E N D    O F    F I L E
diff --git a/src/dom/stylesheets.h b/src/dom/stylesheets.h
index 0e76d6d4e..3ba225af3 100644
--- a/src/dom/stylesheets.h
+++ b/src/dom/stylesheets.h
@@ -1,7 +1,8 @@
-#ifndef __STYLESHEETS_H__
-#define __STYLESHEETS_H__
+#ifndef SEEN_STYLESHEETS_H
+#define SEEN_STYLESHEETS_H
 
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -9,7 +10,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -584,7 +586,7 @@ protected:
 }  //namespace org
 
 
-#endif   /* __STYLESHEETS_H__ */
+#endif // SEEN_STYLESHEETS_H
 /*#########################################################################
 ## E N D    O F    F I L E
 #########################################################################*/
diff --git a/src/dom/svg.h b/src/dom/svg.h
index 5bf943cc6..09754055d 100644
--- a/src/dom/svg.h
+++ b/src/dom/svg.h
@@ -1,7 +1,8 @@
-#ifndef __SVG_H__
-#define __SVG_H__
+#ifndef SEEN_SVG_H
+#define SEEN_SVG_H
 
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -9,7 +10,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -4749,7 +4751,7 @@ public:
 }  //namespace w3c
 }  //namespace org
 
-#endif // __SVG_H__
+#endif // SEEN_SVG_H
 /*#########################################################################
 ## E N D    O F    F I L E
 #########################################################################*/
diff --git a/src/dom/svg2.h b/src/dom/svg2.h
index b1a42e8aa..011bafbea 100644
--- a/src/dom/svg2.h
+++ b/src/dom/svg2.h
@@ -1,7 +1,8 @@
-#ifndef __SVG_H__
-#define __SVG_H__
+#ifndef SEEN_SVG_H
+#define SEEN_SVG_H
 
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -9,7 +10,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -5551,7 +5553,7 @@ public:
 }  //namespace w3c
 }  //namespace org
 
-#endif // __SVG_H__
+#endif // SEEN_SVG_H
 /*#########################################################################
 ## E N D    O F    F I L E
 #########################################################################*/
diff --git a/src/dom/svgimpl.h b/src/dom/svgimpl.h
index 62d6acaf3..83d56fa22 100644
--- a/src/dom/svgimpl.h
+++ b/src/dom/svgimpl.h
@@ -1,7 +1,8 @@
-#ifndef __SVGIMPL_H__
-#define __SVGIMPL_H__
+#ifndef SEEN_SVGIMPL_H
+#define SEEN_SVGIMPL_H
 
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -9,7 +10,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -5527,7 +5529,7 @@ protected:
 }  //namespace w3c
 }  //namespace org
 
-#endif // __SVG_H__
+#endif // SEEN_SVGIMPL_H
 /*#########################################################################
 ## E N D    O F    F I L E
 #########################################################################*/
diff --git a/src/dom/svgreader.h b/src/dom/svgreader.h
index 2a0106cac..3d66ce507 100644
--- a/src/dom/svgreader.h
+++ b/src/dom/svgreader.h
@@ -1,7 +1,8 @@
-#ifndef __SVGREADER_H__
-#define __SVGREADER_H__
+#ifndef SEEN_SVGREADER_H
+#define SEEN_SVGREADER_H
 
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -9,7 +10,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -179,7 +181,7 @@ private:
 }  //namespace w3c
 }  //namespace org
 
-#endif /* __SVGREADER_H__ */
+#endif // SEEN_SVGREADER_H
 /*#########################################################################
 ## E N D    O F    F I L E
 #########################################################################*/
diff --git a/src/dom/svgtypes.h b/src/dom/svgtypes.h
index 09ed00bb5..0c30069b8 100644
--- a/src/dom/svgtypes.h
+++ b/src/dom/svgtypes.h
@@ -1,7 +1,8 @@
-#ifndef __SVGTYPES_H__
-#define __SVGTYPES_H__
+#ifndef SEEN_SVGTYPES_H
+#define SEEN_SVGTYPES_H
 
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -9,7 +10,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -6895,7 +6897,7 @@ protected:
 }  //namespace w3c
 }  //namespace org
 
-#endif /* __SVGTYPES_H__ */
+#endif // SEEN_SVGTYPES_H
 /*#########################################################################
 ## E N D    O F    F I L E
 #########################################################################*/
diff --git a/src/dom/traversal.h b/src/dom/traversal.h
index 6d00bac67..0cade9576 100644
--- a/src/dom/traversal.h
+++ b/src/dom/traversal.h
@@ -1,7 +1,7 @@
-#ifndef __TRAVERSAL_H__
-#define __TRAVERSAL_H__
-
+#ifndef SEEN_TRAVERSAL_H
+#define SEEN_TRAVERSAL_H
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -9,7 +9,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -590,7 +591,7 @@ public:
 }  //namespace w3c
 }  //namespace org
 
-#endif   /* __TRAVERSAL_H__ */
+#endif // SEEN_TRAVERSAL_H
 
 
 /*#########################################################################
diff --git a/src/dom/ucd.h b/src/dom/ucd.h
index c4d0ab4e0..112c45f20 100644
--- a/src/dom/ucd.h
+++ b/src/dom/ucd.h
@@ -1,4 +1,5 @@
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -10,7 +11,8 @@
  * More thorough explanations of the various classes and their algorithms
  * can be found there.
  *     
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -31,11 +33,11 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *  
  */
-#ifndef __UCD_H__
-#define __UCD_H__
+#ifndef SEEN_UCD_H
+#define SEEN_UCD_H
 
 
-/************************************************
+/* ***********************************************
 ** Unicode character classification
 ************************************************/
 
@@ -186,7 +188,7 @@ int uni_to_upper(int ch);
 int uni_to_title(int ch);
 
 
-/************************************************
+/* ***********************************************
 ** Unicode blocks
 ************************************************/
 
@@ -328,6 +330,6 @@ typedef enum
 } UnicodeBlocks;
 
 
-#endif /* __UCD_H__ */
+#endif // SEEN_UCD_H
 
 
diff --git a/src/dom/uri.h b/src/dom/uri.h
index 40f80b077..4d3c384c9 100644
--- a/src/dom/uri.h
+++ b/src/dom/uri.h
@@ -1,7 +1,8 @@
-#ifndef __URI_H__
-#define __URI_H__
+#ifndef SEEN_URI_H
+#define SEEN_URI_H
 
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -9,7 +10,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -482,5 +484,5 @@ private:
 
 
 
-#endif /* __URI_H__ */
+#endif // SEEN_URI_H
 
diff --git a/src/dom/util/digest.h b/src/dom/util/digest.h
index 8c193420f..fed5b7e86 100644
--- a/src/dom/util/digest.h
+++ b/src/dom/util/digest.h
@@ -1,8 +1,6 @@
-#ifndef __DIGEST_H__
-#define __DIGEST_H__
-/**
- * Secure Hashing Tool
- *
+#ifndef SEEN_DIGEST_H
+#define SEEN_DIGEST_H
+/*
  *
  * Author:
  *   Bob Jamison
@@ -25,7 +23,7 @@
  */
 
 /**
- *
+ * @file
  *  This base class and its subclasses provide an easy API for providing
  *  several different types of secure hashing functions for whatever use
  *  a developer might need.  This is not intended as a high-performance
diff --git a/src/dom/util/thread.h b/src/dom/util/thread.h
index dfad6d9b3..1408cd78f 100644
--- a/src/dom/util/thread.h
+++ b/src/dom/util/thread.h
@@ -1,5 +1,5 @@
-#ifndef __DOM_THREAD_H__
-#define __DOM_THREAD_H__
+#ifndef SEEN_DOM_THREAD_H
+#define SEEN_DOM_THREAD_H
 /**
  * Phoebe DOM Implementation.
  *
@@ -8,7 +8,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -29,7 +30,7 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-/**
+/*
  * Thread wrapper.  This provides a platform-independent thread
  * class for IO and testing.
  *
@@ -147,7 +148,7 @@ private:
 
 
 
-#endif /* __DOM_THREAD_H__ */
+#endif // SEEN_DOM_THREAD_H
 //#########################################################################
 //# E N D    O F    F I L E
 //#########################################################################
diff --git a/src/dom/util/ziptool.h b/src/dom/util/ziptool.h
index 6cef266cf..47e669962 100644
--- a/src/dom/util/ziptool.h
+++ b/src/dom/util/ziptool.h
@@ -1,5 +1,5 @@
-#ifndef __ZIPTOOL_H__
-#define __ZIPTOOL_H__
+#ifndef SEEN_ZIPTOOL_H
+#define SEEN_ZIPTOOL_H
 /**
  * This is intended to be a standalone, reduced capability
  * implementation of Gzip and Zip functionality.  Its
@@ -11,7 +11,8 @@
  * one-at-a-time tasks.  What you get in return is the ability
  * to drop these files into your project and remove the dependencies
  * on ZLib and Info-Zip.  Enjoy.
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -559,7 +560,7 @@ private:
 
 
 
-#endif /* __ZIPTOOL_H__ */
+#endif // SEEN_ZIPTOOL_H
 
 
 //########################################################################
diff --git a/src/dom/views-level3.h b/src/dom/views-level3.h
index f62d18751..427051d06 100644
--- a/src/dom/views-level3.h
+++ b/src/dom/views-level3.h
@@ -1,7 +1,8 @@
-#ifndef __VIEWS_LEVEL3_H__
-#define __VIEWS_LEVEL3_H__
+#ifndef SEEN_VIEWS_LEVEL3_H
+#define SEEN_VIEWS_LEVEL3_H
 
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -9,7 +10,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -30,7 +32,7 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-/**
+/*
  * Currently CSS is not at level 3, so we will probably not use this
  * Level 3 Views implementation.  Rather, we'll regress back to Level 2.
  * This should not affect using the rest of DOM Core 3
@@ -1958,7 +1960,7 @@ protected:
 }  //namespace org
 
 
-#endif  /* __VIEWS_LEVEL3_H__ */
+#endif // SEEN_VIEWS_LEVEL3_H
 /*#########################################################################
 ## E N D    O F    F I L E
 #########################################################################*/
diff --git a/src/dom/views.h b/src/dom/views.h
index 9e87dfbe7..48afd5d16 100644
--- a/src/dom/views.h
+++ b/src/dom/views.h
@@ -1,7 +1,8 @@
-#ifndef __VIEWS_H__
-#define __VIEWS_H__
+#ifndef SEEN_VIEWS_H
+#define SEEN_VIEWS_H
 
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -9,7 +10,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -207,7 +209,7 @@ private:
 }  //namespace org
 
 
-#endif  /* __VIEWS_H__ */
+#endif // SEEN_VIEWS_H
 /*#########################################################################
 ## E N D    O F    F I L E
 #########################################################################*/
diff --git a/src/dom/xmlreader.h b/src/dom/xmlreader.h
index 3f97d87c9..7ab6de826 100644
--- a/src/dom/xmlreader.h
+++ b/src/dom/xmlreader.h
@@ -1,5 +1,5 @@
-#ifndef _XMLREADER_H_
-#define _XMLREADER_H_
+#ifndef SEEN_XMLREADER_H
+#define SEEN_XMLREADER_H
 
 /**
  * Phoebe DOM Implementation.
@@ -9,7 +9,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -129,4 +130,4 @@ private:
 }  //namespace w3c
 }  //namespace org
 
-#endif /*_XMLREADER_H_*/
+#endif // SEEN_XMLREADER_H
diff --git a/src/dom/xmlwriter.h b/src/dom/xmlwriter.h
index cd787993c..f50c91bc4 100644
--- a/src/dom/xmlwriter.h
+++ b/src/dom/xmlwriter.h
@@ -1,7 +1,8 @@
-#ifndef __XMLWRITER_H__
-#define __XMLWRITER_H__
+#ifndef SEEN_XMLWRITER_H
+#define SEEN_XMLWRITER_H
 
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -9,7 +10,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -85,7 +87,7 @@ protected:
 
 
 
-#endif  /* __XMLWRITER_H__ */
+#endif // SEEN_XMLWRITER_H
 
 
 
diff --git a/src/dom/xpath.h b/src/dom/xpath.h
index 60c35d76f..ce5b88f7f 100644
--- a/src/dom/xpath.h
+++ b/src/dom/xpath.h
@@ -1,7 +1,8 @@
-#ifndef __XPATH_H__
-#define __XPATH_H__
+#ifndef SEEN_XPATH_H
+#define SEEN_XPATH_H
 
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -9,7 +10,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -340,7 +342,7 @@ public:
 
 
 
-#endif /* __XPATH_H__ */
+#endif // SEEN_XPATH_H
 /*#########################################################################
 ## E N D    O F    F I L E
 #########################################################################*/
diff --git a/src/dom/xpathimpl.h b/src/dom/xpathimpl.h
index c12e78205..82b5c48f8 100644
--- a/src/dom/xpathimpl.h
+++ b/src/dom/xpathimpl.h
@@ -1,7 +1,8 @@
-#ifndef __XPATHIMPL_H__
-#define __XPATHIMPL_H__
+#ifndef SEEN_XPATHIMPL_H
+#define SEEN_XPATHIMPL_H
 
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -9,7 +10,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
diff --git a/src/dom/xpathparser.h b/src/dom/xpathparser.h
index 1ad4b5f54..041564e21 100644
--- a/src/dom/xpathparser.h
+++ b/src/dom/xpathparser.h
@@ -1,7 +1,8 @@
-#ifndef __XPATHPARSER_H__
-#define __XPATHPARSER_H__
+#ifndef SEEN_XPATHPARSER_H
+#define SEEN_XPATHPARSER_H
 
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -9,7 +10,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -794,15 +796,7 @@ private:
 } // namespace dom
 } // namespace w3c
 } // namespace org
-#endif /* __XPATHPARSER_H__ */
+#endif // SEEN_XPATHPARSER_H
 //#########################################################################
 //# E N D    O F    F I L E
 //#########################################################################
-
-
-
-
-
-
-
-
diff --git a/src/dom/xpathtoken.h b/src/dom/xpathtoken.h
index 8683b2ee1..5bb87917b 100644
--- a/src/dom/xpathtoken.h
+++ b/src/dom/xpathtoken.h
@@ -1,7 +1,8 @@
-#ifndef __XPATHTOKEN_H__
-#define __XPATHTOKEN_H__
+#ifndef SEEN_XPATHTOKEN_H
+#define SEEN_XPATHTOKEN_H
 
 /**
+ * @file
  * Phoebe DOM Implementation.
  *
  * This is a C++ approximation of the W3C DOM model, which follows
@@ -9,7 +10,8 @@
  * which are provided for reference.  Most important is this one:
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
- *
+ */
+/*
  * Authors:
  *   Bob Jamison
  *
@@ -667,7 +669,7 @@ private:
 
 
 
-#endif  /* __XPATHTOKEN_H__ */
+#endif // SEEN_XPATHTOKEN_H
 //########################################################################
 //# E N D    O F    F I L E
 //########################################################################