[glibmm] Update the Free Software Foundation address in copyright notices



commit b92ef23e38f9863ebe4704a916e3322eea2f1f2c
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Wed Aug 30 15:57:44 2017 +0200

    Update the Free Software Foundation address in copyright notices
    
    Bug 786824

 COPYING                                     |    9 ++++-----
 build/dk-feature.m4                         |    3 +--
 examples/child_watch/main.cc                |    3 +--
 examples/compose/main.cc                    |    3 +--
 examples/dbus/client_bus_listnames.cc       |    3 +--
 examples/dbus/server_without_bus.cc         |    3 +--
 examples/dbus/session_bus_service.cc        |    3 +--
 examples/iochannel_stream/fdstream.cc       |    3 +--
 examples/iochannel_stream/fdstream.h        |    3 +--
 examples/iochannel_stream/main.cc           |    3 +--
 examples/keyfile/main.cc                    |    3 +--
 examples/markup/parser.cc                   |    3 +--
 examples/network/resolver.cc                |    6 ++----
 examples/options/main.cc                    |    3 +--
 examples/properties/properties_example.cc   |    3 +--
 examples/regex/main.cc                      |    3 +--
 gio/giomm.h                                 |    3 +--
 gio/giomm/contenttype.cc                    |    5 +----
 gio/giomm/contenttype.h                     |    5 +----
 gio/giomm/init.cc                           |    3 +--
 gio/giomm/init.h                            |    4 +---
 gio/giomm/slot_async.cc                     |    5 +----
 gio/giomm/slot_async.h                      |    5 +----
 gio/giomm/wrap_init.h                       |    4 +---
 gio/src/action.ccg                          |    5 +----
 gio/src/action.hg                           |    3 +--
 gio/src/actiongroup.ccg                     |    5 +----
 gio/src/actiongroup.hg                      |    3 +--
 gio/src/actionmap.ccg                       |    5 +----
 gio/src/actionmap.hg                        |    3 +--
 gio/src/appinfo.ccg                         |    5 +----
 gio/src/appinfo.hg                          |    3 +--
 gio/src/applaunchcontext.ccg                |    3 +--
 gio/src/applaunchcontext.hg                 |    3 +--
 gio/src/application.ccg                     |    3 +--
 gio/src/application.hg                      |    3 +--
 gio/src/applicationcommandline.ccg          |    3 +--
 gio/src/applicationcommandline.hg           |    3 +--
 gio/src/asyncinitable.ccg                   |    3 +--
 gio/src/asyncinitable.hg                    |    5 +----
 gio/src/asyncresult.ccg                     |    5 +----
 gio/src/asyncresult.hg                      |    3 +--
 gio/src/bufferedinputstream.ccg             |    5 +----
 gio/src/bufferedinputstream.hg              |    3 +--
 gio/src/bufferedoutputstream.ccg            |    5 +----
 gio/src/bufferedoutputstream.hg             |    3 +--
 gio/src/cancellable.ccg                     |    5 +----
 gio/src/cancellable.hg                      |    3 +--
 gio/src/charsetconverter.ccg                |    3 +--
 gio/src/charsetconverter.hg                 |    3 +--
 gio/src/converter.ccg                       |    5 +----
 gio/src/converter.hg                        |    5 +----
 gio/src/converterinputstream.ccg            |    3 +--
 gio/src/converterinputstream.hg             |    3 +--
 gio/src/converteroutputstream.ccg           |    3 +--
 gio/src/converteroutputstream.hg            |    3 +--
 gio/src/credentials.ccg                     |    5 +----
 gio/src/credentials.hg                      |    5 +----
 gio/src/datainputstream.ccg                 |    5 +----
 gio/src/datainputstream.hg                  |    5 +----
 gio/src/dataoutputstream.ccg                |    5 +----
 gio/src/dataoutputstream.hg                 |    3 +--
 gio/src/dbusactiongroup.ccg                 |    3 +--
 gio/src/dbusactiongroup.hg                  |    3 +--
 gio/src/dbusaddress.ccg                     |    5 +----
 gio/src/dbusaddress.hg                      |    5 +----
 gio/src/dbusauthobserver.ccg                |    5 +----
 gio/src/dbusauthobserver.hg                 |    5 +----
 gio/src/dbusconnection.ccg                  |    3 +--
 gio/src/dbusconnection.hg                   |    3 +--
 gio/src/dbuserror.ccg                       |    5 +----
 gio/src/dbuserror.hg                        |    5 +----
 gio/src/dbuserrorutils.ccg                  |    5 +----
 gio/src/dbuserrorutils.hg                   |    5 +----
 gio/src/dbusinterface.ccg                   |    5 +----
 gio/src/dbusinterface.hg                    |    5 +----
 gio/src/dbusinterfaceskeleton.ccg           |    3 +--
 gio/src/dbusinterfaceskeleton.hg            |    3 +--
 gio/src/dbusinterfacevtable.ccg             |    5 +----
 gio/src/dbusinterfacevtable.hg              |    5 +----
 gio/src/dbusintrospection.ccg               |    5 +----
 gio/src/dbusintrospection.hg                |    3 +--
 gio/src/dbusmenumodel.ccg                   |    3 +--
 gio/src/dbusmenumodel.hg                    |    3 +--
 gio/src/dbusmessage.ccg                     |    5 +----
 gio/src/dbusmessage.hg                      |    3 +--
 gio/src/dbusmethodinvocation.ccg            |    5 +----
 gio/src/dbusmethodinvocation.hg             |    5 +----
 gio/src/dbusobject.ccg                      |    5 +----
 gio/src/dbusobject.hg                       |    3 +--
 gio/src/dbusownname.ccg                     |    5 +----
 gio/src/dbusownname.hg                      |    3 +--
 gio/src/dbusproxy.ccg                       |    3 +--
 gio/src/dbusproxy.hg                        |    3 +--
 gio/src/dbusserver.ccg                      |    3 +--
 gio/src/dbusserver.hg                       |    3 +--
 gio/src/dbussubtreevtable.ccg               |    5 +----
 gio/src/dbussubtreevtable.hg                |    5 +----
 gio/src/dbusutils.ccg                       |    5 +----
 gio/src/dbusutils.hg                        |    5 +----
 gio/src/dbuswatchname.ccg                   |    5 +----
 gio/src/dbuswatchname.hg                    |    3 +--
 gio/src/desktopappinfo.ccg                  |    5 +----
 gio/src/desktopappinfo.hg                   |    3 +--
 gio/src/drive.ccg                           |    5 +----
 gio/src/drive.hg                            |    3 +--
 gio/src/emblem.ccg                          |    5 +----
 gio/src/emblem.hg                           |    5 +----
 gio/src/emblemedicon.ccg                    |    5 +----
 gio/src/emblemedicon.hg                     |    5 +----
 gio/src/enums.ccg                           |    5 +----
 gio/src/enums.hg                            |    3 +--
 gio/src/error.ccg                           |    5 +----
 gio/src/error.hg                            |    5 +----
 gio/src/file.ccg                            |    3 +--
 gio/src/file.hg                             |    3 +--
 gio/src/fileattributeinfo.ccg               |    5 +----
 gio/src/fileattributeinfo.hg                |    5 +----
 gio/src/fileattributeinfolist.ccg           |    5 +----
 gio/src/fileattributeinfolist.hg            |    3 +--
 gio/src/fileenumerator.ccg                  |    5 +----
 gio/src/fileenumerator.hg                   |    5 +----
 gio/src/fileicon.ccg                        |    5 +----
 gio/src/fileicon.hg                         |    3 +--
 gio/src/fileinfo.ccg                        |    5 +----
 gio/src/fileinfo.hg                         |    3 +--
 gio/src/fileinputstream.ccg                 |    5 +----
 gio/src/fileinputstream.hg                  |    3 +--
 gio/src/fileiostream.ccg                    |    5 +----
 gio/src/fileiostream.hg                     |    3 +--
 gio/src/filemonitor.ccg                     |    5 +----
 gio/src/filemonitor.hg                      |    5 +----
 gio/src/filenamecompleter.ccg               |    5 +----
 gio/src/filenamecompleter.hg                |    5 +----
 gio/src/fileoutputstream.ccg                |    5 +----
 gio/src/fileoutputstream.hg                 |    3 +--
 gio/src/filterinputstream.ccg               |    3 +--
 gio/src/filterinputstream.hg                |    3 +--
 gio/src/filteroutputstream.ccg              |    3 +--
 gio/src/filteroutputstream.hg               |    3 +--
 gio/src/icon.ccg                            |    5 +----
 gio/src/icon.hg                             |    3 +--
 gio/src/inetaddress.ccg                     |    5 +----
 gio/src/inetaddress.hg                      |    3 +--
 gio/src/inetsocketaddress.ccg               |    5 +----
 gio/src/inetsocketaddress.hg                |    5 +----
 gio/src/initable.ccg                        |    5 +----
 gio/src/initable.hg                         |    5 +----
 gio/src/inputstream.ccg                     |    5 +----
 gio/src/inputstream.hg                      |    3 +--
 gio/src/iostream.ccg                        |    5 +----
 gio/src/iostream.hg                         |    3 +--
 gio/src/listmodel.ccg                       |    3 +--
 gio/src/listmodel.hg                        |    3 +--
 gio/src/liststore.ccg                       |    3 +--
 gio/src/liststore.hg                        |    3 +--
 gio/src/loadableicon.ccg                    |    5 +----
 gio/src/loadableicon.hg                     |    3 +--
 gio/src/memoryinputstream.ccg               |    5 +----
 gio/src/memoryinputstream.hg                |    3 +--
 gio/src/memoryoutputstream.ccg              |    3 +--
 gio/src/memoryoutputstream.hg               |    3 +--
 gio/src/menu.ccg                            |    3 +--
 gio/src/menu.hg                             |    3 +--
 gio/src/menuattributeiter.ccg               |    3 +--
 gio/src/menuattributeiter.hg                |    3 +--
 gio/src/menuitem.ccg                        |    3 +--
 gio/src/menuitem.hg                         |    3 +--
 gio/src/menulinkiter.ccg                    |    3 +--
 gio/src/menulinkiter.hg                     |    3 +--
 gio/src/menumodel.ccg                       |    3 +--
 gio/src/menumodel.hg                        |    3 +--
 gio/src/mount.ccg                           |    5 +----
 gio/src/mount.hg                            |    3 +--
 gio/src/mountoperation.ccg                  |    5 +----
 gio/src/mountoperation.hg                   |    3 +--
 gio/src/networkaddress.ccg                  |    5 +----
 gio/src/networkaddress.hg                   |    5 +----
 gio/src/networkmonitor.ccg                  |    3 +--
 gio/src/networkmonitor.hg                   |    3 +--
 gio/src/networkservice.ccg                  |    5 +----
 gio/src/networkservice.hg                   |    5 +----
 gio/src/outputstream.ccg                    |    5 +----
 gio/src/outputstream.hg                     |    3 +--
 gio/src/permission.ccg                      |    3 +--
 gio/src/permission.hg                       |    3 +--
 gio/src/pollableinputstream.ccg             |    5 +----
 gio/src/pollableinputstream.hg              |    3 +--
 gio/src/pollableoutputstream.ccg            |    5 +----
 gio/src/pollableoutputstream.hg             |    3 +--
 gio/src/proxy.ccg                           |    5 +----
 gio/src/proxy.hg                            |    5 +----
 gio/src/proxyaddress.ccg                    |    5 +----
 gio/src/proxyaddress.hg                     |    5 +----
 gio/src/proxyresolver.ccg                   |    5 +----
 gio/src/proxyresolver.hg                    |    5 +----
 gio/src/remoteactiongroup.ccg               |    5 +----
 gio/src/remoteactiongroup.hg                |    3 +--
 gio/src/resolver.ccg                        |    3 +--
 gio/src/resolver.hg                         |    3 +--
 gio/src/resource.ccg                        |    3 +--
 gio/src/resource.hg                         |    3 +--
 gio/src/seekable.ccg                        |    5 +----
 gio/src/seekable.hg                         |    5 +----
 gio/src/settings.ccg                        |    3 +--
 gio/src/settings.hg                         |    3 +--
 gio/src/settingsschema.ccg                  |    3 +--
 gio/src/settingsschema.hg                   |    3 +--
 gio/src/settingsschemakey.ccg               |    3 +--
 gio/src/settingsschemakey.hg                |    3 +--
 gio/src/settingsschemasource.ccg            |    3 +--
 gio/src/settingsschemasource.hg             |    3 +--
 gio/src/simpleaction.ccg                    |    3 +--
 gio/src/simpleaction.hg                     |    3 +--
 gio/src/simpleactiongroup.ccg               |    3 +--
 gio/src/simpleactiongroup.hg                |    3 +--
 gio/src/simplepermission.ccg                |    3 +--
 gio/src/simplepermission.hg                 |    3 +--
 gio/src/socket.ccg                          |    5 +----
 gio/src/socket.hg                           |    3 +--
 gio/src/socketaddress.ccg                   |    5 +----
 gio/src/socketaddress.hg                    |    5 +----
 gio/src/socketaddressenumerator.ccg         |    5 +----
 gio/src/socketaddressenumerator.hg          |    5 +----
 gio/src/socketclient.ccg                    |    5 +----
 gio/src/socketclient.hg                     |    3 +--
 gio/src/socketconnectable.ccg               |    5 +----
 gio/src/socketconnectable.hg                |    3 +--
 gio/src/socketconnection.ccg                |    5 +----
 gio/src/socketconnection.hg                 |    3 +--
 gio/src/socketcontrolmessage.ccg            |    5 +----
 gio/src/socketcontrolmessage.hg             |    5 +----
 gio/src/socketlistener.ccg                  |    5 +----
 gio/src/socketlistener.hg                   |    5 +----
 gio/src/socketservice.ccg                   |    5 +----
 gio/src/socketservice.hg                    |    3 +--
 gio/src/srvtarget.ccg                       |    5 +----
 gio/src/srvtarget.hg                        |    3 +--
 gio/src/tcpconnection.ccg                   |    5 +----
 gio/src/tcpconnection.hg                    |    5 +----
 gio/src/tcpwrapperconnection.ccg            |    3 +--
 gio/src/tcpwrapperconnection.hg             |    3 +--
 gio/src/themedicon.ccg                      |    3 +--
 gio/src/themedicon.hg                       |    3 +--
 gio/src/threadedsocketservice.ccg           |    5 +----
 gio/src/threadedsocketservice.hg            |    5 +----
 gio/src/tlscertificate.ccg                  |    3 +--
 gio/src/tlscertificate.hg                   |    3 +--
 gio/src/tlsclientconnection.ccg             |    3 +--
 gio/src/tlsclientconnection.hg              |    3 +--
 gio/src/tlsconnection.ccg                   |    3 +--
 gio/src/tlsconnection.hg                    |    3 +--
 gio/src/tlsdatabase.ccg                     |    3 +--
 gio/src/tlsdatabase.hg                      |    3 +--
 gio/src/tlsfiledatabase.ccg                 |    3 +--
 gio/src/tlsfiledatabase.hg                  |    3 +--
 gio/src/tlsinteraction.ccg                  |    4 ++--
 gio/src/tlsinteraction.hg                   |    3 +--
 gio/src/tlspassword.ccg                     |    3 +--
 gio/src/tlspassword.hg                      |    3 +--
 gio/src/tlsserverconnection.ccg             |    3 +--
 gio/src/tlsserverconnection.hg              |    3 +--
 gio/src/unixconnection.ccg                  |    5 +----
 gio/src/unixconnection.hg                   |    5 +----
 gio/src/unixcredentialsmessage.ccg          |    5 +----
 gio/src/unixcredentialsmessage.hg           |    5 +----
 gio/src/unixfdlist.ccg                      |    3 +--
 gio/src/unixfdlist.hg                       |    3 +--
 gio/src/unixfdmessage.ccg                   |    3 +--
 gio/src/unixfdmessage.hg                    |    3 +--
 gio/src/unixinputstream.ccg                 |    5 +----
 gio/src/unixinputstream.hg                  |    3 +--
 gio/src/unixmount.ccg                       |    5 +----
 gio/src/unixmount.hg                        |    5 +----
 gio/src/unixoutputstream.ccg                |    5 +----
 gio/src/unixoutputstream.hg                 |    3 +--
 gio/src/unixsocketaddress.ccg               |    5 +----
 gio/src/unixsocketaddress.hg                |    3 +--
 gio/src/volume.ccg                          |    5 +----
 gio/src/volume.hg                           |    3 +--
 gio/src/volumemonitor.ccg                   |    5 +----
 gio/src/volumemonitor.hg                    |    3 +--
 gio/src/zlibcompressor.ccg                  |    3 +--
 gio/src/zlibcompressor.hg                   |    3 +--
 gio/src/zlibdecompressor.ccg                |    3 +--
 gio/src/zlibdecompressor.hg                 |    3 +--
 glib/glibmm.h                               |    3 +--
 glib/glibmm/base64.cc                       |    3 +--
 glib/glibmm/base64.h                        |    3 +--
 glib/glibmm/class.cc                        |    3 +--
 glib/glibmm/class.h                         |    3 +--
 glib/glibmm/containerhandle_shared.h        |    3 +--
 glib/glibmm/debug.cc                        |    5 +----
 glib/glibmm/debug.h                         |    4 +---
 glib/glibmm/dispatcher.cc                   |    3 +--
 glib/glibmm/dispatcher.h                    |    3 +--
 glib/glibmm/error.cc                        |    3 +--
 glib/glibmm/error.h                         |    3 +--
 glib/glibmm/exception.cc                    |    6 +-----
 glib/glibmm/exception.h                     |    5 +----
 glib/glibmm/exceptionhandler.cc             |    5 +----
 glib/glibmm/exceptionhandler.h              |    4 +---
 glib/glibmm/i18n-lib.h                      |    6 +-----
 glib/glibmm/i18n.h                          |    6 +-----
 glib/glibmm/init.cc                         |    3 +--
 glib/glibmm/init.h                          |    3 +--
 glib/glibmm/interface.cc                    |    3 +--
 glib/glibmm/interface.h                     |    6 +-----
 glib/glibmm/main.cc                         |    3 +--
 glib/glibmm/main.h                          |    3 +--
 glib/glibmm/object.cc                       |    3 +--
 glib/glibmm/object.h                        |    3 +--
 glib/glibmm/objectbase.cc                   |    3 +--
 glib/glibmm/objectbase.h                    |    3 +--
 glib/glibmm/pattern.cc                      |    6 +-----
 glib/glibmm/pattern.h                       |    6 +-----
 glib/glibmm/priorities.h                    |    6 +-----
 glib/glibmm/property.cc                     |    3 +--
 glib/glibmm/property.h                      |    3 +--
 glib/glibmm/propertyproxy.cc                |    6 +-----
 glib/glibmm/propertyproxy.h                 |    4 +---
 glib/glibmm/propertyproxy_base.cc           |    3 +--
 glib/glibmm/propertyproxy_base.h            |    3 +--
 glib/glibmm/quark.cc                        |    5 +----
 glib/glibmm/quark.h                         |    4 +---
 glib/glibmm/random.cc                       |    6 +-----
 glib/glibmm/random.h                        |    6 +-----
 glib/glibmm/refptr.h                        |    3 +--
 glib/glibmm/signalproxy.cc                  |    3 +--
 glib/glibmm/signalproxy.h                   |    3 +--
 glib/glibmm/signalproxy_connectionnode.cc   |    3 +--
 glib/glibmm/signalproxy_connectionnode.h    |    3 +--
 glib/glibmm/stringutils.cc                  |    6 +-----
 glib/glibmm/stringutils.h                   |    6 +-----
 glib/glibmm/timer.cc                        |    3 +--
 glib/glibmm/timer.h                         |    6 +-----
 glib/glibmm/timeval.cc                      |    6 +-----
 glib/glibmm/timeval.h                       |    6 +-----
 glib/glibmm/ustring.cc                      |    3 +--
 glib/glibmm/ustring.h                       |    3 +--
 glib/glibmm/utility.cc                      |    7 +------
 glib/glibmm/utility.h                       |    3 +--
 glib/glibmm/value.cc                        |    6 +-----
 glib/glibmm/value.h                         |    3 +--
 glib/glibmm/value_custom.cc                 |    6 +-----
 glib/glibmm/value_custom.h                  |    3 +--
 glib/glibmm/vectorutils.cc                  |    3 +--
 glib/glibmm/vectorutils.h                   |    4 +---
 glib/glibmm/wrap.cc                         |    6 +-----
 glib/glibmm/wrap.h                          |    3 +--
 glib/glibmm/wrap_init.h                     |    6 +-----
 glib/src/balancedtree.hg                    |    3 +--
 glib/src/bytearray.ccg                      |    3 +--
 glib/src/bytearray.hg                       |    3 +--
 glib/src/bytes.ccg                          |    3 +--
 glib/src/bytes.hg                           |    3 +--
 glib/src/checksum.ccg                       |    3 +--
 glib/src/checksum.hg                        |    3 +--
 glib/src/convert.ccg                        |    5 +----
 glib/src/convert.hg                         |    3 +--
 glib/src/date.ccg                           |    3 +--
 glib/src/date.hg                            |    3 +--
 glib/src/datetime.ccg                       |    3 +--
 glib/src/datetime.hg                        |    3 +--
 glib/src/enums.ccg                          |    3 +--
 glib/src/enums.hg                           |    3 +--
 glib/src/fileutils.ccg                      |    3 +--
 glib/src/fileutils.hg                       |    3 +--
 glib/src/iochannel.ccg                      |    3 +--
 glib/src/iochannel.hg                       |    3 +--
 glib/src/keyfile.ccg                        |    3 +--
 glib/src/keyfile.hg                         |    3 +--
 glib/src/markup.ccg                         |    3 +--
 glib/src/markup.hg                          |    3 +--
 glib/src/miscutils.ccg                      |    3 +--
 glib/src/miscutils.hg                       |    3 +--
 glib/src/module.ccg                         |    3 +--
 glib/src/module.hg                          |    3 +--
 glib/src/nodetree.hg                        |    3 +--
 glib/src/optioncontext.ccg                  |    3 +--
 glib/src/optioncontext.hg                   |    3 +--
 glib/src/optionentry.ccg                    |    3 +--
 glib/src/optionentry.hg                     |    3 +--
 glib/src/optiongroup.ccg                    |    3 +--
 glib/src/optiongroup.hg                     |    3 +--
 glib/src/regex.ccg                          |    3 +--
 glib/src/regex.hg                           |    3 +--
 glib/src/shell.ccg                          |    3 +--
 glib/src/shell.hg                           |    3 +--
 glib/src/spawn.ccg                          |    3 +--
 glib/src/spawn.hg                           |    3 +--
 glib/src/template.macros.m4                 |    3 +--
 glib/src/timezone.ccg                       |    3 +--
 glib/src/timezone.hg                        |    3 +--
 glib/src/unicode.ccg                        |    3 +--
 glib/src/unicode.hg                         |    3 +--
 glib/src/uriutils.ccg                       |    3 +--
 glib/src/uriutils.hg                        |    3 +--
 glib/src/value_basictypes.cc.m4             |    3 +--
 glib/src/value_basictypes.h.m4              |    3 +--
 glib/src/variant.ccg                        |    3 +--
 glib/src/variant.hg                         |    3 +--
 glib/src/variant_basictypes.cc.m4           |    3 +--
 glib/src/variant_basictypes.h.m4            |    3 +--
 glib/src/variantdict.ccg                    |    3 +--
 glib/src/variantdict.hg                     |   11 +++++------
 glib/src/variantiter.ccg                    |    7 +++----
 glib/src/variantiter.hg                     |   11 +++++------
 glib/src/varianttype.ccg                    |    3 +--
 glib/src/varianttype.hg                     |    3 +--
 tests/glibmm_bool_vector/main.cc            |    3 +--
 tests/glibmm_null_vectorutils/main.cc       |    3 +--
 tests/glibmm_vector/main.cc                 |    3 +--
 tools/defs_fixer.pl                         |    3 +--
 tools/extra_defs_gen/generate_defs_gio.cc   |    3 +--
 tools/extra_defs_gen/generate_defs_glib.cc  |    3 +--
 tools/extra_defs_gen/generate_extra_defs.cc |    3 +--
 tools/extra_defs_gen/generate_extra_defs.h  |    5 +----
 tools/gmmproc.in                            |    3 +--
 tools/pm/DocsParser.pm                      |    3 +--
 tools/pm/GtkDefs.pm                         |    3 +--
 tools/pm/Output.pm                          |    3 +--
 tools/pm/Util.pm                            |    3 +--
 tools/pm/WrapParser.pm                      |    3 +--
 424 files changed, 439 insertions(+), 1189 deletions(-)
---
diff --git a/COPYING b/COPYING
index c4792dd..5e1f37e 100644
--- a/COPYING
+++ b/COPYING
@@ -3,7 +3,7 @@
                        Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -477,14 +477,13 @@ have at least the "copyright" line and a pointer to where the full
 notice is found.
 
 
-    <one line to give the library's name and a brief idea of what it
-does.>
+    <one line to give the library's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
     License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
+    version 2.1 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -493,7 +492,7 @@ does.>
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 Also add information on how to contact you by electronic and paper
 mail.
diff --git a/build/dk-feature.m4 b/build/dk-feature.m4
index 8065441..5a36b10 100644
--- a/build/dk-feature.m4
+++ b/build/dk-feature.m4
@@ -13,8 +13,7 @@
 ## for more details.
 ##
 ## You should have received a copy of the GNU General Public License along
-## with danielk's Autostuff; if not, write to the Free Software Foundation,
-## Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+## with danielk's Autostuff.  If not, see <http://www.gnu.org/licenses/>.
 
 #serial 20110910
 
diff --git a/examples/child_watch/main.cc b/examples/child_watch/main.cc
index a995f5a..60e6c57 100644
--- a/examples/child_watch/main.cc
+++ b/examples/child_watch/main.cc
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm.h>
diff --git a/examples/compose/main.cc b/examples/compose/main.cc
index 79952bb..48aa8d9 100644
--- a/examples/compose/main.cc
+++ b/examples/compose/main.cc
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm.h>
diff --git a/examples/dbus/client_bus_listnames.cc b/examples/dbus/client_bus_listnames.cc
index a0d22fb..0dd336f 100644
--- a/examples/dbus/client_bus_listnames.cc
+++ b/examples/dbus/client_bus_listnames.cc
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm.h>
diff --git a/examples/dbus/server_without_bus.cc b/examples/dbus/server_without_bus.cc
index a4a99bb..23e8bd5 100644
--- a/examples/dbus/server_without_bus.cc
+++ b/examples/dbus/server_without_bus.cc
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* This is a basic server providing a clock like functionality.  Clients can
diff --git a/examples/dbus/session_bus_service.cc b/examples/dbus/session_bus_service.cc
index 1c137a0..25d3ae7 100644
--- a/examples/dbus/session_bus_service.cc
+++ b/examples/dbus/session_bus_service.cc
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* This is a basic server providing a clock like functionality.  Clients can
diff --git a/examples/iochannel_stream/fdstream.cc b/examples/iochannel_stream/fdstream.cc
index 51b6c3e..d3e5647 100644
--- a/examples/iochannel_stream/fdstream.cc
+++ b/examples/iochannel_stream/fdstream.cc
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "fdstream.h"
diff --git a/examples/iochannel_stream/fdstream.h b/examples/iochannel_stream/fdstream.h
index 1928344..fdfd3f3 100644
--- a/examples/iochannel_stream/fdstream.h
+++ b/examples/iochannel_stream/fdstream.h
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/examples/iochannel_stream/main.cc b/examples/iochannel_stream/main.cc
index 8234ccd..2cdfd2f 100644
--- a/examples/iochannel_stream/main.cc
+++ b/examples/iochannel_stream/main.cc
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <fcntl.h>
diff --git a/examples/keyfile/main.cc b/examples/keyfile/main.cc
index e4ddae7..c75719d 100644
--- a/examples/keyfile/main.cc
+++ b/examples/keyfile/main.cc
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm.h>
diff --git a/examples/markup/parser.cc b/examples/markup/parser.cc
index 9caaaf8..7cd5b94 100644
--- a/examples/markup/parser.cc
+++ b/examples/markup/parser.cc
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm.h>
diff --git a/examples/network/resolver.cc b/examples/network/resolver.cc
index d838213..d145a63 100644
--- a/examples/network/resolver.cc
+++ b/examples/network/resolver.cc
@@ -13,10 +13,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _WIN32
diff --git a/examples/options/main.cc b/examples/options/main.cc
index c0973ad..cf6796f 100644
--- a/examples/options/main.cc
+++ b/examples/options/main.cc
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm.h>
diff --git a/examples/properties/properties_example.cc b/examples/properties/properties_example.cc
index 98ef1ee..0d6c336 100644
--- a/examples/properties/properties_example.cc
+++ b/examples/properties/properties_example.cc
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm.h>
diff --git a/examples/regex/main.cc b/examples/regex/main.cc
index e634fe5..94fd059 100644
--- a/examples/regex/main.cc
+++ b/examples/regex/main.cc
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm.h>
diff --git a/gio/giomm.h b/gio/giomm.h
index d39df60..795a3e5 100644
--- a/gio/giomm.h
+++ b/gio/giomm.h
@@ -16,8 +16,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm.h>
diff --git a/gio/giomm/contenttype.cc b/gio/giomm/contenttype.cc
index 816f5b9..abe6733 100644
--- a/gio/giomm/contenttype.cc
+++ b/gio/giomm/contenttype.cc
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2008 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/contenttype.h>
diff --git a/gio/giomm/contenttype.h b/gio/giomm/contenttype.h
index c9516a6..408adc8 100644
--- a/gio/giomm/contenttype.h
+++ b/gio/giomm/contenttype.h
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2008 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef _GIOMM_CONTENTTYPE_H
 #define _GIOMM_CONTENTTYPE_H
diff --git a/gio/giomm/init.cc b/gio/giomm/init.cc
index a00c3b4..32c2892 100644
--- a/gio/giomm/init.cc
+++ b/gio/giomm/init.cc
@@ -13,8 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "init.h"
diff --git a/gio/giomm/init.h b/gio/giomm/init.h
index a7e69e2..345e819 100644
--- a/gio/giomm/init.h
+++ b/gio/giomm/init.h
@@ -1,4 +1,3 @@
-// -*- c++ -*-
 #ifndef _GIOMM_INIT_H
 #define _GIOMM_INIT_H
 
@@ -19,8 +18,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 namespace Gio
diff --git a/gio/giomm/slot_async.cc b/gio/giomm/slot_async.cc
index 06dc7c5..4f2b6e2 100644
--- a/gio/giomm/slot_async.cc
+++ b/gio/giomm/slot_async.cc
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "slot_async.h"
diff --git a/gio/giomm/slot_async.h b/gio/giomm/slot_async.h
index ba840e1..228e1c9 100644
--- a/gio/giomm/slot_async.h
+++ b/gio/giomm/slot_async.h
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <gio/gio.h>
 
diff --git a/gio/giomm/wrap_init.h b/gio/giomm/wrap_init.h
index cb9de97..cb7d947 100644
--- a/gio/giomm/wrap_init.h
+++ b/gio/giomm/wrap_init.h
@@ -1,4 +1,3 @@
-// -*- c++ -*-
 #ifndef _GIOMM_WRAP_INIT_H
 #define _GIOMM_WRAP_INIT_H
 
@@ -17,8 +16,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 namespace Gio
diff --git a/gio/src/action.ccg b/gio/src/action.ccg
index c5a1735..71715d3 100644
--- a/gio/src/action.ccg
+++ b/gio/src/action.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2011 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/action.hg b/gio/src/action.hg
index 067a230..60f062b 100644
--- a/gio/src/action.hg
+++ b/gio/src/action.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _CONFIGINCLUDE(giommconfig.h)
diff --git a/gio/src/actiongroup.ccg b/gio/src/actiongroup.ccg
index 35feb3a..63caf51 100644
--- a/gio/src/actiongroup.ccg
+++ b/gio/src/actiongroup.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/exceptionhandler.h>
diff --git a/gio/src/actiongroup.hg b/gio/src/actiongroup.hg
index 6d250ba..1e18811 100644
--- a/gio/src/actiongroup.hg
+++ b/gio/src/actiongroup.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _CONFIGINCLUDE(giommconfig.h)
diff --git a/gio/src/actionmap.ccg b/gio/src/actionmap.ccg
index 2907721..ecb1209 100644
--- a/gio/src/actionmap.ccg
+++ b/gio/src/actionmap.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2012 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/action.h>
diff --git a/gio/src/actionmap.hg b/gio/src/actionmap.hg
index 871be0e..b3fa9e2 100644
--- a/gio/src/actionmap.hg
+++ b/gio/src/actionmap.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/interface.h>
diff --git a/gio/src/appinfo.ccg b/gio/src/appinfo.ccg
index dc01c85..6be12b9 100644
--- a/gio/src/appinfo.ccg
+++ b/gio/src/appinfo.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/file.h>
diff --git a/gio/src/appinfo.hg b/gio/src/appinfo.hg
index ef6c288..9b43c06 100644
--- a/gio/src/appinfo.hg
+++ b/gio/src/appinfo.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _CONFIGINCLUDE(giommconfig.h)
diff --git a/gio/src/applaunchcontext.ccg b/gio/src/applaunchcontext.ccg
index d0fa26a..be56159 100644
--- a/gio/src/applaunchcontext.ccg
+++ b/gio/src/applaunchcontext.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/appinfo.h>
diff --git a/gio/src/applaunchcontext.hg b/gio/src/applaunchcontext.hg
index cd75aed..f973f08 100644
--- a/gio/src/applaunchcontext.hg
+++ b/gio/src/applaunchcontext.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <exception>
diff --git a/gio/src/application.ccg b/gio/src/application.ccg
index b344c29..ca57852 100644
--- a/gio/src/application.ccg
+++ b/gio/src/application.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/application.hg b/gio/src/application.hg
index 3042a79..1dd8f64 100644
--- a/gio/src/application.hg
+++ b/gio/src/application.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _CONFIGINCLUDE(giommconfig.h)
diff --git a/gio/src/applicationcommandline.ccg b/gio/src/applicationcommandline.ccg
index 7fbee67..474fc42 100644
--- a/gio/src/applicationcommandline.ccg
+++ b/gio/src/applicationcommandline.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/applicationcommandline.hg b/gio/src/applicationcommandline.hg
index 4b357c4..3c11745 100644
--- a/gio/src/applicationcommandline.hg
+++ b/gio/src/applicationcommandline.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/file.h>
diff --git a/gio/src/asyncinitable.ccg b/gio/src/asyncinitable.ccg
index e91c984..f6fda2f 100644
--- a/gio/src/asyncinitable.ccg
+++ b/gio/src/asyncinitable.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/asyncinitable.hg b/gio/src/asyncinitable.hg
index 6d7d90f..6961edd 100644
--- a/gio/src/asyncinitable.hg
+++ b/gio/src/asyncinitable.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/interface.h>
diff --git a/gio/src/asyncresult.ccg b/gio/src/asyncresult.ccg
index bebc7ab..8f1a012 100644
--- a/gio/src/asyncresult.ccg
+++ b/gio/src/asyncresult.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 //#include <gio/gasyncresult.h> //We are not allowed to include individual headers.
diff --git a/gio/src/asyncresult.hg b/gio/src/asyncresult.hg
index f0d2d68..9fa2e4b 100644
--- a/gio/src/asyncresult.hg
+++ b/gio/src/asyncresult.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _CONFIGINCLUDE(giommconfig.h)
diff --git a/gio/src/bufferedinputstream.ccg b/gio/src/bufferedinputstream.ccg
index 888b7af..56dfe24 100644
--- a/gio/src/bufferedinputstream.ccg
+++ b/gio/src/bufferedinputstream.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2008 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/bufferedinputstream.hg b/gio/src/bufferedinputstream.hg
index 413d965..d93c665 100644
--- a/gio/src/bufferedinputstream.hg
+++ b/gio/src/bufferedinputstream.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/filterinputstream.h>
diff --git a/gio/src/bufferedoutputstream.ccg b/gio/src/bufferedoutputstream.ccg
index c549775..80e9d07 100644
--- a/gio/src/bufferedoutputstream.ccg
+++ b/gio/src/bufferedoutputstream.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2008 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/bufferedoutputstream.hg b/gio/src/bufferedoutputstream.hg
index 39145e7..846411f 100644
--- a/gio/src/bufferedoutputstream.hg
+++ b/gio/src/bufferedoutputstream.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/filteroutputstream.h>
diff --git a/gio/src/cancellable.ccg b/gio/src/cancellable.ccg
index 151f478..87d8f66 100644
--- a/gio/src/cancellable.ccg
+++ b/gio/src/cancellable.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/cancellable.hg b/gio/src/cancellable.hg
index a1cc68a..b4cb956 100644
--- a/gio/src/cancellable.hg
+++ b/gio/src/cancellable.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/gio/src/charsetconverter.ccg b/gio/src/charsetconverter.ccg
index 2353843..a5d5029 100644
--- a/gio/src/charsetconverter.ccg
+++ b/gio/src/charsetconverter.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/charsetconverter.hg b/gio/src/charsetconverter.hg
index 37a32e2..d5679b7 100644
--- a/gio/src/charsetconverter.hg
+++ b/gio/src/charsetconverter.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/converter.ccg b/gio/src/converter.ccg
index 0f2d200..508a1c7 100644
--- a/gio/src/converter.ccg
+++ b/gio/src/converter.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2012 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/converter.hg b/gio/src/converter.hg
index cde99f8..c34ea63 100644
--- a/gio/src/converter.hg
+++ b/gio/src/converter.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2012 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/interface.h>
diff --git a/gio/src/converterinputstream.ccg b/gio/src/converterinputstream.ccg
index 4f46d64..e18a328 100644
--- a/gio/src/converterinputstream.ccg
+++ b/gio/src/converterinputstream.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/converterinputstream.hg b/gio/src/converterinputstream.hg
index 8c0e39a..ae65e59 100644
--- a/gio/src/converterinputstream.hg
+++ b/gio/src/converterinputstream.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/filterinputstream.h>
diff --git a/gio/src/converteroutputstream.ccg b/gio/src/converteroutputstream.ccg
index b122ac3..e492031 100644
--- a/gio/src/converteroutputstream.ccg
+++ b/gio/src/converteroutputstream.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/converteroutputstream.hg b/gio/src/converteroutputstream.hg
index eeb5d9d..1729aac 100644
--- a/gio/src/converteroutputstream.hg
+++ b/gio/src/converteroutputstream.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/filteroutputstream.h>
diff --git a/gio/src/credentials.ccg b/gio/src/credentials.ccg
index ed04a99..2961657 100644
--- a/gio/src/credentials.ccg
+++ b/gio/src/credentials.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/credentials.hg b/gio/src/credentials.hg
index 60fb023..620e295 100644
--- a/gio/src/credentials.hg
+++ b/gio/src/credentials.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/datainputstream.ccg b/gio/src/datainputstream.ccg
index 3665ac9..7ae9beb 100644
--- a/gio/src/datainputstream.ccg
+++ b/gio/src/datainputstream.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/datainputstream.hg b/gio/src/datainputstream.hg
index 0b5a8bc..4126c63 100644
--- a/gio/src/datainputstream.hg
+++ b/gio/src/datainputstream.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/bufferedinputstream.h>
diff --git a/gio/src/dataoutputstream.ccg b/gio/src/dataoutputstream.ccg
index 5e41c70..c2e4ec8 100644
--- a/gio/src/dataoutputstream.ccg
+++ b/gio/src/dataoutputstream.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/dataoutputstream.hg b/gio/src/dataoutputstream.hg
index efd8211..2e87789 100644
--- a/gio/src/dataoutputstream.hg
+++ b/gio/src/dataoutputstream.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/filteroutputstream.h>
diff --git a/gio/src/dbusactiongroup.ccg b/gio/src/dbusactiongroup.ccg
index b8012ef..2069b14 100644
--- a/gio/src/dbusactiongroup.ccg
+++ b/gio/src/dbusactiongroup.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/dbusactiongroup.hg b/gio/src/dbusactiongroup.hg
index 991e106..fde6a35 100644
--- a/gio/src/dbusactiongroup.hg
+++ b/gio/src/dbusactiongroup.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/dbusaddress.ccg b/gio/src/dbusaddress.ccg
index 30f2366..09a2188 100644
--- a/gio/src/dbusaddress.ccg
+++ b/gio/src/dbusaddress.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/dbusaddress.hg b/gio/src/dbusaddress.hg
index ab5acd7..aa105e7 100644
--- a/gio/src/dbusaddress.hg
+++ b/gio/src/dbusaddress.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/dbusconnection.h>
diff --git a/gio/src/dbusauthobserver.ccg b/gio/src/dbusauthobserver.ccg
index 8c30743..d9f062c 100644
--- a/gio/src/dbusauthobserver.ccg
+++ b/gio/src/dbusauthobserver.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/dbusauthobserver.hg b/gio/src/dbusauthobserver.hg
index 931af72..03876c0 100644
--- a/gio/src/dbusauthobserver.hg
+++ b/gio/src/dbusauthobserver.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/dbusconnection.ccg b/gio/src/dbusconnection.ccg
index 5fe37d9..a7464c2 100644
--- a/gio/src/dbusconnection.ccg
+++ b/gio/src/dbusconnection.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/dbusconnection.hg b/gio/src/dbusconnection.hg
index c779cc5..bac9315 100644
--- a/gio/src/dbusconnection.hg
+++ b/gio/src/dbusconnection.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/dbuserror.ccg b/gio/src/dbuserror.ccg
index 555a34b..e3c93dc 100644
--- a/gio/src/dbuserror.ccg
+++ b/gio/src/dbuserror.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/dbuserror.hg b/gio/src/dbuserror.hg
index 1e52dbb..95bfe59 100644
--- a/gio/src/dbuserror.hg
+++ b/gio/src/dbuserror.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/error.h>
diff --git a/gio/src/dbuserrorutils.ccg b/gio/src/dbuserrorutils.ccg
index d4e3490..f9dae85 100644
--- a/gio/src/dbuserrorutils.ccg
+++ b/gio/src/dbuserrorutils.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/dbuserrorutils.hg b/gio/src/dbuserrorutils.hg
index a2c8ece..084fa0c 100644
--- a/gio/src/dbuserrorutils.hg
+++ b/gio/src/dbuserrorutils.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _DEFS(giomm,gio)
diff --git a/gio/src/dbusinterface.ccg b/gio/src/dbusinterface.ccg
index af4aa8e..4d2a74d 100644
--- a/gio/src/dbusinterface.ccg
+++ b/gio/src/dbusinterface.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2012 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/dbusinterface.hg b/gio/src/dbusinterface.hg
index 485d2b5..41cd5ec 100644
--- a/gio/src/dbusinterface.hg
+++ b/gio/src/dbusinterface.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2012 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/interface.h>
diff --git a/gio/src/dbusinterfaceskeleton.ccg b/gio/src/dbusinterfaceskeleton.ccg
index 50e1f9f..a327e96 100644
--- a/gio/src/dbusinterfaceskeleton.ccg
+++ b/gio/src/dbusinterfaceskeleton.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/dbusconnection.h>
diff --git a/gio/src/dbusinterfaceskeleton.hg b/gio/src/dbusinterfaceskeleton.hg
index ef7b1a2..c027fba 100644
--- a/gio/src/dbusinterfaceskeleton.hg
+++ b/gio/src/dbusinterfaceskeleton.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/dbusinterfacevtable.ccg b/gio/src/dbusinterfacevtable.ccg
index c6ffd89..d47b5a9 100644
--- a/gio/src/dbusinterfacevtable.ccg
+++ b/gio/src/dbusinterfacevtable.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/dbusinterfacevtable.hg b/gio/src/dbusinterfacevtable.hg
index c4081e7..0771568 100644
--- a/gio/src/dbusinterfacevtable.hg
+++ b/gio/src/dbusinterfacevtable.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/dbusmethodinvocation.h>
diff --git a/gio/src/dbusintrospection.ccg b/gio/src/dbusintrospection.ccg
index 4a37d37..43f761c 100644
--- a/gio/src/dbusintrospection.ccg
+++ b/gio/src/dbusintrospection.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/error.h>
diff --git a/gio/src/dbusintrospection.hg b/gio/src/dbusintrospection.hg
index a99d4e3..387f3b7 100644
--- a/gio/src/dbusintrospection.hg
+++ b/gio/src/dbusintrospection.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/refptr.h>
diff --git a/gio/src/dbusmenumodel.ccg b/gio/src/dbusmenumodel.ccg
index b8012ef..2069b14 100644
--- a/gio/src/dbusmenumodel.ccg
+++ b/gio/src/dbusmenumodel.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/dbusmenumodel.hg b/gio/src/dbusmenumodel.hg
index 6ada9ed..f704350 100644
--- a/gio/src/dbusmenumodel.hg
+++ b/gio/src/dbusmenumodel.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/menumodel.h>
diff --git a/gio/src/dbusmessage.ccg b/gio/src/dbusmessage.ccg
index 751fbfd..50fe956 100644
--- a/gio/src/dbusmessage.ccg
+++ b/gio/src/dbusmessage.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/dbusmessage.hg b/gio/src/dbusmessage.hg
index 0abe21a..bf57524 100644
--- a/gio/src/dbusmessage.hg
+++ b/gio/src/dbusmessage.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/dbusmethodinvocation.ccg b/gio/src/dbusmethodinvocation.ccg
index 02c2c65..870b3f7 100644
--- a/gio/src/dbusmethodinvocation.ccg
+++ b/gio/src/dbusmethodinvocation.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/dbusmethodinvocation.hg b/gio/src/dbusmethodinvocation.hg
index 84fecef..65e81c0 100644
--- a/gio/src/dbusmethodinvocation.hg
+++ b/gio/src/dbusmethodinvocation.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 //#include <giomm/dbusconnection.h>
diff --git a/gio/src/dbusobject.ccg b/gio/src/dbusobject.ccg
index 68334df..7e1543d 100644
--- a/gio/src/dbusobject.ccg
+++ b/gio/src/dbusobject.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2012 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/dbusobject.hg b/gio/src/dbusobject.hg
index 6979d82..3be72cf 100644
--- a/gio/src/dbusobject.hg
+++ b/gio/src/dbusobject.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/interface.h>
diff --git a/gio/src/dbusownname.ccg b/gio/src/dbusownname.ccg
index db1a37b..81a7a9f 100644
--- a/gio/src/dbusownname.ccg
+++ b/gio/src/dbusownname.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/dbusownname.hg b/gio/src/dbusownname.hg
index 596171e..f0c660b 100644
--- a/gio/src/dbusownname.hg
+++ b/gio/src/dbusownname.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/dbusconnection.h>
diff --git a/gio/src/dbusproxy.ccg b/gio/src/dbusproxy.ccg
index 67ad4fa..eb8c311 100644
--- a/gio/src/dbusproxy.ccg
+++ b/gio/src/dbusproxy.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/dbusproxy.hg b/gio/src/dbusproxy.hg
index fb49e88..332e229 100644
--- a/gio/src/dbusproxy.hg
+++ b/gio/src/dbusproxy.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/dbusserver.ccg b/gio/src/dbusserver.ccg
index 403bd3b..82f3bac 100644
--- a/gio/src/dbusserver.ccg
+++ b/gio/src/dbusserver.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/dbusserver.hg b/gio/src/dbusserver.hg
index 914dd17..217ed96 100644
--- a/gio/src/dbusserver.hg
+++ b/gio/src/dbusserver.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/dbussubtreevtable.ccg b/gio/src/dbussubtreevtable.ccg
index 0445386..59ea274 100644
--- a/gio/src/dbussubtreevtable.ccg
+++ b/gio/src/dbussubtreevtable.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/dbussubtreevtable.hg b/gio/src/dbussubtreevtable.hg
index 3c2d6d8..fcfbb99 100644
--- a/gio/src/dbussubtreevtable.hg
+++ b/gio/src/dbussubtreevtable.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/dbusmethodinvocation.h>
diff --git a/gio/src/dbusutils.ccg b/gio/src/dbusutils.ccg
index a614bce..a84de1f 100644
--- a/gio/src/dbusutils.ccg
+++ b/gio/src/dbusutils.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/dbusutils.hg b/gio/src/dbusutils.hg
index ac2acf9..85844dc 100644
--- a/gio/src/dbusutils.hg
+++ b/gio/src/dbusutils.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _DEFS(giomm,gio)
diff --git a/gio/src/dbuswatchname.ccg b/gio/src/dbuswatchname.ccg
index fa7a1ee..04878e7 100644
--- a/gio/src/dbuswatchname.ccg
+++ b/gio/src/dbuswatchname.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/exceptionhandler.h>
diff --git a/gio/src/dbuswatchname.hg b/gio/src/dbuswatchname.hg
index 46d95d8..555bcac 100644
--- a/gio/src/dbuswatchname.hg
+++ b/gio/src/dbuswatchname.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/dbusconnection.h>
diff --git a/gio/src/desktopappinfo.ccg b/gio/src/desktopappinfo.ccg
index 42cfd45..27a37e7 100644
--- a/gio/src/desktopappinfo.ccg
+++ b/gio/src/desktopappinfo.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/desktopappinfo.hg b/gio/src/desktopappinfo.hg
index 6a9f130..f9a0604 100644
--- a/gio/src/desktopappinfo.hg
+++ b/gio/src/desktopappinfo.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _CONFIGINCLUDE(giommconfig.h)
diff --git a/gio/src/drive.ccg b/gio/src/drive.ccg
index 75bbea6..95186ea 100644
--- a/gio/src/drive.ccg
+++ b/gio/src/drive.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/drive.hg b/gio/src/drive.hg
index 12b281c..a65d083 100644
--- a/gio/src/drive.hg
+++ b/gio/src/drive.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/mount.h>
diff --git a/gio/src/emblem.ccg b/gio/src/emblem.ccg
index fb5dbea..0220a12 100644
--- a/gio/src/emblem.ccg
+++ b/gio/src/emblem.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2008 Jonathon Jongsma
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/emblem.hg b/gio/src/emblem.hg
index 9a88414..1ee816b 100644
--- a/gio/src/emblem.hg
+++ b/gio/src/emblem.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/emblemedicon.ccg b/gio/src/emblemedicon.ccg
index faa8e37..ebf9ed1 100644
--- a/gio/src/emblemedicon.ccg
+++ b/gio/src/emblemedicon.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2008 Jonathon Jongsma
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/emblemedicon.hg b/gio/src/emblemedicon.hg
index 8ccd5ad..4665e39 100644
--- a/gio/src/emblemedicon.hg
+++ b/gio/src/emblemedicon.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/enums.ccg b/gio/src/enums.ccg
index 24ee9e8..1c574d6 100644
--- a/gio/src/enums.ccg
+++ b/gio/src/enums.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,6 +11,5 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
diff --git a/gio/src/enums.hg b/gio/src/enums.hg
index 7cbe7f5..d306225 100644
--- a/gio/src/enums.hg
+++ b/gio/src/enums.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/error.ccg b/gio/src/error.ccg
index 3f6ca4c..fd123ae 100644
--- a/gio/src/error.ccg
+++ b/gio/src/error.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/error.hg b/gio/src/error.hg
index 5369fa4..7df46d2 100644
--- a/gio/src/error.hg
+++ b/gio/src/error.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/error.h>
diff --git a/gio/src/file.ccg b/gio/src/file.ccg
index 846ee18..2e8f428 100644
--- a/gio/src/file.ccg
+++ b/gio/src/file.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/mount.h>
diff --git a/gio/src/file.hg b/gio/src/file.hg
index 5df6972..9e3a9f5 100644
--- a/gio/src/file.hg
+++ b/gio/src/file.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/error.h>
diff --git a/gio/src/fileattributeinfo.ccg b/gio/src/fileattributeinfo.ccg
index e33784c..63ed535 100644
--- a/gio/src/fileattributeinfo.ccg
+++ b/gio/src/fileattributeinfo.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/fileattributeinfo.hg b/gio/src/fileattributeinfo.hg
index a76d04d..0c9c9a5 100644
--- a/gio/src/fileattributeinfo.hg
+++ b/gio/src/fileattributeinfo.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <string>
diff --git a/gio/src/fileattributeinfolist.ccg b/gio/src/fileattributeinfolist.ccg
index 98d0efa..eee5028 100644
--- a/gio/src/fileattributeinfolist.ccg
+++ b/gio/src/fileattributeinfolist.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/fileattributeinfolist.hg b/gio/src/fileattributeinfolist.hg
index 1dcec02..2ea1dc7 100644
--- a/gio/src/fileattributeinfolist.hg
+++ b/gio/src/fileattributeinfolist.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/fileattributeinfo.h>
diff --git a/gio/src/fileenumerator.ccg b/gio/src/fileenumerator.ccg
index b59cca0..9b975bc 100644
--- a/gio/src/fileenumerator.ccg
+++ b/gio/src/fileenumerator.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/fileenumerator.hg b/gio/src/fileenumerator.hg
index ace27e5..6e59340 100644
--- a/gio/src/fileenumerator.hg
+++ b/gio/src/fileenumerator.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The glibmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/fileicon.ccg b/gio/src/fileicon.ccg
index 70b732c..06d4e85 100644
--- a/gio/src/fileicon.ccg
+++ b/gio/src/fileicon.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/fileicon.hg b/gio/src/fileicon.hg
index f3ac97a..dd4d3d6 100644
--- a/gio/src/fileicon.hg
+++ b/gio/src/fileicon.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/fileinfo.ccg b/gio/src/fileinfo.ccg
index fa35995..d18d926 100644
--- a/gio/src/fileinfo.ccg
+++ b/gio/src/fileinfo.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/fileinfo.hg b/gio/src/fileinfo.hg
index 93a39a6..ae22d38 100644
--- a/gio/src/fileinfo.hg
+++ b/gio/src/fileinfo.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/datetime.h>
diff --git a/gio/src/fileinputstream.ccg b/gio/src/fileinputstream.ccg
index ef1b73e..9280054 100644
--- a/gio/src/fileinputstream.ccg
+++ b/gio/src/fileinputstream.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/fileinputstream.hg b/gio/src/fileinputstream.hg
index a9cca15..0159d8c 100644
--- a/gio/src/fileinputstream.hg
+++ b/gio/src/fileinputstream.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/fileinfo.h>
diff --git a/gio/src/fileiostream.ccg b/gio/src/fileiostream.ccg
index 21002d3..f358384 100644
--- a/gio/src/fileiostream.ccg
+++ b/gio/src/fileiostream.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/fileiostream.hg b/gio/src/fileiostream.hg
index 3f2ca9c..e6f66ce 100644
--- a/gio/src/fileiostream.hg
+++ b/gio/src/fileiostream.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/fileinfo.h>
diff --git a/gio/src/filemonitor.ccg b/gio/src/filemonitor.ccg
index 5bcc977..150291f 100644
--- a/gio/src/filemonitor.ccg
+++ b/gio/src/filemonitor.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/exceptionhandler.h>
diff --git a/gio/src/filemonitor.hg b/gio/src/filemonitor.hg
index 6348ee9..e51eddf 100644
--- a/gio/src/filemonitor.hg
+++ b/gio/src/filemonitor.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 //#include <giomm/file.h>
diff --git a/gio/src/filenamecompleter.ccg b/gio/src/filenamecompleter.ccg
index 3161de1..3901af9 100644
--- a/gio/src/filenamecompleter.ccg
+++ b/gio/src/filenamecompleter.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/exceptionhandler.h>
diff --git a/gio/src/filenamecompleter.hg b/gio/src/filenamecompleter.hg
index 5ec035a..5115c4f 100644
--- a/gio/src/filenamecompleter.hg
+++ b/gio/src/filenamecompleter.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 //#include <giomm/file.h>
diff --git a/gio/src/fileoutputstream.ccg b/gio/src/fileoutputstream.ccg
index 2e8040c..d118060 100644
--- a/gio/src/fileoutputstream.ccg
+++ b/gio/src/fileoutputstream.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/fileoutputstream.hg b/gio/src/fileoutputstream.hg
index 3539c4c..f8682ab 100644
--- a/gio/src/fileoutputstream.hg
+++ b/gio/src/fileoutputstream.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/outputstream.h>
diff --git a/gio/src/filterinputstream.ccg b/gio/src/filterinputstream.ccg
index f69b83d..2ef4fcf 100644
--- a/gio/src/filterinputstream.ccg
+++ b/gio/src/filterinputstream.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/filterinputstream.hg b/gio/src/filterinputstream.hg
index bd35f73..1549bd4 100644
--- a/gio/src/filterinputstream.hg
+++ b/gio/src/filterinputstream.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/inputstream.h>
diff --git a/gio/src/filteroutputstream.ccg b/gio/src/filteroutputstream.ccg
index 49d0402..ddcd3ef 100644
--- a/gio/src/filteroutputstream.ccg
+++ b/gio/src/filteroutputstream.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/filteroutputstream.hg b/gio/src/filteroutputstream.hg
index 6af0821..7a9f762 100644
--- a/gio/src/filteroutputstream.hg
+++ b/gio/src/filteroutputstream.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/outputstream.h>
diff --git a/gio/src/icon.ccg b/gio/src/icon.ccg
index fdc6c87..cbd6540 100644
--- a/gio/src/icon.ccg
+++ b/gio/src/icon.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/icon.hg b/gio/src/icon.hg
index 36888f7..ce9b07a 100644
--- a/gio/src/icon.hg
+++ b/gio/src/icon.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/interface.h>
diff --git a/gio/src/inetaddress.ccg b/gio/src/inetaddress.ccg
index f8c926f..f61a2c6 100644
--- a/gio/src/inetaddress.ccg
+++ b/gio/src/inetaddress.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2008 Jonathon Jongsma
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/inetaddress.hg b/gio/src/inetaddress.hg
index 6dd4467..e4c0c0a 100644
--- a/gio/src/inetaddress.hg
+++ b/gio/src/inetaddress.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/inetsocketaddress.ccg b/gio/src/inetsocketaddress.ccg
index 5317f38..24667b5 100644
--- a/gio/src/inetsocketaddress.ccg
+++ b/gio/src/inetsocketaddress.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2008 Jonathon Jongsma
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/inetsocketaddress.hg b/gio/src/inetsocketaddress.hg
index 8b20c16..59c9fca 100644
--- a/gio/src/inetsocketaddress.hg
+++ b/gio/src/inetsocketaddress.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2009 jonathon jongsma
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/socketaddress.h>
diff --git a/gio/src/initable.ccg b/gio/src/initable.ccg
index b3b3256..24c22d9 100644
--- a/gio/src/initable.ccg
+++ b/gio/src/initable.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2009 Jonathon Jongsma
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/initable.hg b/gio/src/initable.hg
index f47f678..27e9e1b 100644
--- a/gio/src/initable.hg
+++ b/gio/src/initable.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/interface.h>
diff --git a/gio/src/inputstream.ccg b/gio/src/inputstream.ccg
index 9716003..620f93d 100644
--- a/gio/src/inputstream.ccg
+++ b/gio/src/inputstream.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/inputstream.hg b/gio/src/inputstream.hg
index 315ed86..1618043 100644
--- a/gio/src/inputstream.hg
+++ b/gio/src/inputstream.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/iostream.ccg b/gio/src/iostream.ccg
index a278ddf..800932d 100644
--- a/gio/src/iostream.ccg
+++ b/gio/src/iostream.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/iostream.hg b/gio/src/iostream.hg
index 1051b96..f52fe17 100644
--- a/gio/src/iostream.hg
+++ b/gio/src/iostream.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/listmodel.ccg b/gio/src/listmodel.ccg
index b6004fa..aeabe40 100644
--- a/gio/src/listmodel.ccg
+++ b/gio/src/listmodel.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/listmodel.hg b/gio/src/listmodel.hg
index 3f8cec0..b7abfe9 100644
--- a/gio/src/listmodel.hg
+++ b/gio/src/listmodel.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/interface.h>
diff --git a/gio/src/liststore.ccg b/gio/src/liststore.ccg
index 4580c5e..3b2191d 100644
--- a/gio/src/liststore.ccg
+++ b/gio/src/liststore.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/liststore.hg b/gio/src/liststore.hg
index 3b86e25..8c93c85 100644
--- a/gio/src/liststore.hg
+++ b/gio/src/liststore.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/loadableicon.ccg b/gio/src/loadableicon.ccg
index f39c6e4..22f6950 100644
--- a/gio/src/loadableicon.ccg
+++ b/gio/src/loadableicon.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/loadableicon.hg b/gio/src/loadableicon.hg
index a49b8c2..a706f24 100644
--- a/gio/src/loadableicon.hg
+++ b/gio/src/loadableicon.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/interface.h>
diff --git a/gio/src/memoryinputstream.ccg b/gio/src/memoryinputstream.ccg
index 38126a4..920e616 100644
--- a/gio/src/memoryinputstream.ccg
+++ b/gio/src/memoryinputstream.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/memoryinputstream.hg b/gio/src/memoryinputstream.hg
index 5a918fd..1485256 100644
--- a/gio/src/memoryinputstream.hg
+++ b/gio/src/memoryinputstream.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _CONFIGINCLUDE(giommconfig.h)
diff --git a/gio/src/memoryoutputstream.ccg b/gio/src/memoryoutputstream.ccg
index 45f52e0..8271958 100644
--- a/gio/src/memoryoutputstream.ccg
+++ b/gio/src/memoryoutputstream.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/memoryoutputstream.hg b/gio/src/memoryoutputstream.hg
index 6768615..310caec 100644
--- a/gio/src/memoryoutputstream.hg
+++ b/gio/src/memoryoutputstream.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/outputstream.h>
diff --git a/gio/src/menu.ccg b/gio/src/menu.ccg
index 969d51e..7f97a55 100644
--- a/gio/src/menu.ccg
+++ b/gio/src/menu.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/menu.hg b/gio/src/menu.hg
index e3f1d6d..99d5ff1 100644
--- a/gio/src/menu.hg
+++ b/gio/src/menu.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/menumodel.h>
diff --git a/gio/src/menuattributeiter.ccg b/gio/src/menuattributeiter.ccg
index 83ea74a..7c74164 100644
--- a/gio/src/menuattributeiter.ccg
+++ b/gio/src/menuattributeiter.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/menuattributeiter.hg b/gio/src/menuattributeiter.hg
index 0e2c941..558c240 100644
--- a/gio/src/menuattributeiter.hg
+++ b/gio/src/menuattributeiter.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/menuitem.ccg b/gio/src/menuitem.ccg
index 2f6dc38..4db5c4d 100644
--- a/gio/src/menuitem.ccg
+++ b/gio/src/menuitem.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/menuitem.hg b/gio/src/menuitem.hg
index 3830880..0fff756 100644
--- a/gio/src/menuitem.hg
+++ b/gio/src/menuitem.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _CONFIGINCLUDE(giommconfig.h)
diff --git a/gio/src/menulinkiter.ccg b/gio/src/menulinkiter.ccg
index 542e46d..190f557 100644
--- a/gio/src/menulinkiter.ccg
+++ b/gio/src/menulinkiter.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/menulinkiter.hg b/gio/src/menulinkiter.hg
index b3606d0..8cba9df 100644
--- a/gio/src/menulinkiter.hg
+++ b/gio/src/menulinkiter.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/menumodel.ccg b/gio/src/menumodel.ccg
index 48b9b2b..9adbe29 100644
--- a/gio/src/menumodel.ccg
+++ b/gio/src/menumodel.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/menumodel.hg b/gio/src/menumodel.hg
index bf29a12..81fb877 100644
--- a/gio/src/menumodel.hg
+++ b/gio/src/menumodel.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/mount.ccg b/gio/src/mount.ccg
index 2ba1001..6a4fd36 100644
--- a/gio/src/mount.ccg
+++ b/gio/src/mount.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/error.h>
diff --git a/gio/src/mount.hg b/gio/src/mount.hg
index 3356ec3..d4d93e0 100644
--- a/gio/src/mount.hg
+++ b/gio/src/mount.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 //#include <giomm/drive.h>
diff --git a/gio/src/mountoperation.ccg b/gio/src/mountoperation.ccg
index 4aa7761..228e6fd 100644
--- a/gio/src/mountoperation.ccg
+++ b/gio/src/mountoperation.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/mountoperation.hg b/gio/src/mountoperation.hg
index 7b2cc68..17b74a8 100644
--- a/gio/src/mountoperation.hg
+++ b/gio/src/mountoperation.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/networkaddress.ccg b/gio/src/networkaddress.ccg
index 43e2d87..6f2f99d 100644
--- a/gio/src/networkaddress.ccg
+++ b/gio/src/networkaddress.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/networkaddress.hg b/gio/src/networkaddress.hg
index 5e6aeff..ff5e123 100644
--- a/gio/src/networkaddress.hg
+++ b/gio/src/networkaddress.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/networkmonitor.ccg b/gio/src/networkmonitor.ccg
index 1b940c5..1cd79ef 100644
--- a/gio/src/networkmonitor.ccg
+++ b/gio/src/networkmonitor.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/exceptionhandler.h>
diff --git a/gio/src/networkmonitor.hg b/gio/src/networkmonitor.hg
index df55fda..4ed6fc9 100644
--- a/gio/src/networkmonitor.hg
+++ b/gio/src/networkmonitor.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/interface.h>
diff --git a/gio/src/networkservice.ccg b/gio/src/networkservice.ccg
index 251999b..a081e60 100644
--- a/gio/src/networkservice.ccg
+++ b/gio/src/networkservice.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/networkservice.hg b/gio/src/networkservice.hg
index e5288e8..581fc78 100644
--- a/gio/src/networkservice.hg
+++ b/gio/src/networkservice.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/outputstream.ccg b/gio/src/outputstream.ccg
index 46cfdd1..da48f7d 100644
--- a/gio/src/outputstream.ccg
+++ b/gio/src/outputstream.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/outputstream.hg b/gio/src/outputstream.hg
index d3b517a..c87f23f 100644
--- a/gio/src/outputstream.hg
+++ b/gio/src/outputstream.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/permission.ccg b/gio/src/permission.ccg
index 6957457..f647cbe 100644
--- a/gio/src/permission.ccg
+++ b/gio/src/permission.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/permission.hg b/gio/src/permission.hg
index 6405ece..d702b5b 100644
--- a/gio/src/permission.hg
+++ b/gio/src/permission.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/pollableinputstream.ccg b/gio/src/pollableinputstream.ccg
index 8e0aacb..2bd4c95 100644
--- a/gio/src/pollableinputstream.ccg
+++ b/gio/src/pollableinputstream.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2012 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/pollableinputstream.hg b/gio/src/pollableinputstream.hg
index 9c5aa21..0000620 100644
--- a/gio/src/pollableinputstream.hg
+++ b/gio/src/pollableinputstream.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/interface.h>
diff --git a/gio/src/pollableoutputstream.ccg b/gio/src/pollableoutputstream.ccg
index 8e0aacb..2bd4c95 100644
--- a/gio/src/pollableoutputstream.ccg
+++ b/gio/src/pollableoutputstream.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2012 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/pollableoutputstream.hg b/gio/src/pollableoutputstream.hg
index 881a92d..d285824 100644
--- a/gio/src/pollableoutputstream.hg
+++ b/gio/src/pollableoutputstream.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/interface.h>
diff --git a/gio/src/proxy.ccg b/gio/src/proxy.ccg
index f744a77..bac28f6 100644
--- a/gio/src/proxy.ccg
+++ b/gio/src/proxy.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/proxy.hg b/gio/src/proxy.hg
index a7d5808..4fb94d2 100644
--- a/gio/src/proxy.hg
+++ b/gio/src/proxy.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/error.h>
diff --git a/gio/src/proxyaddress.ccg b/gio/src/proxyaddress.ccg
index ab1fdd7..bc4b3d7 100644
--- a/gio/src/proxyaddress.ccg
+++ b/gio/src/proxyaddress.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 glibmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/proxyaddress.hg b/gio/src/proxyaddress.hg
index f1bb09c..5d64bdd 100644
--- a/gio/src/proxyaddress.hg
+++ b/gio/src/proxyaddress.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2009 The glibmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/inetsocketaddress.h>
diff --git a/gio/src/proxyresolver.ccg b/gio/src/proxyresolver.ccg
index f9303e3..9d0a0a3 100644
--- a/gio/src/proxyresolver.ccg
+++ b/gio/src/proxyresolver.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/proxyresolver.hg b/gio/src/proxyresolver.hg
index 6bf449e..fb2d047 100644
--- a/gio/src/proxyresolver.hg
+++ b/gio/src/proxyresolver.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/error.h>
diff --git a/gio/src/remoteactiongroup.ccg b/gio/src/remoteactiongroup.ccg
index be265e5..a92a9fb 100644
--- a/gio/src/remoteactiongroup.ccg
+++ b/gio/src/remoteactiongroup.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2012 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 namespace Gio
diff --git a/gio/src/remoteactiongroup.hg b/gio/src/remoteactiongroup.hg
index 74d094e..77c3fe2 100644
--- a/gio/src/remoteactiongroup.hg
+++ b/gio/src/remoteactiongroup.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/interface.h>
diff --git a/gio/src/resolver.ccg b/gio/src/resolver.ccg
index 7838f19..6efdf6b 100644
--- a/gio/src/resolver.ccg
+++ b/gio/src/resolver.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/resolver.hg b/gio/src/resolver.hg
index b360f5c..52d7fe2 100644
--- a/gio/src/resolver.hg
+++ b/gio/src/resolver.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/resource.ccg b/gio/src/resource.ccg
index 7a579b4..d8305b3 100644
--- a/gio/src/resource.ccg
+++ b/gio/src/resource.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/resource.hg b/gio/src/resource.hg
index 96f3b51..b8faa03 100644
--- a/gio/src/resource.hg
+++ b/gio/src/resource.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/error.h>
diff --git a/gio/src/seekable.ccg b/gio/src/seekable.ccg
index 43f4afe..937ee25 100644
--- a/gio/src/seekable.ccg
+++ b/gio/src/seekable.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/seekable.hg b/gio/src/seekable.hg
index 79c0d07..ec3a635 100644
--- a/gio/src/seekable.hg
+++ b/gio/src/seekable.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/cancellable.h>
diff --git a/gio/src/settings.ccg b/gio/src/settings.ccg
index 183dcf8..05ff5e2 100644
--- a/gio/src/settings.ccg
+++ b/gio/src/settings.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/settings.hg b/gio/src/settings.hg
index a55a694..65ecbe4 100644
--- a/gio/src/settings.hg
+++ b/gio/src/settings.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _CONFIGINCLUDE(giommconfig.h)
diff --git a/gio/src/settingsschema.ccg b/gio/src/settingsschema.ccg
index 27d1a1e..1c73326 100644
--- a/gio/src/settingsschema.ccg
+++ b/gio/src/settingsschema.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/settingsschema.hg b/gio/src/settingsschema.hg
index c5f6c95..cae4b99 100644
--- a/gio/src/settingsschema.hg
+++ b/gio/src/settingsschema.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _CONFIGINCLUDE(giommconfig.h)
diff --git a/gio/src/settingsschemakey.ccg b/gio/src/settingsschemakey.ccg
index 27d1a1e..1c73326 100644
--- a/gio/src/settingsschemakey.ccg
+++ b/gio/src/settingsschemakey.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/settingsschemakey.hg b/gio/src/settingsschemakey.hg
index cf5f0da..4734ca0 100644
--- a/gio/src/settingsschemakey.hg
+++ b/gio/src/settingsschemakey.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _CONFIGINCLUDE(giommconfig.h)
diff --git a/gio/src/settingsschemasource.ccg b/gio/src/settingsschemasource.ccg
index 27d1a1e..1c73326 100644
--- a/gio/src/settingsschemasource.ccg
+++ b/gio/src/settingsschemasource.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/settingsschemasource.hg b/gio/src/settingsschemasource.hg
index f330945..5975c38 100644
--- a/gio/src/settingsschemasource.hg
+++ b/gio/src/settingsschemasource.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _CONFIGINCLUDE(giommconfig.h)
diff --git a/gio/src/simpleaction.ccg b/gio/src/simpleaction.ccg
index 42b236e..d4fb0e1 100644
--- a/gio/src/simpleaction.ccg
+++ b/gio/src/simpleaction.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/simpleaction.hg b/gio/src/simpleaction.hg
index fe7e669..5874112 100644
--- a/gio/src/simpleaction.hg
+++ b/gio/src/simpleaction.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/simpleactiongroup.ccg b/gio/src/simpleactiongroup.ccg
index 3a80251..e33de0b 100644
--- a/gio/src/simpleactiongroup.ccg
+++ b/gio/src/simpleactiongroup.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/simpleactiongroup.hg b/gio/src/simpleactiongroup.hg
index 36dd91b..d12e4a1 100644
--- a/gio/src/simpleactiongroup.hg
+++ b/gio/src/simpleactiongroup.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _CONFIGINCLUDE(giommconfig.h)
diff --git a/gio/src/simplepermission.ccg b/gio/src/simplepermission.ccg
index e627cda..cb85474 100644
--- a/gio/src/simplepermission.ccg
+++ b/gio/src/simplepermission.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/simplepermission.hg b/gio/src/simplepermission.hg
index c6a2ea3..cce3b6b 100644
--- a/gio/src/simplepermission.hg
+++ b/gio/src/simplepermission.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/permission.h>
diff --git a/gio/src/socket.ccg b/gio/src/socket.ccg
index 4e4910c..31cf240 100644
--- a/gio/src/socket.ccg
+++ b/gio/src/socket.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/socket.hg b/gio/src/socket.hg
index 55a3ce9..233e20a 100644
--- a/gio/src/socket.hg
+++ b/gio/src/socket.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/iochannel.h>
diff --git a/gio/src/socketaddress.ccg b/gio/src/socketaddress.ccg
index eb8adb6..f5d23a7 100644
--- a/gio/src/socketaddress.ccg
+++ b/gio/src/socketaddress.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/socketaddress.hg b/gio/src/socketaddress.hg
index ed7cf8f..713986b 100644
--- a/gio/src/socketaddress.hg
+++ b/gio/src/socketaddress.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/socketaddressenumerator.ccg b/gio/src/socketaddressenumerator.ccg
index 405773f..9e01483 100644
--- a/gio/src/socketaddressenumerator.ccg
+++ b/gio/src/socketaddressenumerator.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2009 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/socketaddressenumerator.hg b/gio/src/socketaddressenumerator.hg
index 01a137a..28cf187 100644
--- a/gio/src/socketaddressenumerator.hg
+++ b/gio/src/socketaddressenumerator.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/interface.h>
diff --git a/gio/src/socketclient.ccg b/gio/src/socketclient.ccg
index c3ec6f0..8339f12 100644
--- a/gio/src/socketclient.ccg
+++ b/gio/src/socketclient.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 Jonathon Jongsma
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/socketclient.hg b/gio/src/socketclient.hg
index 26f0bd6..1722b65 100644
--- a/gio/src/socketclient.hg
+++ b/gio/src/socketclient.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/socketconnectable.ccg b/gio/src/socketconnectable.ccg
index 0f94c18..a4150d7 100644
--- a/gio/src/socketconnectable.ccg
+++ b/gio/src/socketconnectable.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2009 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/socketconnectable.hg b/gio/src/socketconnectable.hg
index 812df3d..266a8a6 100644
--- a/gio/src/socketconnectable.hg
+++ b/gio/src/socketconnectable.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/interface.h>
diff --git a/gio/src/socketconnection.ccg b/gio/src/socketconnection.ccg
index 4c71d8f..13c2569 100644
--- a/gio/src/socketconnection.ccg
+++ b/gio/src/socketconnection.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 Jonathon Jongsma
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/socketconnection.hg b/gio/src/socketconnection.hg
index 5ac0b2d..1c9a738 100644
--- a/gio/src/socketconnection.hg
+++ b/gio/src/socketconnection.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/socketcontrolmessage.ccg b/gio/src/socketcontrolmessage.ccg
index e7119a3..b921f77 100644
--- a/gio/src/socketcontrolmessage.ccg
+++ b/gio/src/socketcontrolmessage.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/socketcontrolmessage.hg b/gio/src/socketcontrolmessage.hg
index 834393b..96e5f36 100644
--- a/gio/src/socketcontrolmessage.hg
+++ b/gio/src/socketcontrolmessage.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/socketlistener.ccg b/gio/src/socketlistener.ccg
index 4185651..c85394e 100644
--- a/gio/src/socketlistener.ccg
+++ b/gio/src/socketlistener.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 Jonathon Jongsma
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/socketlistener.hg b/gio/src/socketlistener.hg
index d463e44..0db6398 100644
--- a/gio/src/socketlistener.hg
+++ b/gio/src/socketlistener.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 Jonathon Jongsma
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/socketservice.ccg b/gio/src/socketservice.ccg
index 58f3251..990512f 100644
--- a/gio/src/socketservice.ccg
+++ b/gio/src/socketservice.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 Jonathon Jongsma
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/socketservice.hg b/gio/src/socketservice.hg
index cc025ca..a21eb18 100644
--- a/gio/src/socketservice.hg
+++ b/gio/src/socketservice.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/socketlistener.h>
diff --git a/gio/src/srvtarget.ccg b/gio/src/srvtarget.ccg
index 931000c..6dfac73 100644
--- a/gio/src/srvtarget.ccg
+++ b/gio/src/srvtarget.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2008 Jonathon Jongsma
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/srvtarget.hg b/gio/src/srvtarget.hg
index 0625461..727182d 100644
--- a/gio/src/srvtarget.hg
+++ b/gio/src/srvtarget.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/value.h>
diff --git a/gio/src/tcpconnection.ccg b/gio/src/tcpconnection.ccg
index 6e07769..5a8b3d2 100644
--- a/gio/src/tcpconnection.ccg
+++ b/gio/src/tcpconnection.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 Jonathon Jongsma
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/tcpconnection.hg b/gio/src/tcpconnection.hg
index edaa3f7..6352c17 100644
--- a/gio/src/tcpconnection.hg
+++ b/gio/src/tcpconnection.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 Jonathon Jongsma
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/tcpwrapperconnection.ccg b/gio/src/tcpwrapperconnection.ccg
index 58b9f17..8571d6d 100644
--- a/gio/src/tcpwrapperconnection.ccg
+++ b/gio/src/tcpwrapperconnection.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/tcpwrapperconnection.hg b/gio/src/tcpwrapperconnection.hg
index a469007..420d17a 100644
--- a/gio/src/tcpwrapperconnection.hg
+++ b/gio/src/tcpwrapperconnection.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/tcpconnection.h>
diff --git a/gio/src/themedicon.ccg b/gio/src/themedicon.ccg
index e9a7f30..48b7686 100644
--- a/gio/src/themedicon.ccg
+++ b/gio/src/themedicon.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/themedicon.hg b/gio/src/themedicon.hg
index f077f48..4d3616a 100644
--- a/gio/src/themedicon.hg
+++ b/gio/src/themedicon.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/threadedsocketservice.ccg b/gio/src/threadedsocketservice.ccg
index 58f3251..990512f 100644
--- a/gio/src/threadedsocketservice.ccg
+++ b/gio/src/threadedsocketservice.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 Jonathon Jongsma
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/threadedsocketservice.hg b/gio/src/threadedsocketservice.hg
index d14a545..ef23974 100644
--- a/gio/src/threadedsocketservice.hg
+++ b/gio/src/threadedsocketservice.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 Jonathon Jongsma
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/socketservice.h>
diff --git a/gio/src/tlscertificate.ccg b/gio/src/tlscertificate.ccg
index 2df281e..3cb4910 100644
--- a/gio/src/tlscertificate.ccg
+++ b/gio/src/tlscertificate.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/tlscertificate.hg b/gio/src/tlscertificate.hg
index 80484fb..09c992e 100644
--- a/gio/src/tlscertificate.hg
+++ b/gio/src/tlscertificate.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/tlsclientconnection.ccg b/gio/src/tlsclientconnection.ccg
index e18f6c7..c2785a4 100644
--- a/gio/src/tlsclientconnection.ccg
+++ b/gio/src/tlsclientconnection.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/tlsclientconnection.hg b/gio/src/tlsclientconnection.hg
index 599a3de..40af030 100644
--- a/gio/src/tlsclientconnection.hg
+++ b/gio/src/tlsclientconnection.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/interface.h>
diff --git a/gio/src/tlsconnection.ccg b/gio/src/tlsconnection.ccg
index 61f13d9..4ec8d7e 100644
--- a/gio/src/tlsconnection.ccg
+++ b/gio/src/tlsconnection.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/tlsconnection.hg b/gio/src/tlsconnection.hg
index 319c052..8206c1f 100644
--- a/gio/src/tlsconnection.hg
+++ b/gio/src/tlsconnection.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _CONFIGINCLUDE(giommconfig.h)
diff --git a/gio/src/tlsdatabase.ccg b/gio/src/tlsdatabase.ccg
index 2bf254f..4b36057 100644
--- a/gio/src/tlsdatabase.ccg
+++ b/gio/src/tlsdatabase.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/tlsdatabase.hg b/gio/src/tlsdatabase.hg
index 610402b..c53ef51 100644
--- a/gio/src/tlsdatabase.hg
+++ b/gio/src/tlsdatabase.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/tlsfiledatabase.ccg b/gio/src/tlsfiledatabase.ccg
index d76f332..eb7ed06 100644
--- a/gio/src/tlsfiledatabase.ccg
+++ b/gio/src/tlsfiledatabase.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/tlsfiledatabase.hg b/gio/src/tlsfiledatabase.hg
index 08650c5..bed39f8 100644
--- a/gio/src/tlsfiledatabase.hg
+++ b/gio/src/tlsfiledatabase.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/tlsdatabase.h>
diff --git a/gio/src/tlsinteraction.ccg b/gio/src/tlsinteraction.ccg
index a55675f..2252149 100644
--- a/gio/src/tlsinteraction.ccg
+++ b/gio/src/tlsinteraction.ccg
@@ -1,3 +1,4 @@
+
 /* Copyright (C) 2012 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -11,8 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/tlsinteraction.hg b/gio/src/tlsinteraction.hg
index 1f48904..09bb2cb 100644
--- a/gio/src/tlsinteraction.hg
+++ b/gio/src/tlsinteraction.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/tlspassword.ccg b/gio/src/tlspassword.ccg
index 5a4c31c..c51f24b 100644
--- a/gio/src/tlspassword.ccg
+++ b/gio/src/tlspassword.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/tlspassword.hg b/gio/src/tlspassword.hg
index 7e2ec17..917061c 100644
--- a/gio/src/tlspassword.hg
+++ b/gio/src/tlspassword.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/tlsserverconnection.ccg b/gio/src/tlsserverconnection.ccg
index 4f97609..01cfc85 100644
--- a/gio/src/tlsserverconnection.ccg
+++ b/gio/src/tlsserverconnection.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/tlsserverconnection.hg b/gio/src/tlsserverconnection.hg
index dbf1a41..a9b52a4 100644
--- a/gio/src/tlsserverconnection.hg
+++ b/gio/src/tlsserverconnection.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/interface.h>
diff --git a/gio/src/unixconnection.ccg b/gio/src/unixconnection.ccg
index 20a3cde..3b9929c 100644
--- a/gio/src/unixconnection.ccg
+++ b/gio/src/unixconnection.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 Jonathon Jongsma
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/unixconnection.hg b/gio/src/unixconnection.hg
index 8134ad6..1ddd1d2 100644
--- a/gio/src/unixconnection.hg
+++ b/gio/src/unixconnection.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 Jonathon Jongsma
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/unixcredentialsmessage.ccg b/gio/src/unixcredentialsmessage.ccg
index 47a59dd..f3fc155 100644
--- a/gio/src/unixcredentialsmessage.ccg
+++ b/gio/src/unixcredentialsmessage.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gunixcredentialsmessage.h>
diff --git a/gio/src/unixcredentialsmessage.hg b/gio/src/unixcredentialsmessage.hg
index 1ad9523..9ba8239 100644
--- a/gio/src/unixcredentialsmessage.hg
+++ b/gio/src/unixcredentialsmessage.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/socketcontrolmessage.h>
diff --git a/gio/src/unixfdlist.ccg b/gio/src/unixfdlist.ccg
index d24555c..5a66bd2 100644
--- a/gio/src/unixfdlist.ccg
+++ b/gio/src/unixfdlist.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gunixfdlist.h>
diff --git a/gio/src/unixfdlist.hg b/gio/src/unixfdlist.hg
index b85804f..75be402 100644
--- a/gio/src/unixfdlist.hg
+++ b/gio/src/unixfdlist.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/unixfdmessage.ccg b/gio/src/unixfdmessage.ccg
index a88cf4f..53ea803 100644
--- a/gio/src/unixfdmessage.ccg
+++ b/gio/src/unixfdmessage.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gunixfdmessage.h>
diff --git a/gio/src/unixfdmessage.hg b/gio/src/unixfdmessage.hg
index f25dacc..30a6e41 100644
--- a/gio/src/unixfdmessage.hg
+++ b/gio/src/unixfdmessage.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/socketcontrolmessage.h>
diff --git a/gio/src/unixinputstream.ccg b/gio/src/unixinputstream.ccg
index 61fd7b0..30fcbd2 100644
--- a/gio/src/unixinputstream.ccg
+++ b/gio/src/unixinputstream.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/unixinputstream.hg b/gio/src/unixinputstream.hg
index f7c71fb..b3521cd 100644
--- a/gio/src/unixinputstream.hg
+++ b/gio/src/unixinputstream.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/inputstream.h>
diff --git a/gio/src/unixmount.ccg b/gio/src/unixmount.ccg
index 98fab0c..12a276f 100644
--- a/gio/src/unixmount.ccg
+++ b/gio/src/unixmount.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/unixmount.hg b/gio/src/unixmount.hg
index 97c27d5..7c8f2f6 100644
--- a/gio/src/unixmount.hg
+++ b/gio/src/unixmount.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/unixoutputstream.ccg b/gio/src/unixoutputstream.ccg
index 1ecd417..5e6d1de 100644
--- a/gio/src/unixoutputstream.ccg
+++ b/gio/src/unixoutputstream.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/unixoutputstream.hg b/gio/src/unixoutputstream.hg
index fc3f1e3..5f00910 100644
--- a/gio/src/unixoutputstream.hg
+++ b/gio/src/unixoutputstream.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/outputstream.h>
diff --git a/gio/src/unixsocketaddress.ccg b/gio/src/unixsocketaddress.ccg
index 8b5b480..b3751af 100644
--- a/gio/src/unixsocketaddress.ccg
+++ b/gio/src/unixsocketaddress.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gunixsocketaddress.h>
diff --git a/gio/src/unixsocketaddress.hg b/gio/src/unixsocketaddress.hg
index 263e86b..8be2922 100644
--- a/gio/src/unixsocketaddress.hg
+++ b/gio/src/unixsocketaddress.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _CONFIGINCLUDE(giommconfig.h)
diff --git a/gio/src/volume.ccg b/gio/src/volume.ccg
index 9ba1898..e0ad7c4 100644
--- a/gio/src/volume.ccg
+++ b/gio/src/volume.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/error.h>
diff --git a/gio/src/volume.hg b/gio/src/volume.hg
index f6339c9..37b51e2 100644
--- a/gio/src/volume.hg
+++ b/gio/src/volume.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <giomm/file.h>
diff --git a/gio/src/volumemonitor.ccg b/gio/src/volumemonitor.ccg
index 48ac82a..59e4bd5 100644
--- a/gio/src/volumemonitor.ccg
+++ b/gio/src/volumemonitor.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/volumemonitor.hg b/gio/src/volumemonitor.hg
index 6eb5c65..d36e0d3 100644
--- a/gio/src/volumemonitor.hg
+++ b/gio/src/volumemonitor.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _CONFIGINCLUDE(giommconfig.h)
diff --git a/gio/src/zlibcompressor.ccg b/gio/src/zlibcompressor.ccg
index 4366e58..37de341 100644
--- a/gio/src/zlibcompressor.ccg
+++ b/gio/src/zlibcompressor.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/zlibcompressor.hg b/gio/src/zlibcompressor.hg
index 223b617..58e7cc8 100644
--- a/gio/src/zlibcompressor.hg
+++ b/gio/src/zlibcompressor.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/gio/src/zlibdecompressor.ccg b/gio/src/zlibdecompressor.ccg
index 4366e58..37de341 100644
--- a/gio/src/zlibdecompressor.ccg
+++ b/gio/src/zlibdecompressor.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/src/zlibdecompressor.hg b/gio/src/zlibdecompressor.hg
index 7ae8166..aab9763 100644
--- a/gio/src/zlibdecompressor.hg
+++ b/gio/src/zlibdecompressor.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/glib/glibmm.h b/glib/glibmm.h
index 101b80e..44f2ea5 100644
--- a/glib/glibmm.h
+++ b/glib/glibmm.h
@@ -13,8 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _GLIBMM_H
diff --git a/glib/glibmm/base64.cc b/glib/glibmm/base64.cc
index c9c279c..9f098db 100644
--- a/glib/glibmm/base64.cc
+++ b/glib/glibmm/base64.cc
@@ -12,8 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/base64.h>
diff --git a/glib/glibmm/base64.h b/glib/glibmm/base64.h
index eda3da0..5fae475 100644
--- a/glib/glibmm/base64.h
+++ b/glib/glibmm/base64.h
@@ -15,8 +15,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <string>
diff --git a/glib/glibmm/class.cc b/glib/glibmm/class.cc
index 29ab8cf..36c3c4b 100644
--- a/glib/glibmm/class.cc
+++ b/glib/glibmm/class.cc
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/class.h>
diff --git a/glib/glibmm/class.h b/glib/glibmm/class.h
index e790715..127b9c9 100644
--- a/glib/glibmm/class.h
+++ b/glib/glibmm/class.h
@@ -15,8 +15,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib-object.h>
diff --git a/glib/glibmm/containerhandle_shared.h b/glib/glibmm/containerhandle_shared.h
index c798550..425734c 100644
--- a/glib/glibmm/containerhandle_shared.h
+++ b/glib/glibmm/containerhandle_shared.h
@@ -14,8 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmmconfig.h>
diff --git a/glib/glibmm/debug.cc b/glib/glibmm/debug.cc
index 4fc3699..fd0b757 100644
--- a/glib/glibmm/debug.cc
+++ b/glib/glibmm/debug.cc
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* Copyright 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/debug.h>
diff --git a/glib/glibmm/debug.h b/glib/glibmm/debug.h
index 831f246..2c32e54 100644
--- a/glib/glibmm/debug.h
+++ b/glib/glibmm/debug.h
@@ -1,4 +1,3 @@
-// -*- c++ -*-
 #ifndef _GLIBMM_DEBUG_H
 #define _GLIBMM_DEBUG_H
 
@@ -15,8 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmmconfig.h>
diff --git a/glib/glibmm/dispatcher.cc b/glib/glibmm/dispatcher.cc
index cd6c43d..36d7235 100644
--- a/glib/glibmm/dispatcher.cc
+++ b/glib/glibmm/dispatcher.cc
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/dispatcher.h>
diff --git a/glib/glibmm/dispatcher.h b/glib/glibmm/dispatcher.h
index f66a523..00c6384 100644
--- a/glib/glibmm/dispatcher.h
+++ b/glib/glibmm/dispatcher.h
@@ -14,8 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <sigc++/sigc++.h>
diff --git a/glib/glibmm/error.cc b/glib/glibmm/error.cc
index 0906336..e3afe5b 100644
--- a/glib/glibmm/error.cc
+++ b/glib/glibmm/error.cc
@@ -13,8 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmmconfig.h>
diff --git a/glib/glibmm/error.h b/glib/glibmm/error.h
index eb61b4e..c015e75 100644
--- a/glib/glibmm/error.h
+++ b/glib/glibmm/error.h
@@ -15,8 +15,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmmconfig.h>
diff --git a/glib/glibmm/exception.cc b/glib/glibmm/exception.cc
index b1e9322..2c25ea9 100644
--- a/glib/glibmm/exception.cc
+++ b/glib/glibmm/exception.cc
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id$ */
-
 /* exception.cc
  *
  * Copyright 2002 The gtkmm Development Team
@@ -16,8 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 //#include <glib/gtestutils.h> //For g_assert() in glib >= 2.15.0
diff --git a/glib/glibmm/exception.h b/glib/glibmm/exception.h
index bc9feae..726f39e 100644
--- a/glib/glibmm/exception.h
+++ b/glib/glibmm/exception.h
@@ -1,7 +1,5 @@
-// -*- c++ -*-
 #ifndef _GLIBMM_EXCEPTION_H
 #define _GLIBMM_EXCEPTION_H
-/* $Id$ */
 
 /* exception.h
  *
@@ -18,8 +16,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/ustring.h>
diff --git a/glib/glibmm/exceptionhandler.cc b/glib/glibmm/exceptionhandler.cc
index e80e009..3c15f8c 100644
--- a/glib/glibmm/exceptionhandler.cc
+++ b/glib/glibmm/exceptionhandler.cc
@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /* exceptionhandler.cc
  *
  * Copyright 2002 The gtkmm Development Team
@@ -15,8 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmmconfig.h>
diff --git a/glib/glibmm/exceptionhandler.h b/glib/glibmm/exceptionhandler.h
index acfd6f5..a34fdbf 100644
--- a/glib/glibmm/exceptionhandler.h
+++ b/glib/glibmm/exceptionhandler.h
@@ -1,4 +1,3 @@
-// -*- c++ -*-
 #ifndef _GLIBMM_EXCEPTIONHANDLER_H
 #define _GLIBMM_EXCEPTIONHANDLER_H
 
@@ -17,8 +16,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmmconfig.h>
diff --git a/glib/glibmm/i18n-lib.h b/glib/glibmm/i18n-lib.h
index 1a7cd1b..62a19f6 100644
--- a/glib/glibmm/i18n-lib.h
+++ b/glib/glibmm/i18n-lib.h
@@ -1,9 +1,6 @@
-// -*- c++ -*-
 #ifndef _GLIBMM_I18N_LIB_H
 #define _GLIBMM_I18N_LIB_H
 
-/* $Id$ */
-
 /* Copyright 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -17,8 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 // Include this file to define internationalization macros such as _().
diff --git a/glib/glibmm/i18n.h b/glib/glibmm/i18n.h
index d35d9a7..17639ac 100644
--- a/glib/glibmm/i18n.h
+++ b/glib/glibmm/i18n.h
@@ -1,9 +1,6 @@
-// -*- c++ -*-
 #ifndef _GLIBMM_I18N_H
 #define _GLIBMM_I18N_H
 
-/* $Id$ */
-
 /* Copyright 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -17,8 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 // Include this file to define internationalization macros such as _().
diff --git a/glib/glibmm/init.cc b/glib/glibmm/init.cc
index f42cdf5..0b34447 100644
--- a/glib/glibmm/init.cc
+++ b/glib/glibmm/init.cc
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/init.h>
diff --git a/glib/glibmm/init.h b/glib/glibmm/init.h
index a736093..ac89d22 100644
--- a/glib/glibmm/init.h
+++ b/glib/glibmm/init.h
@@ -14,8 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 namespace Glib
diff --git a/glib/glibmm/interface.cc b/glib/glibmm/interface.cc
index 34f590e..f01f13d 100644
--- a/glib/glibmm/interface.cc
+++ b/glib/glibmm/interface.cc
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/interface.h>
diff --git a/glib/glibmm/interface.h b/glib/glibmm/interface.h
index 0b27914..9e35b5e 100644
--- a/glib/glibmm/interface.h
+++ b/glib/glibmm/interface.h
@@ -1,9 +1,6 @@
-// -*- c++ -*-
 #ifndef _GLIBMM_INTERFACE_H
 #define _GLIBMM_INTERFACE_H
 
-/* $Id$ */
-
 /* Copyright 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -17,8 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/glib/glibmm/main.cc b/glib/glibmm/main.cc
index 1f51e51..f180d28 100644
--- a/glib/glibmm/main.cc
+++ b/glib/glibmm/main.cc
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmmconfig.h> // May define GLIBMM_DISABLE_DEPRECATED
diff --git a/glib/glibmm/main.h b/glib/glibmm/main.h
index 3306500..a116496 100644
--- a/glib/glibmm/main.h
+++ b/glib/glibmm/main.h
@@ -14,8 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmmconfig.h>
diff --git a/glib/glibmm/object.cc b/glib/glibmm/object.cc
index ce14269..4dc73b3 100644
--- a/glib/glibmm/object.cc
+++ b/glib/glibmm/object.cc
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/object.h>
diff --git a/glib/glibmm/object.h b/glib/glibmm/object.h
index 006d5ea..cda1552 100644
--- a/glib/glibmm/object.h
+++ b/glib/glibmm/object.h
@@ -14,8 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 // X11 defines DestroyNotify and some other non-prefixed stuff, and it's too late to change that
diff --git a/glib/glibmm/objectbase.cc b/glib/glibmm/objectbase.cc
index 7e36414..dad5fd5 100644
--- a/glib/glibmm/objectbase.cc
+++ b/glib/glibmm/objectbase.cc
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib-object.h>
diff --git a/glib/glibmm/objectbase.h b/glib/glibmm/objectbase.h
index 3faed9d..6beaa59 100644
--- a/glib/glibmm/objectbase.h
+++ b/glib/glibmm/objectbase.h
@@ -14,8 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmmconfig.h>
diff --git a/glib/glibmm/pattern.cc b/glib/glibmm/pattern.cc
index 8fb94fc..4493606 100644
--- a/glib/glibmm/pattern.cc
+++ b/glib/glibmm/pattern.cc
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id$ */
-
 /* pattern.cc
  *
  * Copyright (C) 2002 The gtkmm Development Team
@@ -16,8 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib.h>
diff --git a/glib/glibmm/pattern.h b/glib/glibmm/pattern.h
index fddec5c..0446907 100644
--- a/glib/glibmm/pattern.h
+++ b/glib/glibmm/pattern.h
@@ -1,9 +1,6 @@
-// -*- c++ -*-
 #ifndef _GLIBMM_PATTERN_H
 #define _GLIBMM_PATTERN_H
 
-/* $Id$ */
-
 /* pattern.h
  *
  * Copyright (C) 2002 The gtkmm Development Team
@@ -19,8 +16,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 extern "C" {
diff --git a/glib/glibmm/priorities.h b/glib/glibmm/priorities.h
index a856751..9634c0a 100644
--- a/glib/glibmm/priorities.h
+++ b/glib/glibmm/priorities.h
@@ -1,9 +1,6 @@
-// -*- c++ -*-
 #ifndef _GLIBMM_PRIORITIES_H
 #define _GLIBMM_PRIORITIES_H
 
-/* $Id: priorities.h 420 2007-06-22 15:29:58Z murrayc $ */
-
 /* Copyright (C) 2002-2008 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -17,8 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 namespace Glib
diff --git a/glib/glibmm/property.cc b/glib/glibmm/property.cc
index 45d90b3..30de748 100644
--- a/glib/glibmm/property.cc
+++ b/glib/glibmm/property.cc
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/property.h>
diff --git a/glib/glibmm/property.h b/glib/glibmm/property.h
index ca8cde9..0b7835b 100644
--- a/glib/glibmm/property.h
+++ b/glib/glibmm/property.h
@@ -14,8 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmmconfig.h>
diff --git a/glib/glibmm/propertyproxy.cc b/glib/glibmm/propertyproxy.cc
index bd02587..db0574e 100644
--- a/glib/glibmm/propertyproxy.cc
+++ b/glib/glibmm/propertyproxy.cc
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id$ */
-
 /* propertyproxy.cc
  *
  * Copyright 2002 The gtkmm Development Team
@@ -16,8 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/propertyproxy.h>
diff --git a/glib/glibmm/propertyproxy.h b/glib/glibmm/propertyproxy.h
index bc27409..67eaab3 100644
--- a/glib/glibmm/propertyproxy.h
+++ b/glib/glibmm/propertyproxy.h
@@ -1,4 +1,3 @@
-// -*- c++ -*-
 #ifndef _GLIBMM_PROPERTYPROXY_H
 #define _GLIBMM_PROPERTYPROXY_H
 
@@ -17,8 +16,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmmconfig.h>
diff --git a/glib/glibmm/propertyproxy_base.cc b/glib/glibmm/propertyproxy_base.cc
index 66ebf70..d473c63 100644
--- a/glib/glibmm/propertyproxy_base.cc
+++ b/glib/glibmm/propertyproxy_base.cc
@@ -13,8 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/propertyproxy_base.h>
diff --git a/glib/glibmm/propertyproxy_base.h b/glib/glibmm/propertyproxy_base.h
index c5e6a53..1e84070 100644
--- a/glib/glibmm/propertyproxy_base.h
+++ b/glib/glibmm/propertyproxy_base.h
@@ -16,8 +16,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmmconfig.h>
diff --git a/glib/glibmm/quark.cc b/glib/glibmm/quark.cc
index a528be8..d8b5cf5 100644
--- a/glib/glibmm/quark.cc
+++ b/glib/glibmm/quark.cc
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* quark.cc
  *
  * Copyright 2002 The gtkmm Development Team
@@ -15,8 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/quark.h>
diff --git a/glib/glibmm/quark.h b/glib/glibmm/quark.h
index ae0731c..b860e74 100644
--- a/glib/glibmm/quark.h
+++ b/glib/glibmm/quark.h
@@ -1,4 +1,3 @@
-// -*- c++ -*-
 #ifndef _GLIBMM_QUARK_H
 #define _GLIBMM_QUARK_H
 
@@ -17,8 +16,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmmconfig.h>
diff --git a/glib/glibmm/random.cc b/glib/glibmm/random.cc
index 11f5cdf..aec836b 100644
--- a/glib/glibmm/random.cc
+++ b/glib/glibmm/random.cc
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id$ */
-
 /* random.cc
  *
  * Copyright (C) 2002 The gtkmm Development Team
@@ -16,8 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm.h>
diff --git a/glib/glibmm/random.h b/glib/glibmm/random.h
index d934044..3b9893e 100644
--- a/glib/glibmm/random.h
+++ b/glib/glibmm/random.h
@@ -1,9 +1,6 @@
-// -*- c++ -*-
 #ifndef _GLIBMM_RANDOM_H
 #define _GLIBMM_RANDOM_H
 
-/* $Id$ */
-
 /* random.h
  *
  * Copyright (C) 2002 The gtkmm Development Team
@@ -19,8 +16,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib.h>
diff --git a/glib/glibmm/refptr.h b/glib/glibmm/refptr.h
index 8edf68b..c77b21d 100644
--- a/glib/glibmm/refptr.h
+++ b/glib/glibmm/refptr.h
@@ -14,8 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmmconfig.h>
diff --git a/glib/glibmm/signalproxy.cc b/glib/glibmm/signalproxy.cc
index 9da33cc..c36d713 100644
--- a/glib/glibmm/signalproxy.cc
+++ b/glib/glibmm/signalproxy.cc
@@ -13,8 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib-object.h>
diff --git a/glib/glibmm/signalproxy.h b/glib/glibmm/signalproxy.h
index c537ea5..0f2022b 100644
--- a/glib/glibmm/signalproxy.h
+++ b/glib/glibmm/signalproxy.h
@@ -16,8 +16,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 extern "C" {
diff --git a/glib/glibmm/signalproxy_connectionnode.cc b/glib/glibmm/signalproxy_connectionnode.cc
index 8603e76..af50254 100644
--- a/glib/glibmm/signalproxy_connectionnode.cc
+++ b/glib/glibmm/signalproxy_connectionnode.cc
@@ -13,8 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/signalproxy_connectionnode.h>
diff --git a/glib/glibmm/signalproxy_connectionnode.h b/glib/glibmm/signalproxy_connectionnode.h
index 3099269..da82bdf 100644
--- a/glib/glibmm/signalproxy_connectionnode.h
+++ b/glib/glibmm/signalproxy_connectionnode.h
@@ -16,8 +16,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <sigc++/sigc++.h>
diff --git a/glib/glibmm/stringutils.cc b/glib/glibmm/stringutils.cc
index 329b1b0..f6ce8fa 100644
--- a/glib/glibmm/stringutils.cc
+++ b/glib/glibmm/stringutils.cc
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id$ */
-
 /* Copyright (C) 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -14,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmmconfig.h>
diff --git a/glib/glibmm/stringutils.h b/glib/glibmm/stringutils.h
index a81d770..e6659e2 100644
--- a/glib/glibmm/stringutils.h
+++ b/glib/glibmm/stringutils.h
@@ -1,9 +1,6 @@
-// -*- c++ -*-
 #ifndef _GLIBMM_STRINGUTILS_H
 #define _GLIBMM_STRINGUTILS_H
 
-/* $Id$ */
-
 /* Copyright (C) 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -17,8 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/ustring.h>
diff --git a/glib/glibmm/timer.cc b/glib/glibmm/timer.cc
index ad3bd6b..7f32b18 100644
--- a/glib/glibmm/timer.cc
+++ b/glib/glibmm/timer.cc
@@ -13,8 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm.h>
diff --git a/glib/glibmm/timer.h b/glib/glibmm/timer.h
index 2559ffa..fcee92b 100644
--- a/glib/glibmm/timer.h
+++ b/glib/glibmm/timer.h
@@ -1,9 +1,6 @@
-// -*- c++ -*-
 #ifndef _GLIBMM_TIMER_H
 #define _GLIBMM_TIMER_H
 
-/* $Id$ */
-
 /* timer.h
  *
  * Copyright (C) 2002 The gtkmm Development Team
@@ -19,8 +16,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 extern "C" {
diff --git a/glib/glibmm/timeval.cc b/glib/glibmm/timeval.cc
index 63e93c5..c8bb9a9 100644
--- a/glib/glibmm/timeval.cc
+++ b/glib/glibmm/timeval.cc
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id$ */
-
 /* timeval.cc
  *
  * Copyright (C) 2002 The gtkmm Development Team
@@ -16,8 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/timeval.h>
diff --git a/glib/glibmm/timeval.h b/glib/glibmm/timeval.h
index 11b3c44..e67a9e0 100644
--- a/glib/glibmm/timeval.h
+++ b/glib/glibmm/timeval.h
@@ -1,9 +1,6 @@
-// -*- c++ -*-
 #ifndef _GLIBMM_TIMEVAL_H
 #define _GLIBMM_TIMEVAL_H
 
-/* $Id$ */
-
 /* timeval.h
  *
  * Copyright (C) 2002 The gtkmm Development Team
@@ -19,8 +16,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib.h>
diff --git a/glib/glibmm/ustring.cc b/glib/glibmm/ustring.cc
index d05e986..f26fe68 100644
--- a/glib/glibmm/ustring.cc
+++ b/glib/glibmm/ustring.cc
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmmconfig.h>
diff --git a/glib/glibmm/ustring.h b/glib/glibmm/ustring.h
index 0aee963..4c686ff 100644
--- a/glib/glibmm/ustring.h
+++ b/glib/glibmm/ustring.h
@@ -14,8 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmmconfig.h>
diff --git a/glib/glibmm/utility.cc b/glib/glibmm/utility.cc
index 172ff7a..4c21660 100644
--- a/glib/glibmm/utility.cc
+++ b/glib/glibmm/utility.cc
@@ -1,7 +1,3 @@
-// -*- c++ -*-
-
-/* $Id$ */
-
 /* Copyright (C) 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -15,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/utility.h>
diff --git a/glib/glibmm/utility.h b/glib/glibmm/utility.h
index 5e17183..9d65d65 100644
--- a/glib/glibmm/utility.h
+++ b/glib/glibmm/utility.h
@@ -14,8 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmmconfig.h>
diff --git a/glib/glibmm/value.cc b/glib/glibmm/value.cc
index 893bb85..34de309 100644
--- a/glib/glibmm/value.cc
+++ b/glib/glibmm/value.cc
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id$ */
-
 /* Copyright 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -14,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/value.h>
diff --git a/glib/glibmm/value.h b/glib/glibmm/value.h
index 142e187..c423029 100644
--- a/glib/glibmm/value.h
+++ b/glib/glibmm/value.h
@@ -14,8 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmmconfig.h>
diff --git a/glib/glibmm/value_custom.cc b/glib/glibmm/value_custom.cc
index 69354ef..1526070 100644
--- a/glib/glibmm/value_custom.cc
+++ b/glib/glibmm/value_custom.cc
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id$ */
-
 /* Copyright 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -14,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/value.h>
diff --git a/glib/glibmm/value_custom.h b/glib/glibmm/value_custom.h
index 0284888..7c23a8d 100644
--- a/glib/glibmm/value_custom.h
+++ b/glib/glibmm/value_custom.h
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _GLIBMM_VALUE_CUSTOM_H
diff --git a/glib/glibmm/vectorutils.cc b/glib/glibmm/vectorutils.cc
index 8a8e711..b4cac1e 100644
--- a/glib/glibmm/vectorutils.cc
+++ b/glib/glibmm/vectorutils.cc
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/vectorutils.h>
diff --git a/glib/glibmm/vectorutils.h b/glib/glibmm/vectorutils.h
index 6ea434a..f68903d 100644
--- a/glib/glibmm/vectorutils.h
+++ b/glib/glibmm/vectorutils.h
@@ -1,4 +1,3 @@
-// -*- c++ -*-
 #ifndef _GLIBMM_VECTORUTILS_H
 #define _GLIBMM_VECTORUTILS_H
 
@@ -15,8 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <vector>
 #include <glibmmconfig.h>
diff --git a/glib/glibmm/wrap.cc b/glib/glibmm/wrap.cc
index ee9ca79..08f0309 100644
--- a/glib/glibmm/wrap.cc
+++ b/glib/glibmm/wrap.cc
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id$ */
-
 /* wrap.cc
  *
  * Copyright (C) 1998-2002 The gtkmm Development Team
@@ -16,8 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmmconfig.h>
diff --git a/glib/glibmm/wrap.h b/glib/glibmm/wrap.h
index eec39bb..dfa4c96 100644
--- a/glib/glibmm/wrap.h
+++ b/glib/glibmm/wrap.h
@@ -14,8 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib-object.h>
diff --git a/glib/glibmm/wrap_init.h b/glib/glibmm/wrap_init.h
index f53ae41..df27023 100644
--- a/glib/glibmm/wrap_init.h
+++ b/glib/glibmm/wrap_init.h
@@ -1,9 +1,6 @@
-// -*- c++ -*-
 #ifndef _GLIBMM_WRAP_INIT_H
 #define _GLIBMM_WRAP_INIT_H
 
-/* $Id$ */
-
 /* wrap_init.h
  *
  * Copyright 2002 The gtkmm Development Team
@@ -19,8 +16,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/error.h>
diff --git a/glib/src/balancedtree.hg b/glib/src/balancedtree.hg
index 6d02c39..31be6e4 100644
--- a/glib/src/balancedtree.hg
+++ b/glib/src/balancedtree.hg
@@ -11,8 +11,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _DEFS(glibmm,glib)
diff --git a/glib/src/bytearray.ccg b/glib/src/bytearray.ccg
index 2cb910c..003c58b 100644
--- a/glib/src/bytearray.ccg
+++ b/glib/src/bytearray.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 namespace
diff --git a/glib/src/bytearray.hg b/glib/src/bytearray.hg
index 3ed2d69..ebf385b 100644
--- a/glib/src/bytearray.hg
+++ b/glib/src/bytearray.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _DEFS(glibmm,glib)
diff --git a/glib/src/bytes.ccg b/glib/src/bytes.ccg
index 0ff936a..bc43f2d 100644
--- a/glib/src/bytes.ccg
+++ b/glib/src/bytes.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 namespace Glib
diff --git a/glib/src/bytes.hg b/glib/src/bytes.hg
index b4b1f2a..60b92d1 100644
--- a/glib/src/bytes.hg
+++ b/glib/src/bytes.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _DEFS(glibmm,glib)
diff --git a/glib/src/checksum.ccg b/glib/src/checksum.ccg
index 0db13da..c612049 100644
--- a/glib/src/checksum.ccg
+++ b/glib/src/checksum.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/utility.h>
diff --git a/glib/src/checksum.hg b/glib/src/checksum.hg
index 9394eb2..4785470 100644
--- a/glib/src/checksum.hg
+++ b/glib/src/checksum.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _DEFS(glibmm,glib)
diff --git a/glib/src/convert.ccg b/glib/src/convert.ccg
index 6a84847..cd08eac 100644
--- a/glib/src/convert.ccg
+++ b/glib/src/convert.ccg
@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /* Copyright (C) 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -13,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 //#include <glib/gtestutils.h> //For g_assert() in glib >= 2.15.0
diff --git a/glib/src/convert.hg b/glib/src/convert.hg
index 408ceb3..9c211bc 100644
--- a/glib/src/convert.hg
+++ b/glib/src/convert.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _DEFS(glibmm,glib)
diff --git a/glib/src/date.ccg b/glib/src/date.ccg
index 7aac7a4..75f240b 100644
--- a/glib/src/date.ccg
+++ b/glib/src/date.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 //#include <glib/gtestutils.h> //For g_assert() in glib >= 2.15.0
diff --git a/glib/src/date.hg b/glib/src/date.hg
index 1f674c1..f3f9442 100644
--- a/glib/src/date.hg
+++ b/glib/src/date.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _DEFS(glibmm,glib)
diff --git a/glib/src/datetime.ccg b/glib/src/datetime.ccg
index d47f05c..fbad36e 100644
--- a/glib/src/datetime.ccg
+++ b/glib/src/datetime.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/utility.h>
diff --git a/glib/src/datetime.hg b/glib/src/datetime.hg
index 8a4a4a8..6665950 100644
--- a/glib/src/datetime.hg
+++ b/glib/src/datetime.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _DEFS(glibmm,glib)
diff --git a/glib/src/enums.ccg b/glib/src/enums.ccg
index f3c6be6..55b57e0 100644
--- a/glib/src/enums.ccg
+++ b/glib/src/enums.ccg
@@ -11,6 +11,5 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
diff --git a/glib/src/enums.hg b/glib/src/enums.hg
index 290ee4b..656f285 100644
--- a/glib/src/enums.hg
+++ b/glib/src/enums.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _DEFS(glibmm,glib)
diff --git a/glib/src/fileutils.ccg b/glib/src/fileutils.ccg
index eabe8e2..777aa9d 100644
--- a/glib/src/fileutils.ccg
+++ b/glib/src/fileutils.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib.h>
diff --git a/glib/src/fileutils.hg b/glib/src/fileutils.hg
index e660ca5..3aa76d7 100644
--- a/glib/src/fileutils.hg
+++ b/glib/src/fileutils.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _DEFS(glibmm,glib)
diff --git a/glib/src/iochannel.ccg b/glib/src/iochannel.ccg
index 187db24..5e8113f 100644
--- a/glib/src/iochannel.ccg
+++ b/glib/src/iochannel.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/exceptionhandler.h>
diff --git a/glib/src/iochannel.hg b/glib/src/iochannel.hg
index 7a3ade1..0752bce 100644
--- a/glib/src/iochannel.hg
+++ b/glib/src/iochannel.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _DEFS(glibmm,glib)
diff --git a/glib/src/keyfile.ccg b/glib/src/keyfile.ccg
index ce14bed..2f86b55 100644
--- a/glib/src/keyfile.ccg
+++ b/glib/src/keyfile.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 namespace Glib
diff --git a/glib/src/keyfile.hg b/glib/src/keyfile.hg
index e33b1d8..17852ca 100644
--- a/glib/src/keyfile.hg
+++ b/glib/src/keyfile.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _DEFS(glibmm,glib)
diff --git a/glib/src/markup.ccg b/glib/src/markup.ccg
index 4e2bf54..408b168 100644
--- a/glib/src/markup.ccg
+++ b/glib/src/markup.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/markup.h>
diff --git a/glib/src/markup.hg b/glib/src/markup.hg
index 6f745f5..8e014ba 100644
--- a/glib/src/markup.hg
+++ b/glib/src/markup.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _DEFS(glibmm,glib)
diff --git a/glib/src/miscutils.ccg b/glib/src/miscutils.ccg
index 579bcca..abd2dac 100644
--- a/glib/src/miscutils.ccg
+++ b/glib/src/miscutils.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <cstddef>
diff --git a/glib/src/miscutils.hg b/glib/src/miscutils.hg
index 336b13c..ffc87f3 100644
--- a/glib/src/miscutils.hg
+++ b/glib/src/miscutils.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _DEFS(glibmm,glib)
diff --git a/glib/src/module.ccg b/glib/src/module.ccg
index 37ead86..6322cae 100644
--- a/glib/src/module.ccg
+++ b/glib/src/module.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/utility.h>
diff --git a/glib/src/module.hg b/glib/src/module.hg
index bb6f428..fe028a5 100644
--- a/glib/src/module.hg
+++ b/glib/src/module.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _DEFS(glibmm,glib)
diff --git a/glib/src/nodetree.hg b/glib/src/nodetree.hg
index 72cf86d..1db7f1a 100644
--- a/glib/src/nodetree.hg
+++ b/glib/src/nodetree.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _DEFS(glibmm,glib)
diff --git a/glib/src/optioncontext.ccg b/glib/src/optioncontext.ccg
index a6132d0..b63434e 100644
--- a/glib/src/optioncontext.ccg
+++ b/glib/src/optioncontext.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/utility.h>
diff --git a/glib/src/optioncontext.hg b/glib/src/optioncontext.hg
index 0f86e6e..27600af 100644
--- a/glib/src/optioncontext.hg
+++ b/glib/src/optioncontext.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _DEFS(glibmm,glib)
diff --git a/glib/src/optionentry.ccg b/glib/src/optionentry.ccg
index 705e373..44a5dd3 100644
--- a/glib/src/optionentry.ccg
+++ b/glib/src/optionentry.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/utility.h>
diff --git a/glib/src/optionentry.hg b/glib/src/optionentry.hg
index c64d13b..4e02700 100644
--- a/glib/src/optionentry.hg
+++ b/glib/src/optionentry.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _DEFS(glibmm,glib)
diff --git a/glib/src/optiongroup.ccg b/glib/src/optiongroup.ccg
index 0bd922f..1045849 100644
--- a/glib/src/optiongroup.ccg
+++ b/glib/src/optiongroup.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/optionentry.h>
diff --git a/glib/src/optiongroup.hg b/glib/src/optiongroup.hg
index 5fbdcbf..6ef64cd 100644
--- a/glib/src/optiongroup.hg
+++ b/glib/src/optiongroup.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _DEFS(glibmm,glib)
diff --git a/glib/src/regex.ccg b/glib/src/regex.ccg
index 1014971..86272bc 100644
--- a/glib/src/regex.ccg
+++ b/glib/src/regex.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/utility.h>
diff --git a/glib/src/regex.hg b/glib/src/regex.hg
index 73eedf3..fdc7a42 100644
--- a/glib/src/regex.hg
+++ b/glib/src/regex.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _DEFS(glibmm,glib)
diff --git a/glib/src/shell.ccg b/glib/src/shell.ccg
index 10b4b4f..940a9a3 100644
--- a/glib/src/shell.ccg
+++ b/glib/src/shell.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/utility.h>
diff --git a/glib/src/shell.hg b/glib/src/shell.hg
index 8b3b91e..50736ea 100644
--- a/glib/src/shell.hg
+++ b/glib/src/shell.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _DEFS(glibmm,glib)
diff --git a/glib/src/spawn.ccg b/glib/src/spawn.ccg
index 74c8016..8475244 100644
--- a/glib/src/spawn.ccg
+++ b/glib/src/spawn.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib.h>
diff --git a/glib/src/spawn.hg b/glib/src/spawn.hg
index 85d7ed2..b6a05d6 100644
--- a/glib/src/spawn.hg
+++ b/glib/src/spawn.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _DEFS(glibmm,glib)
diff --git a/glib/src/template.macros.m4 b/glib/src/template.macros.m4
index 1a24059..5679546 100644
--- a/glib/src/template.macros.m4
+++ b/glib/src/template.macros.m4
@@ -17,8 +17,7 @@ dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 dnl  Lesser General Public License for more details.
 dnl
 dnl  You should have received a copy of the GNU Lesser General Public
-dnl  License along with this library; if not, write to the Free
-dnl  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+dnl  License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 dnl
 dnl-----------------------------------------------------------------------
 dnl  Recursion prevention.  (Don't attempt to understand why this works!)
diff --git a/glib/src/timezone.ccg b/glib/src/timezone.ccg
index ad11205..7faf86e 100644
--- a/glib/src/timezone.ccg
+++ b/glib/src/timezone.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/utility.h>
diff --git a/glib/src/timezone.hg b/glib/src/timezone.hg
index 80e95d5..1a03376 100644
--- a/glib/src/timezone.hg
+++ b/glib/src/timezone.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _DEFS(glibmm,glib)
diff --git a/glib/src/unicode.ccg b/glib/src/unicode.ccg
index be4c2b5..aac6cd6 100644
--- a/glib/src/unicode.ccg
+++ b/glib/src/unicode.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/unicode.h>
diff --git a/glib/src/unicode.hg b/glib/src/unicode.hg
index b3c50bb..b3d65f5 100644
--- a/glib/src/unicode.hg
+++ b/glib/src/unicode.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _DEFS(glibmm,glib)
diff --git a/glib/src/uriutils.ccg b/glib/src/uriutils.ccg
index c34848b..4650c0c 100644
--- a/glib/src/uriutils.ccg
+++ b/glib/src/uriutils.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib.h>
diff --git a/glib/src/uriutils.hg b/glib/src/uriutils.hg
index a1a6f89..05358a4 100644
--- a/glib/src/uriutils.hg
+++ b/glib/src/uriutils.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _DEFS(glibmm,glib)
diff --git a/glib/src/value_basictypes.cc.m4 b/glib/src/value_basictypes.cc.m4
index 82b2233..5f52747 100644
--- a/glib/src/value_basictypes.cc.m4
+++ b/glib/src/value_basictypes.cc.m4
@@ -15,8 +15,7 @@ dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 dnl  Lesser General Public License for more details.
 dnl
 dnl  You should have received a copy of the GNU Lesser General Public
-dnl  License along with this library; if not, write to the Free
-dnl  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+dnl  License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 include(template.macros.m4)
 
diff --git a/glib/src/value_basictypes.h.m4 b/glib/src/value_basictypes.h.m4
index 56097ac..b6a3c83 100644
--- a/glib/src/value_basictypes.h.m4
+++ b/glib/src/value_basictypes.h.m4
@@ -15,8 +15,7 @@ dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 dnl  Lesser General Public License for more details.
 dnl
 dnl  You should have received a copy of the GNU Lesser General Public
-dnl  License along with this library; if not, write to the Free
-dnl  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+dnl  License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 include(template.macros.m4)
 
diff --git a/glib/src/variant.ccg b/glib/src/variant.ccg
index fd0cb22..6a2a6a9 100644
--- a/glib/src/variant.ccg
+++ b/glib/src/variant.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/variant.h>
diff --git a/glib/src/variant.hg b/glib/src/variant.hg
index 0824ce2..3c3ae4e 100644
--- a/glib/src/variant.hg
+++ b/glib/src/variant.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _DEFS(glibmm,glib)
diff --git a/glib/src/variant_basictypes.cc.m4 b/glib/src/variant_basictypes.cc.m4
index 4247da8..ecdfc73 100644
--- a/glib/src/variant_basictypes.cc.m4
+++ b/glib/src/variant_basictypes.cc.m4
@@ -17,8 +17,7 @@ dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 dnl  Lesser General Public License for more details.
 dnl
 dnl  You should have received a copy of the GNU Lesser General Public
-dnl  License along with this library; if not, write to the Free
-dnl  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+dnl  License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 include(template.macros.m4)
 
diff --git a/glib/src/variant_basictypes.h.m4 b/glib/src/variant_basictypes.h.m4
index 959a8e5..5415177 100644
--- a/glib/src/variant_basictypes.h.m4
+++ b/glib/src/variant_basictypes.h.m4
@@ -17,8 +17,7 @@ dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 dnl  Lesser General Public License for more details.
 dnl
 dnl  You should have received a copy of the GNU Lesser General Public
-dnl  License along with this library; if not, write to the Free
-dnl  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+dnl  License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 include(template.macros.m4)
 
diff --git a/glib/src/variantdict.ccg b/glib/src/variantdict.ccg
index 6e069a3..18224f6 100644
--- a/glib/src/variantdict.ccg
+++ b/glib/src/variantdict.ccg
@@ -12,8 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib.h>
diff --git a/glib/src/variantdict.hg b/glib/src/variantdict.hg
index 5974953..1f9a5a1 100644
--- a/glib/src/variantdict.hg
+++ b/glib/src/variantdict.hg
@@ -1,19 +1,18 @@
 /*
  * Copyright (C) 2014 The glibmm Development Team
  *
- * This library is free software, ) you can redistribute it and/or
+ * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation, ) either
- * version 2.1 of the License, or(at your option) any later version.
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY, ) without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library, ) if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/variant.h>
diff --git a/glib/src/variantiter.ccg b/glib/src/variantiter.ccg
index cd06bac..30452bd 100644
--- a/glib/src/variantiter.ccg
+++ b/glib/src/variantiter.ccg
@@ -1,9 +1,9 @@
 /* Copyright(C) 2010 The glibmm Development Team
  *
- * This library is free software, ) you can redistribute it and/or
+ * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation, ) either
- * version 2.1 of the License, or(at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY, ) without even the implied warranty of
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library, ) if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/variant.h>
diff --git a/glib/src/variantiter.hg b/glib/src/variantiter.hg
index 28f9517..c81dc29 100644
--- a/glib/src/variantiter.hg
+++ b/glib/src/variantiter.hg
@@ -1,18 +1,17 @@
 /* Copyright(C) 2010 The glibmm Development Team
  *
- * This library is free software, ) you can redistribute it and/or
+ * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation, ) either
- * version 2.1 of the License, or(at your option) any later version.
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY, ) without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library, ) if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib.h>
diff --git a/glib/src/varianttype.ccg b/glib/src/varianttype.ccg
index 1bac94d..ff1784f 100644
--- a/glib/src/varianttype.ccg
+++ b/glib/src/varianttype.ccg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/varianttype.h>
diff --git a/glib/src/varianttype.hg b/glib/src/varianttype.hg
index de8b970..fb0e6e3 100644
--- a/glib/src/varianttype.hg
+++ b/glib/src/varianttype.hg
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 _DEFS(glibmm,glib)
diff --git a/tests/glibmm_bool_vector/main.cc b/tests/glibmm_bool_vector/main.cc
index 79b286c..0752318 100644
--- a/tests/glibmm_bool_vector/main.cc
+++ b/tests/glibmm_bool_vector/main.cc
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <cstdlib>
 #include <ctime>
diff --git a/tests/glibmm_null_vectorutils/main.cc b/tests/glibmm_null_vectorutils/main.cc
index b658b39..533451f 100644
--- a/tests/glibmm_null_vectorutils/main.cc
+++ b/tests/glibmm_null_vectorutils/main.cc
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glibmm/vectorutils.h>
diff --git a/tests/glibmm_vector/main.cc b/tests/glibmm_vector/main.cc
index e4e779c..31138cf 100644
--- a/tests/glibmm_vector/main.cc
+++ b/tests/glibmm_vector/main.cc
@@ -11,8 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 // ugly code ahead.
diff --git a/tools/defs_fixer.pl b/tools/defs_fixer.pl
index e59c13c..bc0ace8 100644
--- a/tools/defs_fixer.pl
+++ b/tools/defs_fixer.pl
@@ -13,8 +13,7 @@
 # Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free
-# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #
 #
 #
diff --git a/tools/extra_defs_gen/generate_defs_gio.cc b/tools/extra_defs_gen/generate_defs_gio.cc
index 30c3939..0759a52 100644
--- a/tools/extra_defs_gen/generate_defs_gio.cc
+++ b/tools/extra_defs_gen/generate_defs_gio.cc
@@ -13,8 +13,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "generate_extra_defs.h"
diff --git a/tools/extra_defs_gen/generate_defs_glib.cc b/tools/extra_defs_gen/generate_defs_glib.cc
index 235bc39..f1e552f 100644
--- a/tools/extra_defs_gen/generate_defs_glib.cc
+++ b/tools/extra_defs_gen/generate_defs_glib.cc
@@ -13,8 +13,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "generate_extra_defs.h"
diff --git a/tools/extra_defs_gen/generate_extra_defs.cc b/tools/extra_defs_gen/generate_extra_defs.cc
index 3b5028d..04f9099 100644
--- a/tools/extra_defs_gen/generate_extra_defs.cc
+++ b/tools/extra_defs_gen/generate_extra_defs.cc
@@ -13,8 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "generate_extra_defs.h"
diff --git a/tools/extra_defs_gen/generate_extra_defs.h b/tools/extra_defs_gen/generate_extra_defs.h
index 9d960e3..300df4c 100644
--- a/tools/extra_defs_gen/generate_extra_defs.h
+++ b/tools/extra_defs_gen/generate_extra_defs.h
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* generate_extra_defs.h
  *
  * Copyright (C) 2001 The Free Software Foundation
@@ -15,8 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib-object.h>
diff --git a/tools/gmmproc.in b/tools/gmmproc.in
index e929503..56b44e6 100644
--- a/tools/gmmproc.in
+++ b/tools/gmmproc.in
@@ -21,8 +21,7 @@
 # GNU General Public License for more details. 
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 #
 # 'classes':
diff --git a/tools/pm/DocsParser.pm b/tools/pm/DocsParser.pm
index 93928be..aef3825 100644
--- a/tools/pm/DocsParser.pm
+++ b/tools/pm/DocsParser.pm
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # Based on XML::Parser tutorial found at http://www.devshed.com/Server_Side/Perl/PerlXML/PerlXML1/page1.html
diff --git a/tools/pm/GtkDefs.pm b/tools/pm/GtkDefs.pm
index 03c1131..f1234f8 100644
--- a/tools/pm/GtkDefs.pm
+++ b/tools/pm/GtkDefs.pm
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 package GtkDefs;
 use strict;
diff --git a/tools/pm/Output.pm b/tools/pm/Output.pm
index f3c3bb3..62209e9 100644
--- a/tools/pm/Output.pm
+++ b/tools/pm/Output.pm
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 package Output;
 use strict;
diff --git a/tools/pm/Util.pm b/tools/pm/Util.pm
index bf033c6..9b0dd66 100644
--- a/tools/pm/Util.pm
+++ b/tools/pm/Util.pm
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 #
 # This file holds basic functions used throughout gtkmmproc modules.
diff --git a/tools/pm/WrapParser.pm b/tools/pm/WrapParser.pm
index 504e0c4..9de213e 100644
--- a/tools/pm/WrapParser.pm
+++ b/tools/pm/WrapParser.pm
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 package WrapParser;
 use strict;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]