diff --git a/daemon/remote.c b/daemon/remote.c
index fd85421200..3f7d2d3440 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -3750,10 +3750,6 @@ remoteDispatchAuthPolkit(virNetServerPtr server,
 }
 
 
-/***************************************************************
- *     NODE INFO APIS
- **************************************************************/
-
 static int
 remoteDispatchNodeDeviceGetParent(virNetServerPtr server ATTRIBUTE_UNUSED,
                                   virNetServerClientPtr client ATTRIBUTE_UNUSED,
@@ -3864,9 +3860,6 @@ remoteDispatchConnectUnregisterCloseCallback(virNetServerPtr server ATTRIBUTE_UN
     return rv;
 }
 
-/***************************
- * Register / deregister events
- ***************************/
 static int
 remoteDispatchConnectDomainEventRegister(virNetServerPtr server ATTRIBUTE_UNUSED,
                                          virNetServerClientPtr client,
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 530d00ff36..fcaa66df91 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -4286,8 +4286,6 @@ networkRegister(void)
 }
 
 
-/********************************************************/
-
 /* A unified function to log network connections and disconnections */
 
 static void
diff --git a/src/util/virconf.c b/src/util/virconf.c
index b5f6e5b8c7..5822ee45eb 100644
--- a/src/util/virconf.c
+++ b/src/util/virconf.c
@@ -44,12 +44,6 @@
 
 VIR_LOG_INIT("util.conf");
 
-/************************************************************************
- *									*
- *	Structures and macros used by the mini parser			*
- *									*
- ************************************************************************/
-
 typedef struct _virConfParserCtxt virConfParserCtxt;
 typedef virConfParserCtxt *virConfParserCtxtPtr;
 
@@ -75,12 +69,6 @@ struct _virConfParserCtxt {
   do { while ((ctxt->cur < ctxt->end) && (c_isblank(CUR)))              \
           ctxt->cur++; } while (0)
 
-/************************************************************************
- *									*
- *		Structures used by configuration data			*
- *									*
- ************************************************************************/
-
 VIR_ENUM_IMPL(virConf, VIR_CONF_LAST,
               "*unexpected*",
               "long",
@@ -133,12 +121,6 @@ virConfErrorHelper(const char *file, const char *func, size_t line,
 }
 
 
-/************************************************************************
- *									*
- *		Structures allocations and deallocations		*
- *									*
- ************************************************************************/
-
 /**
  * virConfFreeList:
  * @list: the list to free
@@ -260,11 +242,6 @@ virConfAddEntry(virConfPtr conf, char *name, virConfValuePtr value, char *comm)
     return ret;
 }
 
-/************************************************************************
- *									*
- *			Serialization					*
- *									*
- ************************************************************************/
 
 /**
  * virConfSaveValue:
@@ -353,11 +330,6 @@ virConfSaveEntry(virBufferPtr buf, virConfEntryPtr cur)
     return 0;
 }
 
-/************************************************************************
- *									*
- *			The parser core					*
- *									*
- ************************************************************************/
 
 /**
  * virConfParseLong:
@@ -754,11 +726,6 @@ virConfParse(const char *filename, const char *content, int len,
     return NULL;
 }
 
-/************************************************************************
- *									*
- *			The module entry points				*
- *									*
- ************************************************************************/
 
 /* 10 MB limit on config file size as a sanity check */
 #define MAX_CONFIG_FILE_SIZE (1024*1024*10)
diff --git a/src/util/virerror.h b/src/util/virerror.h
index 54530d0811..3201d5cec6 100644
--- a/src/util/virerror.h
+++ b/src/util/virerror.h
@@ -27,11 +27,6 @@
 extern virErrorFunc virErrorHandler;
 extern void *virUserData;
 
-/************************************************************************
- *									*
- *		API for error handling					*
- *									*
- ************************************************************************/
 int virErrorInitialize(void);
 void virRaiseErrorFull(const char *filename,
                        const char *funcname,
diff --git a/src/util/virxml.c b/src/util/virxml.c
index 5ce2b0b0dd..1ff1e36536 100644
--- a/src/util/virxml.c
+++ b/src/util/virxml.c
@@ -50,12 +50,6 @@ struct virParserData {
 };
 
 
-/************************************************************************
- *									*
- * Wrappers around libxml2 XPath specific functions			*
- *									*
- ************************************************************************/
-
 /**
  * virXPathString:
  * @xpath: the XPath string to evaluate
diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c
index ff03279ed1..cae6d0c626 100644
--- a/src/vbox/vbox_XPCOMCGlue.c
+++ b/src/vbox/vbox_XPCOMCGlue.c
@@ -26,9 +26,6 @@
  * additional information or have any questions.
  */
 
-/*******************************************************************************
-*   Header Files                                                               *
-*******************************************************************************/
 
 #include <config.h>
 
@@ -48,9 +45,6 @@
 
 VIR_LOG_INIT("vbox.vbox_XPCOMCGlue");
 
-/*******************************************************************************
-*   Defined Constants And Macros                                               *
-*******************************************************************************/
 #if defined(__linux__) || defined(__linux_gnu__) || defined(__sun__) || \
     defined(__FreeBSD__) || defined(__OpenBSD__) || \
     defined(__FreeBSD_kernel__)
@@ -64,9 +58,6 @@ VIR_LOG_INIT("vbox.vbox_XPCOMCGlue");
 #endif
 
 
-/*******************************************************************************
-*   Global Variables                                                           *
-*******************************************************************************/
 /** The dlopen handle for VBoxXPCOMC. */
 static void *hVBoxXPCOMC;
 /** Pointer to the VBoxXPCOMC function table. */
diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index ccb1478b39..e4edfd6f8a 100644
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -1122,17 +1122,6 @@ sexpr_to_domain(virConnectPtr conn ATTRIBUTE_UNUSED, const struct sexpr *root)
 }
 
 
-/*****************************************************************
- ******
- ******
- ******
- ******
-             Refactored
- ******
- ******
- ******
- ******
- *****************************************************************/
 /**
  * xenDaemonOpen:
  * @conn: an existing virtual connection block
diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c
index e448968f75..353169da05 100644
--- a/src/xen/xs_internal.c
+++ b/src/xen/xs_internal.c
@@ -59,11 +59,6 @@ VIR_LOG_INIT("xen.xs_internal");
 static void xenStoreWatchEvent(int watch, int fd, int events, void *data);
 static void xenStoreWatchListFree(xenStoreWatchListPtr list);
 
-/************************************************************************
- *									*
- *		Helper internal APIs					*
- *									*
- ************************************************************************/
 
 /**
  * virDomainDoStoreQuery:
@@ -91,11 +86,6 @@ virDomainDoStoreQuery(virConnectPtr conn, int domid, const char *path)
     return xs_read(priv->xshandle, 0, &s[0], &len);
 }
 
-/************************************************************************
- *									*
- *		Canonical internal APIs					*
- *									*
- ************************************************************************/
 /**
  * xenStoreOpen:
  * @conn: pointer to the connection block
diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
index fefa61ac23..358d0cbef9 100644
--- a/src/xenconfig/xen_sxpr.c
+++ b/src/xenconfig/xen_sxpr.c
@@ -70,11 +70,6 @@ int xenGetDomIdFromSxpr(const struct sexpr *root, int *id)
     return 0;
 }
 
-/*****************************************************************
- ******
- ****** Parsing of S-Expression into virDomainDef objects
- ******
- *****************************************************************/
 
 /**
  * xenParseSxprOS: