diff --git a/ChangeLog b/ChangeLog
index 1015f46119..84e78da460 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-04-10  Jim Meyering  <meyering@redhat.com>
+
+	Remove Vim and Emacs variable settings from C source files.
+	Done with these commands:
+	git grep -l Local.variab|xargs \
+	  perl -0x3b -pi -e 's,\n+/\*\n \* vim:(.|\n)*,\n,'
+	git grep -l Local.variab|xargs \
+	  perl -0x3b -pi -e 's,\n+/\*\n \* Local variables:\n(.|\n)*,\n,'
+
 Thu Apr 10 15:28:36 CEST 2008 Daniel Veillard <veillard@redhat.com>
 
 	* AUTHORS: adding Dave Leskovec and Ryan Scott to the authors list
diff --git a/proxy/libvirt_proxy.c b/proxy/libvirt_proxy.c
index bed3ae8576..75504ef90e 100644
--- a/proxy/libvirt_proxy.c
+++ b/proxy/libvirt_proxy.c
@@ -846,17 +846,3 @@ int main(void) {
 }
 
 #endif /* WITH_XEN */
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/python/libvir.c b/python/libvir.c
index fe650e89d4..96cbc294d4 100644
--- a/python/libvir.c
+++ b/python/libvir.c
@@ -1453,17 +1453,3 @@ initcygvirtmod
 
     initialized = 1;
 }
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/qemud/event.c b/qemud/event.c
index c744738689..f478fe03b4 100644
--- a/qemud/event.c
+++ b/qemud/event.c
@@ -501,11 +501,3 @@ int virEventRunOnce(void) {
 
     return 0;
 }
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/qemud/internal.h b/qemud/internal.h
index da556752b3..3f95af841e 100644
--- a/qemud/internal.h
+++ b/qemud/internal.h
@@ -184,12 +184,3 @@ int qemudGetSocketIdentity(int fd, uid_t *uid, pid_t *pid);
 #endif
 
 #endif
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/qemud/mdns.c b/qemud/mdns.c
index e5c99cb75a..692ed3c3a0 100644
--- a/qemud/mdns.c
+++ b/qemud/mdns.c
@@ -488,14 +488,3 @@ void libvirtd_mdns_stop(struct libvirtd_mdns *mdns)
         avahi_client_free(mdns->client);
     mdns->client = NULL;
 }
-
-
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/qemud/qemud.c b/qemud/qemud.c
index 6534ec362e..23af04242d 100644
--- a/qemud/qemud.c
+++ b/qemud/qemud.c
@@ -2220,12 +2220,3 @@ int main(int argc, char **argv) {
         qemudCleanup(server);
     return ret;
 }
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/qemud/remote.c b/qemud/remote.c
index 787146eab6..e249529f5d 100644
--- a/qemud/remote.c
+++ b/qemud/remote.c
@@ -3464,12 +3464,3 @@ make_nonnull_storage_vol (remote_nonnull_storage_vol *vol_dst, virStorageVolPtr
     vol_dst->name = strdup (vol_src->name);
     vol_dst->key = strdup (vol_src->key);
 }
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/qemud/remote_protocol.x b/qemud/remote_protocol.x
index a3ea3f033c..e73ffaa5cd 100644
--- a/qemud/remote_protocol.x
+++ b/qemud/remote_protocol.x
@@ -1062,18 +1062,3 @@ struct remote_message_header {
     unsigned serial;            /* Serial number of message. */
     remote_message_status status;
 };
-
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/bridge.c b/src/bridge.c
index f5c27af10e..b5af09c768 100644
--- a/src/bridge.c
+++ b/src/bridge.c
@@ -771,12 +771,3 @@ brSetEnableSTP(brControl *ctl ATTRIBUTE_UNUSED,
 }
 
 #endif /* WITH_QEMU */
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/bridge.h b/src/bridge.h
index 5dcca00040..cf444e0969 100644
--- a/src/bridge.h
+++ b/src/bridge.h
@@ -104,12 +104,3 @@ int     brGetEnableSTP          (brControl *ctl,
 #endif /* WITH_QEMU */
 
 #endif /* __QEMUD_BRIDGE_H__ */
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/buf.c b/src/buf.c
index 72d9f528a6..236219ddb2 100644
--- a/src/buf.c
+++ b/src/buf.c
@@ -382,17 +382,3 @@ virBufferStrcat(virBufferPtr buf, ...)
     va_end(ap);
     return 0;
 }
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/capabilities.c b/src/capabilities.c
index 01bb30803d..18fc2a337d 100644
--- a/src/capabilities.c
+++ b/src/capabilities.c
@@ -690,12 +690,3 @@ virCapabilitiesFormatXML(virCapsPtr caps)
     free(xml.content);
     return NULL;
 }
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/capabilities.h b/src/capabilities.h
index b379e515d0..770779cba4 100644
--- a/src/capabilities.h
+++ b/src/capabilities.h
@@ -169,12 +169,3 @@ virCapabilitiesFormatXML(virCapsPtr caps);
 
 
 #endif /* __VIR_CAPABILITIES_H */
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/conf.c b/src/conf.c
index b955028a18..064c0fe2a6 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -963,13 +963,3 @@ error:
     virBufferFree(buf);
     return(ret);
 }
-
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/conf.h b/src/conf.h
index 53c94563fe..a5758240c6 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -95,12 +95,3 @@ int		__virConfWriteMem	(char *memory,
 }
 #endif
 #endif /* __VIR_CONF_H__ */
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/console.c b/src/console.c
index 079d4efea6..46b323efc7 100644
--- a/src/console.c
+++ b/src/console.c
@@ -198,12 +198,3 @@ int vshRunConsole(const char *tty) {
 }
 
 #endif /* !__MINGW32__ */
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/console.h b/src/console.h
index 279800d947..f36791b7ed 100644
--- a/src/console.h
+++ b/src/console.h
@@ -38,12 +38,3 @@ extern "C" {
 #endif /* !__MINGW32__ */
 
 #endif /* __VIR_CONSOLE_H__ */
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/driver.h b/src/driver.h
index efb0887fc1..472456006b 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -590,17 +590,3 @@ int virRegisterStateDriver(virStateDriverPtr);
 }
 #endif /* __cplusplus */
 #endif /* __VIR_DRIVER_H__ */
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/event.c b/src/event.c
index 274db9de3f..bd367979f8 100644
--- a/src/event.c
+++ b/src/event.c
@@ -83,13 +83,3 @@ void __virEventRegisterImpl(virEventAddHandleFunc addHandle,
     updateTimeoutImpl = updateTimeout;
     removeTimeoutImpl = removeTimeout;
 }
-
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/hash.c b/src/hash.c
index b029e4f58e..409400bd92 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -1344,18 +1344,3 @@ virUnrefStorageVol(virStorageVolPtr vol) {
     pthread_mutex_unlock(&vol->conn->lock);
     return (refs);
 }
-
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/internal.h b/src/internal.h
index dde673b00f..605bd825f1 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -329,17 +329,3 @@ virDomainPtr __virDomainMigrateFinish (virConnectPtr dconn, const char *dname, c
 }
 #endif                          /* __cplusplus */
 #endif                          /* __VIR_INTERNAL_H__ */
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/iptables.c b/src/iptables.c
index c08a00e74c..249262ae63 100644
--- a/src/iptables.c
+++ b/src/iptables.c
@@ -1158,12 +1158,3 @@ iptablesRemoveForwardMasquerade(iptablesContext *ctx,
 }
 
 #endif /* WITH_QEMU */
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/iptables.h b/src/iptables.h
index e33513ec1a..95f07de7b5 100644
--- a/src/iptables.h
+++ b/src/iptables.h
@@ -98,12 +98,3 @@ int              iptablesRemoveForwardMasquerade (iptablesContext *ctx,
 #endif /* WITH_QEMU */
 
 #endif /* __QEMUD_IPTABLES_H__ */
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/libvirt.c b/src/libvirt.c
index e4a1c3bf0c..39fe8bc276 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -5021,18 +5021,3 @@ virStorageVolGetPath(virStorageVolPtr vol)
     virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__);
     return NULL;
 }
-
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/lxc_conf.c b/src/lxc_conf.c
index 325a1bf090..fd45709074 100644
--- a/src/lxc_conf.c
+++ b/src/lxc_conf.c
@@ -886,13 +886,3 @@ int lxcDeleteConfig(virConnectPtr conn,
 }
 
 #endif /* WITH_LXC */
-
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/lxc_container.c b/src/lxc_container.c
index d02c23b827..2c7cbebd62 100644
--- a/src/lxc_container.c
+++ b/src/lxc_container.c
@@ -217,13 +217,3 @@ cleanup:
 }
 
 #endif /* WITH_LXC */
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
-
diff --git a/src/lxc_container.h b/src/lxc_container.h
index d8deecfdad..7d5341d8b4 100644
--- a/src/lxc_container.h
+++ b/src/lxc_container.h
@@ -32,13 +32,3 @@ int lxcChild( void *argv );
 #endif /* LXC_DRIVER_H */
 
 #endif /* LXC_CONTAINER_H */
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
-
diff --git a/src/lxc_driver.c b/src/lxc_driver.c
index db597e1b5a..f6539b4659 100644
--- a/src/lxc_driver.c
+++ b/src/lxc_driver.c
@@ -1071,12 +1071,3 @@ int lxcRegister(void)
 }
 
 #endif /* WITH_LXC */
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/lxc_driver.h b/src/lxc_driver.h
index 5a7d76e453..05158754f5 100644
--- a/src/lxc_driver.h
+++ b/src/lxc_driver.h
@@ -34,12 +34,3 @@ int lxcRegister(void);
 #endif /* WITH_LXC */
 
 #endif /* LXC_DRIVER_H */
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/nodeinfo.c b/src/nodeinfo.c
index ff5784e279..77b2072fbf 100644
--- a/src/nodeinfo.c
+++ b/src/nodeinfo.c
@@ -170,13 +170,3 @@ int virNodeInfoPopulate(virConnectPtr conn,
     return -1;
 #endif
 }
-
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/openvz_driver.c b/src/openvz_driver.c
index 1db3c6017d..0bae4fd977 100644
--- a/src/openvz_driver.c
+++ b/src/openvz_driver.c
@@ -781,12 +781,3 @@ int openvzRegister(void) {
 }
 
 #endif /* WITH_OPENVZ */
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/openvz_driver.h b/src/openvz_driver.h
index 0ffcfc6522..0c1716cc84 100644
--- a/src/openvz_driver.h
+++ b/src/openvz_driver.h
@@ -52,13 +52,3 @@ int openvzRegister(void);
 				fprintf(stderr, "\n"); }
 
 #endif
-
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/parthelper.c b/src/parthelper.c
index 44cc052496..d593c49fc0 100644
--- a/src/parthelper.c
+++ b/src/parthelper.c
@@ -112,16 +112,3 @@ int main(int argc, char **argv)
 
     return 0;
 }
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/proxy_internal.c b/src/proxy_internal.c
index 7022323b5e..2a9fb550e5 100644
--- a/src/proxy_internal.c
+++ b/src/proxy_internal.c
@@ -1108,17 +1108,3 @@ xenProxyDomainGetOSType(virDomainPtr domain)
 }
 
 #endif /* WITH_XEN */
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/proxy_internal.h b/src/proxy_internal.h
index fb44d0dd7f..0d8e5a8c2f 100644
--- a/src/proxy_internal.h
+++ b/src/proxy_internal.h
@@ -102,17 +102,3 @@ extern char *       xenProxyDomainDumpXML(virDomainPtr domain,
 }
 #endif                          /* __cplusplus */
 #endif /* __LIBVIR_PROXY_H__ */
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/qemu_conf.c b/src/qemu_conf.c
index 6ff0852f37..774183bcad 100644
--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
@@ -3257,12 +3257,3 @@ int qemudDeleteConfig(virConnectPtr conn,
 }
 
 #endif /* WITH_QEMU */
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/qemu_conf.h b/src/qemu_conf.h
index f52b359b43..c59b1faebd 100644
--- a/src/qemu_conf.h
+++ b/src/qemu_conf.h
@@ -434,12 +434,3 @@ char *      qemudGenerateNetworkXML     (virConnectPtr conn,
 #endif /* WITH_QEMU */
 
 #endif /* __QEMUD_CONF_H */
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 87b58db6b4..0ed426265b 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -3104,12 +3104,3 @@ int qemudRegister(void) {
 }
 
 #endif /* WITH_QEMU */
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/qemu_driver.h b/src/qemu_driver.h
index 72b397c6e0..a8a0319f90 100644
--- a/src/qemu_driver.h
+++ b/src/qemu_driver.h
@@ -36,12 +36,3 @@ int qemudRegister(void);
 #endif /* WITH_QEMU */
 
 #endif /* QEMUD_DRIVER_H */
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/qparams.c b/src/qparams.c
index 1c06fb1a4c..c5ed1f61c4 100644
--- a/src/qparams.c
+++ b/src/qparams.c
@@ -231,17 +231,3 @@ qparam_query_parse (const char *query)
     free_qparam_set (ps);
     return NULL;
 }
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/qparams.h b/src/qparams.h
index 09b460a494..8cdaeae2d3 100644
--- a/src/qparams.h
+++ b/src/qparams.h
@@ -54,17 +54,3 @@ extern struct qparam_set *qparam_query_parse (const char *query);
 extern void free_qparam_set (struct qparam_set *ps);
 
 #endif /* _QPARAMS_H_ */
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/remote_internal.c b/src/remote_internal.c
index 38eed424a6..065ee970a1 100644
--- a/src/remote_internal.c
+++ b/src/remote_internal.c
@@ -4813,17 +4813,3 @@ remoteRegister (void)
 
     return 0;
 }
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/remote_internal.h b/src/remote_internal.h
index ce8f400dce..336b9a5d6f 100644
--- a/src/remote_internal.h
+++ b/src/remote_internal.h
@@ -51,17 +51,3 @@ int remoteRegister (void);
 }
 #endif
 #endif /* __VIR_REMOTE_INTERNAL_H__ */
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/stats_linux.c b/src/stats_linux.c
index 4cbe92a075..bf46ca2191 100644
--- a/src/stats_linux.c
+++ b/src/stats_linux.c
@@ -445,16 +445,3 @@ linuxDomainInterfaceStats (virConnectPtr conn, const char *path,
 }
 
 #endif /* __linux__ */
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/stats_linux.h b/src/stats_linux.h
index ada4005686..8fd9b00eb8 100644
--- a/src/stats_linux.h
+++ b/src/stats_linux.h
@@ -26,16 +26,3 @@ extern int xenLinuxDomainDeviceID(virConnectPtr conn, int domid, const char *dev
 #endif /* __linux__ */
 
 #endif /* __STATS_LINUX_H__ */
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/storage_backend.c b/src/storage_backend.c
index 92aecfd3f0..65847fb1da 100644
--- a/src/storage_backend.c
+++ b/src/storage_backend.c
@@ -623,18 +623,3 @@ virStorageBackendRunProgNul(virConnectPtr conn,
 
     return 0;
 }
-
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/storage_backend.h b/src/storage_backend.h
index 1533e7e6be..0ec0d905c8 100644
--- a/src/storage_backend.h
+++ b/src/storage_backend.h
@@ -143,17 +143,3 @@ int virStorageBackendRunProgNul(virConnectPtr conn,
                                 void *data);
 
 #endif /* __VIR_STORAGE_BACKEND_H__ */
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/storage_backend_disk.c b/src/storage_backend_disk.c
index 55bfd8d6fe..0efc96887b 100644
--- a/src/storage_backend_disk.c
+++ b/src/storage_backend_disk.c
@@ -521,17 +521,3 @@ virStorageBackend virStorageBackendDisk = {
 
     .volType = VIR_STORAGE_VOL_BLOCK,
 };
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/storage_backend_disk.h b/src/storage_backend_disk.h
index e80ac61007..e1c7391e28 100644
--- a/src/storage_backend_disk.h
+++ b/src/storage_backend_disk.h
@@ -29,17 +29,3 @@
 extern virStorageBackend virStorageBackendDisk;
 
 #endif /* __VIR_STORAGE_BACKEND_DISK_H__ */
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/storage_backend_fs.c b/src/storage_backend_fs.c
index 867910fd81..d0eb32a18c 100644
--- a/src/storage_backend_fs.c
+++ b/src/storage_backend_fs.c
@@ -1108,17 +1108,3 @@ virStorageBackend virStorageBackendNetFileSystem = {
     .volType = VIR_STORAGE_VOL_FILE,
 };
 #endif /* WITH_STORAGE_FS */
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/storage_backend_fs.h b/src/storage_backend_fs.h
index 3b8697ff61..2136d68aaa 100644
--- a/src/storage_backend_fs.h
+++ b/src/storage_backend_fs.h
@@ -33,17 +33,3 @@ extern virStorageBackend virStorageBackendNetFileSystem;
 extern virStorageBackend virStorageBackendDirectory;
 
 #endif /* __VIR_STORAGE_BACKEND_FS_H__ */
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/storage_backend_iscsi.c b/src/storage_backend_iscsi.c
index da2b666b9c..02bf8a378b 100644
--- a/src/storage_backend_iscsi.c
+++ b/src/storage_backend_iscsi.c
@@ -520,17 +520,3 @@ virStorageBackend virStorageBackendISCSI = {
 
   .volType = VIR_STORAGE_VOL_BLOCK,
 };
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/storage_backend_iscsi.h b/src/storage_backend_iscsi.h
index fb902fdecf..665ed1316d 100644
--- a/src/storage_backend_iscsi.h
+++ b/src/storage_backend_iscsi.h
@@ -29,17 +29,3 @@
 extern virStorageBackend virStorageBackendISCSI;
 
 #endif /* __VIR_STORAGE_BACKEND_ISCSI_H__ */
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/storage_backend_logical.c b/src/storage_backend_logical.c
index f8a075dead..2d5dd70bd2 100644
--- a/src/storage_backend_logical.c
+++ b/src/storage_backend_logical.c
@@ -515,17 +515,3 @@ virStorageBackend virStorageBackendLogical = {
 
     .volType = VIR_STORAGE_VOL_BLOCK,
 };
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/storage_backend_logical.h b/src/storage_backend_logical.h
index b3fade4983..19814df32c 100644
--- a/src/storage_backend_logical.h
+++ b/src/storage_backend_logical.h
@@ -29,17 +29,3 @@
 extern virStorageBackend virStorageBackendLogical;
 
 #endif /* __VIR_STORAGE_BACKEND_LOGVOL_H__ */
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/storage_conf.c b/src/storage_conf.c
index 0c19aefe14..566aaeb2ea 100644
--- a/src/storage_conf.c
+++ b/src/storage_conf.c
@@ -1236,17 +1236,3 @@ virStoragePoolObjDeleteDef(virConnectPtr conn,
 
     return 0;
 }
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/storage_conf.h b/src/storage_conf.h
index 9ed5e9facd..e3577b59ca 100644
--- a/src/storage_conf.h
+++ b/src/storage_conf.h
@@ -297,18 +297,3 @@ void virStoragePoolObjRemove(virStorageDriverStatePtr driver,
                              virStoragePoolObjPtr pool);
 
 #endif /* __VIR_STORAGE_DRIVER_H__ */
-
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/storage_driver.c b/src/storage_driver.c
index fc3db4cd07..d0e38f66d3 100644
--- a/src/storage_driver.c
+++ b/src/storage_driver.c
@@ -1250,17 +1250,3 @@ int storageRegister(void) {
     virRegisterStateDriver(&stateDriver);
     return 0;
 }
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/storage_driver.h b/src/storage_driver.h
index 9c332bbda7..500ea029b1 100644
--- a/src/storage_driver.h
+++ b/src/storage_driver.h
@@ -29,17 +29,3 @@
 int storageRegister(void);
 
 #endif /* __VIR_STORAGE_DRIVER_H__ */
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/test.c b/src/test.c
index 0a3779a12b..84c6fc509a 100644
--- a/src/test.c
+++ b/src/test.c
@@ -2116,17 +2116,3 @@ testRegister(void)
 }
 
 #endif /* WITH_TEST */
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/test.h b/src/test.h
index a20ee22fae..ffc5d7b5ce 100644
--- a/src/test.h
+++ b/src/test.h
@@ -36,12 +36,3 @@ int testRegister(void);
 }
 #endif
 #endif /* __VIR_TEST_INTERNAL_H__ */
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/util.c b/src/util.c
index 801f61561a..595e7213ec 100644
--- a/src/util.c
+++ b/src/util.c
@@ -769,11 +769,3 @@ virParseMacAddr(const char* str, unsigned char *addr)
 
     return -1;
 }
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- * End:
- */
diff --git a/src/uuid.c b/src/uuid.c
index 78b90e5638..fea1764344 100644
--- a/src/uuid.c
+++ b/src/uuid.c
@@ -187,13 +187,3 @@ void virUUIDFormat(const unsigned char *uuid, char *uuidstr)
              uuid[12], uuid[13], uuid[14], uuid[15]);
     uuidstr[VIR_UUID_STRING_BUFLEN-1] = '\0';
 }
-
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/virsh.c b/src/virsh.c
index 9534af468f..817cb985db 100644
--- a/src/virsh.c
+++ b/src/virsh.c
@@ -6615,17 +6615,3 @@ main(int argc, char **argv)
     vshDeinit(ctl);
     exit(ret ? EXIT_SUCCESS : EXIT_FAILURE);
 }
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/virterror.c b/src/virterror.c
index 21109f2cb3..35328b040b 100644
--- a/src/virterror.c
+++ b/src/virterror.c
@@ -716,17 +716,3 @@ __virErrorMsg(virErrorNumber error, const char *info)
     }
     return (errmsg);
 }
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/xen_internal.c b/src/xen_internal.c
index 9189e32b7c..7ad08038fb 100644
--- a/src/xen_internal.c
+++ b/src/xen_internal.c
@@ -3278,16 +3278,3 @@ xenHypervisorGetVcpuMax(virDomainPtr domain)
 }
 
 #endif /* WITH_XEN */
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/xen_unified.c b/src/xen_unified.c
index d67332fcc6..d9117d93c4 100644
--- a/src/xen_unified.c
+++ b/src/xen_unified.c
@@ -1324,17 +1324,3 @@ xenUnifiedRegister (void)
 }
 
 #endif /* WITH_XEN */
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/xen_unified.h b/src/xen_unified.h
index dda2679505..c53050889f 100644
--- a/src/xen_unified.h
+++ b/src/xen_unified.h
@@ -127,17 +127,3 @@ char *xenDomainUsedCpus(virDomainPtr dom);
 #endif
 
 #endif /* __VIR_XEN_UNIFIED_H__ */
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/xend_internal.c b/src/xend_internal.c
index dbf4816423..bd40d3f07d 100644
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -3946,12 +3946,3 @@ error:
 
 #endif /* ! PROXY */
 #endif /* WITH_XEN */
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/xm_internal.c b/src/xm_internal.c
index f6090299cc..e759345582 100644
--- a/src/xm_internal.c
+++ b/src/xm_internal.c
@@ -3161,11 +3161,3 @@ xenXMDomainDetachDevice(virDomainPtr domain, const char *xml) {
 }
 
 #endif /* WITH_XEN */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/xml.c b/src/xml.c
index 0864dc3400..429c1d78fc 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -1773,12 +1773,3 @@ virDomainXMLDevID(virDomainPtr domain, const char *xmldesc, char *class,
 }
 #endif /* WITH_XEN */
 #endif /* !PROXY */
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/xs_internal.c b/src/xs_internal.c
index d1cf8d88e9..c944cd2e11 100644
--- a/src/xs_internal.c
+++ b/src/xs_internal.c
@@ -950,11 +950,3 @@ char *xenStoreDomainGetName(virConnectPtr conn,
 
 
 #endif /* WITH_XEN */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c
index c80e65c496..8cde403337 100644
--- a/tests/nodeinfotest.c
+++ b/tests/nodeinfotest.c
@@ -100,12 +100,3 @@ main(int argc, char **argv)
 
     exit(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index f4b3e32d34..59ea21dab4 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -202,12 +202,3 @@ main(int argc, char **argv)
 int main (void) { exit (77); /* means 'test skipped' for automake */ }
 
 #endif /* WITH_QEMU */
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index f37f948360..69cf77b825 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -165,12 +165,3 @@ main(int argc, char **argv)
 int main (void) { exit (77); /* means 'test skipped' to automake */ }
 
 #endif /* WITH_QEMU */
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c
index d6dae0d923..06c2b01e81 100644
--- a/tests/sexpr2xmltest.c
+++ b/tests/sexpr2xmltest.c
@@ -306,11 +306,3 @@ main(void)
     return(0);
 }
 #endif /* WITH_XEN */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/tests/statstest.c b/tests/statstest.c
index 2d6fc1d972..9c0981d3f1 100644
--- a/tests/statstest.c
+++ b/tests/statstest.c
@@ -216,12 +216,3 @@ main(void)
 #endif
     exit(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/tests/testutils.c b/tests/testutils.c
index 80b102224b..238c229a86 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -206,13 +206,3 @@ int virtTestCaptureProgramOutput(const char *const argv[],
         }
     }
 }
-
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/tests/testutils.h b/tests/testutils.h
index c3a9ab1757..44bbb4cab2 100644
--- a/tests/testutils.h
+++ b/tests/testutils.h
@@ -36,12 +36,3 @@ extern "C" {
 }
 #endif
 #endif /* __VIT_TEST_UTILS_H__ */
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c
index 424eae4e5c..c2161f10ba 100644
--- a/tests/xmconfigtest.c
+++ b/tests/xmconfigtest.c
@@ -344,12 +344,3 @@ main(void)
     return(0);
 }
 #endif /* WITH_XEN */
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */