From 0799c1a7801d03bd88d616c44a5ac30690f48519 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Sat, 9 Mar 2002 23:29:33 +0000
Subject: [PATCH] Added LGPL standard comment, and copyright notices where
 necessary. Global replacement of debugtools.h by wine/debug.h.

---
 console/generic.c                          | 33 +++++++++----
 console/interface.c                        | 30 +++++++++---
 console/ncurses.c                          | 23 +++++++--
 console/tty.c                              | 28 ++++++++---
 console/xterm.c                            | 37 +++++++++-----
 controls/button.c                          | 14 ++++++
 controls/combo.c                           | 18 ++++++-
 controls/desktop.c                         | 14 ++++++
 controls/edit.c                            | 22 +++++++--
 controls/icontitle.c                       | 14 ++++++
 controls/listbox.c                         | 20 ++++++--
 controls/menu.c                            | 20 ++++++--
 controls/scroll.c                          | 18 ++++++-
 controls/static.c                          | 17 ++++++-
 controls/uitools.c                         | 18 ++++++-
 debugger/break.c                           | 14 ++++++
 debugger/dbg.y                             | 14 ++++++
 debugger/debug.l                           | 14 ++++++
 debugger/debugger.h                        | 14 ++++++
 debugger/display.c                         | 13 +++++
 debugger/expr.c                            | 13 +++++
 debugger/expr.h                            | 18 +++++++
 debugger/ext_debugger.c                    | 21 ++++++--
 debugger/hash.c                            | 14 ++++++
 debugger/info.c                            | 14 ++++++
 debugger/intvar.h                          | 18 ++++++-
 debugger/memory.c                          | 14 ++++++
 debugger/module.c                          | 14 ++++++
 debugger/msc.c                             | 14 ++++++
 debugger/registers.c                       | 14 ++++++
 debugger/source.c                          | 13 +++++
 debugger/stabs.c                           | 14 ++++++
 debugger/stack.c                           | 14 ++++++
 debugger/types.c                           | 16 +++++-
 debugger/winedbg.c                         | 16 +++++-
 dlls/advapi32/advapi.c                     | 18 ++++++-
 dlls/advapi32/crypt.c                      | 21 ++++++--
 dlls/advapi32/crypt.h                      | 14 ++++++
 dlls/advapi32/eventlog.c                   | 18 ++++++-
 dlls/advapi32/registry.c                   | 18 ++++++-
 dlls/advapi32/security.c                   | 22 +++++++--
 dlls/advapi32/service.c                    | 18 ++++++-
 dlls/avifil32/api.c                        | 18 ++++++-
 dlls/avifil32/avifile_private.h            | 18 +++++++
 dlls/avifil32/comentry.c                   | 18 ++++++-
 dlls/avifil32/iafile.c                     | 18 ++++++-
 dlls/avifil32/iastream.c                   | 18 ++++++-
 dlls/avifil32/igframe.c                    | 18 ++++++-
 dlls/avifil32/main.c                       | 18 ++++++-
 dlls/avifil32/string.c                     | 18 ++++++-
 dlls/comctl32/animate.c                    | 18 ++++++-
 dlls/comctl32/comboex.c                    | 42 ++++++++++------
 dlls/comctl32/comctl32.h                   | 13 +++++
 dlls/comctl32/comctl32undoc.c              | 18 ++++++-
 dlls/comctl32/comctl_De.rc                 | 18 +++++++
 dlls/comctl32/comctl_En.rc                 | 18 +++++++
 dlls/comctl32/commctrl.c                   | 17 ++++++-
 dlls/comctl32/datetime.c                   | 17 ++++++-
 dlls/comctl32/draglist.c                   | 18 ++++++-
 dlls/comctl32/flatsb.c                     | 18 ++++++-
 dlls/comctl32/header.c                     | 18 ++++++-
 dlls/comctl32/hotkey.c                     | 18 ++++++-
 dlls/comctl32/imagelist.c                  | 18 ++++++-
 dlls/comctl32/imagelist.h                  | 14 ++++++
 dlls/comctl32/ipaddress.c                  | 18 ++++++-
 dlls/comctl32/listview.c                   | 18 ++++++-
 dlls/comctl32/monthcal.c                   | 18 ++++++-
 dlls/comctl32/nativefont.c                 | 18 ++++++-
 dlls/comctl32/pager.c                      | 18 ++++++-
 dlls/comctl32/progress.c                   | 17 ++++++-
 dlls/comctl32/propsheet.c                  | 18 ++++++-
 dlls/comctl32/rebar.c                      | 18 ++++++-
 dlls/comctl32/rsrc.rc                      | 16 ++++++
 dlls/comctl32/smoothscroll.c               | 18 ++++++-
 dlls/comctl32/status.c                     | 18 ++++++-
 dlls/comctl32/tab.c                        | 18 ++++++-
 dlls/comctl32/toolbar.c                    | 18 ++++++-
 dlls/comctl32/tooltips.c                   | 18 ++++++-
 dlls/comctl32/trackbar.c                   | 17 ++++++-
 dlls/comctl32/treeview.c                   | 18 ++++++-
 dlls/comctl32/updown.c                     | 18 ++++++-
 dlls/commdlg/cdlg.h                        | 14 ++++++
 dlls/commdlg/cdlg32.c                      | 18 ++++++-
 dlls/commdlg/cdlg_Ca.rc                    | 18 +++++++
 dlls/commdlg/cdlg_Cs.rc                    | 18 +++++++
 dlls/commdlg/cdlg_Da.rc                    | 18 +++++++
 dlls/commdlg/cdlg_De.rc                    | 18 +++++++
 dlls/commdlg/cdlg_En.rc                    | 18 +++++++
 dlls/commdlg/cdlg_Eo.rc                    | 18 +++++++
 dlls/commdlg/cdlg_Es.rc                    | 18 +++++++
 dlls/commdlg/cdlg_Fi.rc                    | 18 +++++++
 dlls/commdlg/cdlg_Fr.rc                    | 18 +++++++
 dlls/commdlg/cdlg_Hu.rc                    | 18 +++++++
 dlls/commdlg/cdlg_It.rc                    | 18 +++++++
 dlls/commdlg/cdlg_Ja.rc                    | 18 +++++++
 dlls/commdlg/cdlg_Ko.rc                    | 18 +++++++
 dlls/commdlg/cdlg_Nl.rc                    | 18 +++++++
 dlls/commdlg/cdlg_No.rc                    | 18 +++++++
 dlls/commdlg/cdlg_Pl.rc                    | 18 +++++++
 dlls/commdlg/cdlg_Pt.rc                    | 18 +++++++
 dlls/commdlg/cdlg_Ru.rc                    | 18 +++++++
 dlls/commdlg/cdlg_Sk.rc                    | 18 +++++++
 dlls/commdlg/cdlg_Sv.rc                    | 18 +++++++
 dlls/commdlg/cdlg_Wa.rc                    | 18 +++++++
 dlls/commdlg/cdlg_Zh.rc                    | 18 +++++++
 dlls/commdlg/cdlg_xx.rc                    | 17 +++++++
 dlls/commdlg/colordlg.c                    | 18 ++++++-
 dlls/commdlg/filedlg.c                     | 18 ++++++-
 dlls/commdlg/filedlg95.c                   | 21 +++++++-
 dlls/commdlg/filedlgbrowser.c              | 19 +++++++-
 dlls/commdlg/filedlgbrowser.h              | 17 ++++++-
 dlls/commdlg/filetitle.c                   | 18 ++++++-
 dlls/commdlg/finddlg.c                     | 18 ++++++-
 dlls/commdlg/finddlg32.c                   | 18 ++++++-
 dlls/commdlg/fontdlg.c                     | 18 ++++++-
 dlls/commdlg/generic.c                     | 18 ++++++-
 dlls/commdlg/printdlg.c                    | 18 ++++++-
 dlls/commdlg/rsrc.rc                       | 15 ++++++
 dlls/crtdll/crtdll_main.c                  | 18 ++++++-
 dlls/dciman32/dciman_main.c                | 16 +++++-
 dlls/ddraw/convert.c                       | 22 ++++++++-
 dlls/ddraw/d3d_private.h                   | 23 +++++++--
 dlls/ddraw/d3dcommon.c                     | 27 +++++++---
 dlls/ddraw/d3ddevice/main.c                | 24 +++++++--
 dlls/ddraw/d3ddevice/mesa.c                | 27 +++++++---
 dlls/ddraw/d3dexecutebuffer.c              | 26 +++++++---
 dlls/ddraw/d3dlight.c                      | 26 +++++++---
 dlls/ddraw/d3dmaterial.c                   | 25 ++++++++--
 dlls/ddraw/d3dtexture.c                    | 26 +++++++---
 dlls/ddraw/d3dviewport.c                   | 25 ++++++++--
 dlls/ddraw/dclipper/main.c                 | 18 ++++++-
 dlls/ddraw/dclipper/main.h                 | 18 ++++++-
 dlls/ddraw/ddcomimpl.h                     | 14 ++++++
 dlls/ddraw/ddraw/hal.c                     | 18 ++++++-
 dlls/ddraw/ddraw/hal.h                     | 19 +++++++-
 dlls/ddraw/ddraw/main.c                    | 18 ++++++-
 dlls/ddraw/ddraw/main.h                    | 18 ++++++-
 dlls/ddraw/ddraw/thunks.c                  | 14 ++++++
 dlls/ddraw/ddraw/user.c                    | 18 ++++++-
 dlls/ddraw/ddraw/user.h                    | 18 ++++++-
 dlls/ddraw/ddraw_private.h                 | 18 ++++++-
 dlls/ddraw/direct3d/main.c                 | 22 ++++++++-
 dlls/ddraw/direct3d/mesa.c                 | 23 ++++++++-
 dlls/ddraw/dpalette/hal.c                  | 18 ++++++-
 dlls/ddraw/dpalette/hal.h                  | 18 ++++++-
 dlls/ddraw/dpalette/main.c                 | 18 ++++++-
 dlls/ddraw/dpalette/main.h                 | 18 ++++++-
 dlls/ddraw/dsurface/dib.c                  | 18 ++++++-
 dlls/ddraw/dsurface/dib.h                  | 18 ++++++-
 dlls/ddraw/dsurface/fakezbuffer.c          | 18 ++++++-
 dlls/ddraw/dsurface/fakezbuffer.h          | 18 ++++++-
 dlls/ddraw/dsurface/gamma.c                | 18 ++++++-
 dlls/ddraw/dsurface/hal.c                  | 18 ++++++-
 dlls/ddraw/dsurface/hal.h                  | 18 ++++++-
 dlls/ddraw/dsurface/main.c                 | 18 ++++++-
 dlls/ddraw/dsurface/main.h                 | 18 ++++++-
 dlls/ddraw/dsurface/thunks.c               | 14 ++++++
 dlls/ddraw/dsurface/thunks.h               | 18 ++++++-
 dlls/ddraw/dsurface/user.c                 | 18 ++++++-
 dlls/ddraw/dsurface/user.h                 | 18 ++++++-
 dlls/ddraw/dsurface/wndproc.c              | 18 ++++++-
 dlls/ddraw/dsurface/wndproc.h              | 18 ++++++-
 dlls/ddraw/helper.c                        | 18 ++++++-
 dlls/ddraw/main.c                          | 18 ++++++-
 dlls/ddraw/mesa.c                          | 25 ++++++++--
 dlls/ddraw/mesa_private.h                  | 23 +++++++--
 dlls/ddraw/struct_convert.c                | 14 ++++++
 dlls/ddraw/version.rc                      | 18 +++++++
 dlls/dinput/device.c                       | 18 ++++++-
 dlls/dinput/device_private.h               | 18 +++++++
 dlls/dinput/dinput_main.c                  | 18 ++++++-
 dlls/dinput/dinput_private.h               | 18 +++++++
 dlls/dinput/joystick/linux.c               | 17 ++++++-
 dlls/dinput/joystick/linuxinput.c          | 17 ++++++-
 dlls/dinput/keyboard/main.c                | 17 ++++++-
 dlls/dinput/mouse/main.c                   | 17 ++++++-
 dlls/dplayx/dpclassfactory.c               | 22 ++++++++-
 dlls/dplayx/dpinit.h                       | 17 +++++++
 dlls/dplayx/dplay.c                        | 17 ++++++-
 dlls/dplayx/dplay_global.h                 | 18 +++++++
 dlls/dplayx/dplaysp.c                      | 18 ++++++-
 dlls/dplayx/dplaysp.h                      | 18 +++++++
 dlls/dplayx/dplayx_global.c                | 17 ++++++-
 dlls/dplayx/dplayx_global.h                | 17 +++++++
 dlls/dplayx/dplayx_main.c                  | 18 ++++++-
 dlls/dplayx/dplayx_messages.c              | 17 ++++++-
 dlls/dplayx/dplayx_messages.h              | 17 +++++++
 dlls/dplayx/dplayx_queue.h                 | 17 ++++++-
 dlls/dplayx/dplobby.c                      | 17 ++++++-
 dlls/dplayx/lobbysp.c                      | 18 ++++++-
 dlls/dplayx/lobbysp.h                      | 18 +++++++
 dlls/dplayx/name_server.c                  | 17 ++++++-
 dlls/dplayx/name_server.h                  | 17 +++++++
 dlls/dplayx/version.rc                     | 18 +++++++
 dlls/dsound/dsound_main.c                  | 18 ++++++-
 dlls/gdi/bidi16.c                          | 22 +++++++--
 dlls/gdi/driver.c                          | 18 ++++++-
 dlls/gdi/freetype.c                        | 18 ++++++-
 dlls/gdi/gdi_main.c                        | 16 ++++++
 dlls/gdi/printdrv.c                        | 18 ++++++-
 dlls/gdi/version.rc                        | 18 +++++++
 dlls/gdi/version16.rc                      | 18 +++++++
 dlls/gdi/wing.c                            | 20 ++++++--
 dlls/glu32/glu.c                           | 18 +++++++
 dlls/icmp/icmp_main.c                      | 24 ++++++---
 dlls/icmp/ip.h                             |  6 +--
 dlls/icmp/ip_icmp.h                        |  6 +--
 dlls/imagehlp/access.c                     | 18 ++++++-
 dlls/imagehlp/debug.c                      | 18 ++++++-
 dlls/imagehlp/imagehlp_main.c              | 18 ++++++-
 dlls/imagehlp/integrity.c                  | 18 ++++++-
 dlls/imagehlp/internal.c                   | 16 +++++-
 dlls/imagehlp/modify.c                     | 18 ++++++-
 dlls/imagehlp/symbol.c                     | 18 ++++++-
 dlls/imm32/imc.c                           | 18 ++++++-
 dlls/imm32/imekl.c                         | 18 ++++++-
 dlls/imm32/imewnd.c                        | 18 ++++++-
 dlls/imm32/imm.c                           | 18 ++++++-
 dlls/imm32/imm_private.h                   | 14 ++++++
 dlls/imm32/immddk.h                        | 20 +++++++-
 dlls/imm32/main.c                          | 18 ++++++-
 dlls/imm32/memory.c                        | 18 ++++++-
 dlls/imm32/string.c                        | 18 ++++++-
 dlls/kernel/comm.c                         | 20 +++++++-
 dlls/kernel/console.c                      | 18 ++++++-
 dlls/kernel/debugger.c                     | 18 ++++++-
 dlls/kernel/flatthunk.h                    | 14 ++++++
 dlls/kernel/format_msg.c                   | 18 ++++++-
 dlls/kernel/kernel.rc                      | 18 +++++++
 dlls/kernel/kernel_main.c                  | 16 ++++++
 dlls/kernel/locale_rc.rc                   | 19 ++++++++
 dlls/kernel/messages/winerr_enu.mc         | 18 +++++++
 dlls/kernel/nls/afk.nls                    | 16 ++++++
 dlls/kernel/nls/ara.nls                    | 16 ++++++
 dlls/kernel/nls/arb.nls                    | 16 ++++++
 dlls/kernel/nls/are.nls                    | 16 ++++++
 dlls/kernel/nls/arg.nls                    | 16 ++++++
 dlls/kernel/nls/ari.nls                    | 16 ++++++
 dlls/kernel/nls/ark.nls                    | 16 ++++++
 dlls/kernel/nls/arm.nls                    | 16 ++++++
 dlls/kernel/nls/aro.nls                    | 16 ++++++
 dlls/kernel/nls/arq.nls                    | 16 ++++++
 dlls/kernel/nls/ars.nls                    | 16 ++++++
 dlls/kernel/nls/art.nls                    | 16 ++++++
 dlls/kernel/nls/aru.nls                    | 16 ++++++
 dlls/kernel/nls/bel.nls                    | 16 ++++++
 dlls/kernel/nls/bgr.nls                    | 16 ++++++
 dlls/kernel/nls/brf.nls                    | 16 ++++++
 dlls/kernel/nls/cat.nls                    | 16 ++++++
 dlls/kernel/nls/cht.nls                    | 16 ++++++
 dlls/kernel/nls/cor.nls                    | 16 ++++++
 dlls/kernel/nls/cym.nls                    | 16 ++++++
 dlls/kernel/nls/cze.nls                    | 16 ++++++
 dlls/kernel/nls/dan.nls                    | 16 ++++++
 dlls/kernel/nls/dea.nls                    | 16 ++++++
 dlls/kernel/nls/dec.nls                    | 16 ++++++
 dlls/kernel/nls/del.nls                    | 16 ++++++
 dlls/kernel/nls/des.nls                    | 16 ++++++
 dlls/kernel/nls/deu.nls                    | 16 ++++++
 dlls/kernel/nls/ena.nls                    | 16 ++++++
 dlls/kernel/nls/enb.nls                    | 16 ++++++
 dlls/kernel/nls/enc.nls                    | 16 ++++++
 dlls/kernel/nls/eng.nls                    | 16 ++++++
 dlls/kernel/nls/eni.nls                    | 16 ++++++
 dlls/kernel/nls/enj.nls                    | 16 ++++++
 dlls/kernel/nls/enl.nls                    | 16 ++++++
 dlls/kernel/nls/ens.nls                    | 16 ++++++
 dlls/kernel/nls/ent.nls                    | 16 ++++++
 dlls/kernel/nls/enu.nls                    | 16 ++++++
 dlls/kernel/nls/enz.nls                    | 16 ++++++
 dlls/kernel/nls/esa.nls                    | 16 ++++++
 dlls/kernel/nls/esb.nls                    | 16 ++++++
 dlls/kernel/nls/esc.nls                    | 16 ++++++
 dlls/kernel/nls/esd.nls                    | 16 ++++++
 dlls/kernel/nls/ese.nls                    | 16 ++++++
 dlls/kernel/nls/esf.nls                    | 16 ++++++
 dlls/kernel/nls/esg.nls                    | 16 ++++++
 dlls/kernel/nls/esh.nls                    | 16 ++++++
 dlls/kernel/nls/esi.nls                    | 16 ++++++
 dlls/kernel/nls/esl.nls                    | 16 ++++++
 dlls/kernel/nls/esm.nls                    | 16 ++++++
 dlls/kernel/nls/esn.nls                    | 16 ++++++
 dlls/kernel/nls/eso.nls                    | 16 ++++++
 dlls/kernel/nls/esp.nls                    | 16 ++++++
 dlls/kernel/nls/esperanto.nls              | 16 ++++++
 dlls/kernel/nls/esr.nls                    | 16 ++++++
 dlls/kernel/nls/ess.nls                    | 16 ++++++
 dlls/kernel/nls/est.nls                    | 16 ++++++
 dlls/kernel/nls/esu.nls                    | 16 ++++++
 dlls/kernel/nls/esv.nls                    | 16 ++++++
 dlls/kernel/nls/esy.nls                    | 16 ++++++
 dlls/kernel/nls/esz.nls                    | 16 ++++++
 dlls/kernel/nls/euq.nls                    | 16 ++++++
 dlls/kernel/nls/fin.nls                    | 16 ++++++
 dlls/kernel/nls/fos.nls                    | 16 ++++++
 dlls/kernel/nls/fra.nls                    | 16 ++++++
 dlls/kernel/nls/frb.nls                    | 16 ++++++
 dlls/kernel/nls/frc.nls                    | 16 ++++++
 dlls/kernel/nls/frl.nls                    | 16 ++++++
 dlls/kernel/nls/frs.nls                    | 16 ++++++
 dlls/kernel/nls/gae.nls                    | 16 ++++++
 dlls/kernel/nls/gdh.nls                    | 16 ++++++
 dlls/kernel/nls/gdv.nls                    | 16 ++++++
 dlls/kernel/nls/grc.nls                    | 16 ++++++
 dlls/kernel/nls/heb.nls                    | 16 ++++++
 dlls/kernel/nls/hrv.nls                    | 16 ++++++
 dlls/kernel/nls/hun.nls                    | 16 ++++++
 dlls/kernel/nls/ind.nls                    | 16 ++++++
 dlls/kernel/nls/isl.nls                    | 16 ++++++
 dlls/kernel/nls/ita.nls                    | 16 ++++++
 dlls/kernel/nls/its.nls                    | 16 ++++++
 dlls/kernel/nls/jpn.nls                    | 16 ++++++
 dlls/kernel/nls/koj.nls                    | 16 ++++++
 dlls/kernel/nls/kor.nls                    | 16 ++++++
 dlls/kernel/nls/lth.nls                    | 16 ++++++
 dlls/kernel/nls/lvi.nls                    | 16 ++++++
 dlls/kernel/nls/msl.nls                    | 16 ++++++
 dlls/kernel/nls/nlb.nls                    | 16 ++++++
 dlls/kernel/nls/nld.nls                    | 16 ++++++
 dlls/kernel/nls/nls.nls                    | 16 ++++++
 dlls/kernel/nls/non.nls                    | 16 ++++++
 dlls/kernel/nls/nor.nls                    | 16 ++++++
 dlls/kernel/nls/plk.nls                    | 16 ++++++
 dlls/kernel/nls/ptb.nls                    | 16 ++++++
 dlls/kernel/nls/ptg.nls                    | 16 ++++++
 dlls/kernel/nls/rom.nls                    | 16 ++++++
 dlls/kernel/nls/rus.nls                    | 16 ++++++
 dlls/kernel/nls/sky.nls                    | 16 ++++++
 dlls/kernel/nls/slv.nls                    | 16 ++++++
 dlls/kernel/nls/sqi.nls                    | 16 ++++++
 dlls/kernel/nls/srb.nls                    | 16 ++++++
 dlls/kernel/nls/srl.nls                    | 16 ++++++
 dlls/kernel/nls/sve.nls                    | 16 ++++++
 dlls/kernel/nls/svf.nls                    | 16 ++++++
 dlls/kernel/nls/tha.nls                    | 16 ++++++
 dlls/kernel/nls/trk.nls                    | 16 ++++++
 dlls/kernel/nls/ukr.nls                    | 16 ++++++
 dlls/kernel/nls/vie.nls                    | 16 ++++++
 dlls/kernel/nls/wal.nls                    | 16 ++++++
 dlls/kernel/nls/zhh.nls                    | 16 ++++++
 dlls/kernel/nls/zhi.nls                    | 16 ++++++
 dlls/kernel/nls/zhs.nls                    | 16 ++++++
 dlls/kernel/stress.c                       | 22 ++++++++-
 dlls/kernel/string.c                       | 16 ++++++
 dlls/kernel/sync.c                         | 18 ++++++-
 dlls/kernel/tests/atom.pl                  | 17 +++++++
 dlls/kernel/thunk.c                        | 17 ++++++-
 dlls/kernel/time.c                         | 18 ++++++-
 dlls/kernel/toolhelp.c                     | 18 ++++++-
 dlls/kernel/utthunk.c                      | 18 ++++++-
 dlls/kernel/version.rc                     | 18 +++++++
 dlls/kernel/version16.rc                   | 18 +++++++
 dlls/kernel/win87em.c                      | 22 ++++++++-
 dlls/kernel/windebug.c                     | 18 ++++++-
 dlls/kernel/wowthunk.c                     | 18 ++++++-
 dlls/lzexpand/lzexpand_main.c              | 18 ++++++-
 dlls/make_dlls                             | 14 ++++++
 dlls/mapi32/mapi32_main.c                  | 20 ++++++--
 dlls/mpr/auth.c                            | 20 +++++++-
 dlls/mpr/mpr_main.c                        | 20 +++++++-
 dlls/mpr/multinet.c                        | 20 +++++++-
 dlls/mpr/nps.c                             | 20 +++++++-
 dlls/mpr/pwcache.c                         | 20 +++++++-
 dlls/mpr/wnet.c                            | 20 +++++++-
 dlls/msacm/driver.c                        | 18 ++++++-
 dlls/msacm/filter.c                        | 18 ++++++-
 dlls/msacm/format.c                        | 18 ++++++-
 dlls/msacm/internal.c                      | 18 ++++++-
 dlls/msacm/msacm.rc                        | 15 ++++++
 dlls/msacm/msacm32_main.c                  | 18 ++++++-
 dlls/msacm/msacm_main.c                    | 18 ++++++-
 dlls/msacm/msacmdrv.h                      | 18 ++++++-
 dlls/msacm/pcmconverter.c                  | 18 ++++++-
 dlls/msacm/stream.c                        | 18 ++++++-
 dlls/msacm/wineacm.h                       | 18 +++++++
 dlls/msimg32/msimg32_main.c                | 22 ++++++++-
 dlls/msrle32/msrle32.c                     | 18 ++++++-
 dlls/msvcrt/console.c                      | 14 ++++++
 dlls/msvcrt/cpp.c                          | 14 ++++++
 dlls/msvcrt/ctype.c                        | 14 ++++++
 dlls/msvcrt/data.c                         | 14 ++++++
 dlls/msvcrt/dir.c                          | 14 ++++++
 dlls/msvcrt/environ.c                      | 14 ++++++
 dlls/msvcrt/errno.c                        | 14 ++++++
 dlls/msvcrt/except.c                       | 16 ++++++
 dlls/msvcrt/exit.c                         | 14 ++++++
 dlls/msvcrt/file.c                         | 14 ++++++
 dlls/msvcrt/heap.c                         | 14 ++++++
 dlls/msvcrt/locale.c                       | 14 ++++++
 dlls/msvcrt/lock.c                         | 18 ++++++-
 dlls/msvcrt/main.c                         | 14 ++++++
 dlls/msvcrt/math.c                         | 14 ++++++
 dlls/msvcrt/mbcs.c                         | 14 ++++++
 dlls/msvcrt/misc.c                         | 14 ++++++
 dlls/msvcrt/ms_errno.h                     | 18 +++++++
 dlls/msvcrt/msvcrt.h                       | 18 +++++++
 dlls/msvcrt/mtdll.h                        | 18 +++++++
 dlls/msvcrt/process.c                      | 14 ++++++
 dlls/msvcrt/string.c                       | 14 ++++++
 dlls/msvcrt/thread.c                       | 14 ++++++
 dlls/msvcrt/time.c                         | 14 ++++++
 dlls/msvcrt/wcs.c                          | 14 ++++++
 dlls/msvideo/drawdib.c                     | 18 ++++++-
 dlls/msvideo/mciwnd.c                      | 18 ++++++-
 dlls/msvideo/msvideo_main.c                | 18 ++++++-
 dlls/msvideo/vfw16.h                       | 18 +++++++
 dlls/netapi32/netapi32.c                   | 18 ++++++-
 dlls/ntdll/cdrom.c                         | 18 ++++++-
 dlls/ntdll/critsection.c                   | 20 ++++++--
 dlls/ntdll/debugtools.c                    | 20 +++++++-
 dlls/ntdll/error.c                         | 18 ++++++-
 dlls/ntdll/exception.c                     | 18 ++++++-
 dlls/ntdll/file.c                          | 22 ++++++++-
 dlls/ntdll/heap.c                          | 18 ++++++-
 dlls/ntdll/large_int.c                     | 14 ++++++
 dlls/ntdll/loader.c                        | 18 +++++++
 dlls/ntdll/misc.c                          | 20 +++++++-
 dlls/ntdll/nt.c                            | 18 ++++++-
 dlls/ntdll/ntdll_misc.h                    | 18 +++++++
 dlls/ntdll/om.c                            | 20 +++++++-
 dlls/ntdll/reg.c                           | 18 ++++++-
 dlls/ntdll/rtl.c                           | 18 ++++++-
 dlls/ntdll/rtlstr.c                        | 18 ++++++-
 dlls/ntdll/sec.c                           | 18 ++++++-
 dlls/ntdll/signal_i386.c                   | 18 ++++++-
 dlls/ntdll/signal_sparc.c                  | 18 ++++++-
 dlls/ntdll/string.c                        | 14 ++++++
 dlls/ntdll/sync.c                          | 20 +++++++-
 dlls/ntdll/time.c                          | 20 ++++++--
 dlls/ntdll/wcstring.c                      | 18 ++++++-
 dlls/odbc32/proxyodbc.c                    | 19 ++++++--
 dlls/odbc32/proxyodbc.h                    | 18 +++++++
 dlls/ole32/antimoniker.c                   | 18 ++++++-
 dlls/ole32/bindctx.c                       | 18 ++++++-
 dlls/ole32/clipboard.c                     | 18 ++++++-
 dlls/ole32/compobj.c                       | 18 ++++++-
 dlls/ole32/compobj_private.h               | 22 +++++++++
 dlls/ole32/compositemoniker.c              | 18 ++++++-
 dlls/ole32/datacache.c                     | 18 ++++++-
 dlls/ole32/defaulthandler.c                | 18 ++++++-
 dlls/ole32/errorinfo.c                     | 19 +++++++-
 dlls/ole32/filemoniker.c                   | 18 ++++++-
 dlls/ole32/hglobalstream.c                 | 18 ++++++-
 dlls/ole32/ifs.c                           | 18 ++++++-
 dlls/ole32/ifs.h                           | 18 +++++++
 dlls/ole32/itemmoniker.c                   | 18 ++++++-
 dlls/ole32/marshal.c                       | 18 ++++++-
 dlls/ole32/memlockbytes.c                  | 17 ++++++-
 dlls/ole32/moniker.c                       | 18 ++++++-
 dlls/ole32/ole2.c                          | 20 ++++++--
 dlls/ole32/ole2impl.c                      | 18 ++++++-
 dlls/ole32/ole2nls.c                       | 18 ++++++-
 dlls/ole32/ole2stubs.c                     | 18 ++++++-
 dlls/ole32/ole32_main.c                    | 20 +++++++-
 dlls/ole32/ole32_main.h                    | 18 +++++++
 dlls/ole32/ole32res.rc                     | 15 ++++++
 dlls/ole32/oleobj.c                        | 18 ++++++-
 dlls/ole32/oleproxy.c                      | 18 ++++++-
 dlls/ole32/olestd.h                        | 22 +++++++--
 dlls/ole32/rpc.c                           | 18 ++++++-
 dlls/ole32/stg_bigblockfile.c              | 17 ++++++-
 dlls/ole32/stg_stream.c                    | 18 ++++++-
 dlls/ole32/storage.c                       | 20 ++++++--
 dlls/ole32/storage32.c                     | 18 ++++++-
 dlls/ole32/storage32.h                     | 14 ++++++
 dlls/oleaut32/connpt.c                     | 19 +++++++-
 dlls/oleaut32/connpt.h                     | 18 +++++++
 dlls/oleaut32/dispatch.c                   | 20 ++++++--
 dlls/oleaut32/hash.c                       | 18 ++++++-
 dlls/oleaut32/ole2disp.c                   | 18 ++++++-
 dlls/oleaut32/ole2disp.h                   | 18 +++++++
 dlls/oleaut32/oleaut.c                     | 20 +++++++-
 dlls/oleaut32/olefont.c                    | 18 ++++++-
 dlls/oleaut32/olepicture.c                 | 17 ++++++-
 dlls/oleaut32/parsedt.h                    |  2 -
 dlls/oleaut32/propertyframe.c              | 18 ++++++-
 dlls/oleaut32/safearray.c                  | 18 ++++++-
 dlls/oleaut32/stubs.c                      | 18 ++++++-
 dlls/oleaut32/tmarshal.c                   | 20 ++++++--
 dlls/oleaut32/tmarshal.h                   | 18 +++++++
 dlls/oleaut32/typelib.c                    | 20 ++++++--
 dlls/oleaut32/typelib.h                    | 15 +++++-
 dlls/oleaut32/variant.c                    | 18 ++++++-
 dlls/oleaut32/version.rc                   | 18 +++++++
 dlls/olecli/olecli_main.c                  | 18 ++++++-
 dlls/oledlg/oledlg_main.c                  | 18 ++++++-
 dlls/olepro32/olepro32stubs.c              | 18 ++++++-
 dlls/olesvr/olesvr_main.c                  | 18 ++++++-
 dlls/opengl32/make_opengl                  | 16 ++++++
 dlls/opengl32/opengl_ext.c                 |  4 +-
 dlls/opengl32/opengl_ext.h                 | 14 ++++++
 dlls/opengl32/opengl_norm.c                |  4 +-
 dlls/opengl32/wgl.c                        | 24 +++++++--
 dlls/opengl32/wgl.h                        | 20 ++++++--
 dlls/psapi/psapi_main.c                    | 18 ++++++-
 dlls/quartz/amundoc.c                      | 22 ++++++++-
 dlls/quartz/asyncsrc.c                     | 20 ++++++--
 dlls/quartz/asyncsrc.h                     | 16 +++++-
 dlls/quartz/audioutl.c                     | 20 ++++++--
 dlls/quartz/audioutl.h                     | 18 +++++++
 dlls/quartz/audren.c                       | 20 ++++++--
 dlls/quartz/audren.h                       | 16 +++++-
 dlls/quartz/avidec.c                       | 20 ++++++--
 dlls/quartz/aviparse.c                     | 20 ++++++--
 dlls/quartz/basefilt.c                     | 20 ++++++--
 dlls/quartz/basefilt.h                     | 18 +++++++
 dlls/quartz/basepin.c                      | 20 ++++++--
 dlls/quartz/complist.c                     | 20 ++++++--
 dlls/quartz/complist.h                     | 16 +++++-
 dlls/quartz/csconv.c                       | 20 ++++++--
 dlls/quartz/devenum.c                      | 20 ++++++--
 dlls/quartz/devenum.h                      | 18 +++++++
 dlls/quartz/enumunk.c                      | 20 ++++++--
 dlls/quartz/enumunk.h                      | 16 +++++-
 dlls/quartz/fgevent.c                      | 20 ++++++--
 dlls/quartz/fgpass.c                       | 20 ++++++--
 dlls/quartz/fgraph.c                       | 20 ++++++--
 dlls/quartz/fgraph.h                       | 18 +++++++
 dlls/quartz/fmap.c                         | 20 ++++++--
 dlls/quartz/fmap.h                         | 18 +++++++
 dlls/quartz/ifgraph.c                      | 20 ++++++--
 dlls/quartz/imcntl.c                       | 20 ++++++--
 dlls/quartz/imfilter.c                     | 20 ++++++--
 dlls/quartz/impos.c                        | 20 ++++++--
 dlls/quartz/imseek.c                       | 20 ++++++--
 dlls/quartz/iunk.c                         | 20 ++++++--
 dlls/quartz/iunk.h                         | 16 +++++-
 dlls/quartz/main.c                         | 20 ++++++--
 dlls/quartz/memalloc.c                     | 20 ++++++--
 dlls/quartz/memalloc.h                     | 18 +++++++
 dlls/quartz/mtype.c                        | 20 ++++++--
 dlls/quartz/mtype.h                        | 16 +++++-
 dlls/quartz/parser.c                       | 20 ++++++--
 dlls/quartz/parser.h                       | 16 +++++-
 dlls/quartz/quartz_private.h               | 18 +++++++
 dlls/quartz/regsvr.c                       | 20 ++++++--
 dlls/quartz/regsvr.h                       | 16 +++++-
 dlls/quartz/sample.c                       | 20 ++++++--
 dlls/quartz/sample.h                       | 18 +++++++
 dlls/quartz/seekpass.c                     | 20 ++++++--
 dlls/quartz/seekpass.h                     | 18 +++++++
 dlls/quartz/sysclock.c                     | 20 ++++++--
 dlls/quartz/sysclock.h                     | 18 +++++++
 dlls/quartz/videoblt.c                     | 22 ++++++++-
 dlls/quartz/videoblt.h                     | 18 +++++++
 dlls/quartz/vidren.c                       | 20 ++++++--
 dlls/quartz/vidren.h                       | 16 +++++-
 dlls/quartz/wavparse.c                     | 20 ++++++--
 dlls/quartz/xform.c                        | 20 ++++++--
 dlls/quartz/xform.h                        | 16 +++++-
 dlls/rasapi32/rasapi.c                     | 18 ++++++-
 dlls/richedit/charlist.c                   | 17 ++++++-
 dlls/richedit/charlist.h                   | 20 ++++++++
 dlls/richedit/reader.c                     |  4 +-
 dlls/richedit/riched32.h                   | 14 ++++++
 dlls/richedit/richedit.c                   | 19 ++++++--
 dlls/richedit/text-writer.c                | 12 ++---
 dlls/rpcrt4/rpcrt4_main.c                  | 19 +++++++-
 dlls/serialui/confdlg.c                    | 18 ++++++-
 dlls/serialui/serialui.h                   | 23 +++++++++
 dlls/serialui/serialui_rc.rc               | 18 +++++++
 dlls/setupapi/devinst.c                    | 19 +++++++-
 dlls/setupapi/infparse.c                   | 20 +++++++-
 dlls/setupapi/setupapi.rc                  | 15 ++++++
 dlls/setupapi/setupapi_private.h           | 18 +++++++
 dlls/setupapi/setupx16.h                   | 18 +++++++
 dlls/setupapi/setupx_main.c                | 18 ++++++-
 dlls/setupapi/stubs.c                      | 19 +++++++-
 dlls/setupapi/virtcopy.c                   | 20 +++++++-
 dlls/shdocvw/classinfo.c                   | 20 ++++++--
 dlls/shdocvw/events.c                      | 20 ++++++--
 dlls/shdocvw/factory.c                     | 20 ++++++--
 dlls/shdocvw/misc.c                        | 20 ++++++--
 dlls/shdocvw/oleobject.c                   | 20 ++++++--
 dlls/shdocvw/persist.c                     | 20 ++++++--
 dlls/shdocvw/shdocvw.h                     | 16 +++++-
 dlls/shdocvw/shdocvw_main.c                | 20 ++++++--
 dlls/shdocvw/webbrowser.c                  | 20 ++++++--
 dlls/shell32/brsfolder.c                   | 22 ++++++++-
 dlls/shell32/changenotify.c                | 19 ++++++--
 dlls/shell32/classes.c                     | 19 +++++++-
 dlls/shell32/clipboard.c                   | 20 +++++++-
 dlls/shell32/control.c                     | 24 +++++++--
 dlls/shell32/dataobject.c                  | 18 ++++++-
 dlls/shell32/dialogs.c                     | 21 +++++++-
 dlls/shell32/enumidlist.c                  | 18 ++++++-
 dlls/shell32/folders.c                     | 17 ++++++-
 dlls/shell32/iconcache.c                   | 20 +++++++-
 dlls/shell32/memorystream.c                | 20 +++++++-
 dlls/shell32/pidl.c                        | 20 ++++++--
 dlls/shell32/pidl.h                        | 19 +++++++-
 dlls/shell32/shell.c                       | 24 +++++++--
 dlls/shell32/shell32_Ca.rc                 | 18 +++++++
 dlls/shell32/shell32_Cs.rc                 | 18 +++++++
 dlls/shell32/shell32_Da.rc                 | 18 +++++++
 dlls/shell32/shell32_De.rc                 | 18 +++++++
 dlls/shell32/shell32_En.rc                 | 18 +++++++
 dlls/shell32/shell32_Eo.rc                 | 18 +++++++
 dlls/shell32/shell32_Es.rc                 | 18 +++++++
 dlls/shell32/shell32_Fi.rc                 | 18 +++++++
 dlls/shell32/shell32_Fr.rc                 | 18 +++++++
 dlls/shell32/shell32_Hu.rc                 | 18 +++++++
 dlls/shell32/shell32_It.rc                 | 18 +++++++
 dlls/shell32/shell32_Ja.rc                 | 18 +++++++
 dlls/shell32/shell32_Ko.rc                 | 18 +++++++
 dlls/shell32/shell32_Nl.rc                 | 18 +++++++
 dlls/shell32/shell32_No.rc                 | 18 +++++++
 dlls/shell32/shell32_Pl.rc                 | 18 +++++++
 dlls/shell32/shell32_Pt.rc                 | 18 +++++++
 dlls/shell32/shell32_Ru.rc                 | 18 +++++++
 dlls/shell32/shell32_Sk.rc                 | 18 +++++++
 dlls/shell32/shell32_Sv.rc                 | 18 +++++++
 dlls/shell32/shell32_Wa.rc                 | 18 +++++++
 dlls/shell32/shell32_Zh.rc                 | 18 +++++++
 dlls/shell32/shell32_main.c                | 22 +++++++--
 dlls/shell32/shell32_main.h                | 17 +++++++
 dlls/shell32/shell32_xx.rc                 | 16 ++++++
 dlls/shell32/shellfolder.h                 | 15 ++++++
 dlls/shell32/shelllink.c                   | 17 ++++++-
 dlls/shell32/shellole.c                    | 17 ++++++-
 dlls/shell32/shellord.c                    | 20 ++++++--
 dlls/shell32/shellpath.c                   | 24 +++++++--
 dlls/shell32/shellreg.c                    | 24 +++++++--
 dlls/shell32/shellstring.c                 | 22 ++++++++-
 dlls/shell32/shlexec.c                     | 22 +++++++--
 dlls/shell32/shlfileop.c                   | 20 +++++++-
 dlls/shell32/shlfolder.c                   | 17 ++++++-
 dlls/shell32/shlmenu.c                     | 21 +++++++-
 dlls/shell32/shlview.c                     | 18 ++++++-
 dlls/shell32/shpolicy.c                    | 22 +++++++--
 dlls/shell32/shres.rc                      | 15 ++++++
 dlls/shell32/shresdef.h                    | 18 +++++++
 dlls/shell32/shv_bg_cmenu.c                | 18 ++++++-
 dlls/shell32/shv_item_cmenu.c              | 21 ++++++--
 dlls/shell32/systray.c                     | 17 ++++++-
 dlls/shell32/undocshell.h                  | 18 +++++++
 dlls/shlwapi/ordinal.c                     | 18 ++++++-
 dlls/shlwapi/ordinal.h                     | 16 ++++++
 dlls/shlwapi/path.c                        | 20 +++++++-
 dlls/shlwapi/reg.c                         | 21 +++++++-
 dlls/shlwapi/regstream.c                   | 21 +++++++-
 dlls/shlwapi/shlwapi_main.c                | 18 ++++++-
 dlls/shlwapi/string.c                      | 24 ++++++++-
 dlls/shlwapi/url.c                         | 18 ++++++-
 dlls/tapi32/assisted.c                     | 18 ++++++-
 dlls/tapi32/line.c                         | 18 ++++++-
 dlls/tapi32/phone.c                        | 18 ++++++-
 dlls/ttydrv/bitmap.c                       | 18 ++++++-
 dlls/ttydrv/dc.c                           | 18 ++++++-
 dlls/ttydrv/graphics.c                     | 18 ++++++-
 dlls/ttydrv/objects.c                      | 18 ++++++-
 dlls/ttydrv/palette.c                      | 18 ++++++-
 dlls/ttydrv/ttydrv.h                       | 16 ++++++
 dlls/ttydrv/ttydrv_main.c                  | 20 +++++++-
 dlls/ttydrv/user.c                         | 18 ++++++-
 dlls/ttydrv/wnd.c                          | 18 ++++++-
 dlls/urlmon/umon.c                         | 17 ++++++-
 dlls/urlmon/urlmon_main.c                  | 17 ++++++-
 dlls/user/bidi16.c                         | 22 +++++++--
 dlls/user/cache.c                          | 13 +++++
 dlls/user/comm16.c                         | 20 +++++++-
 dlls/user/controls.h                       | 14 ++++++
 dlls/user/dde/client.c                     | 18 ++++++-
 dlls/user/dde/dde_private.h                | 14 ++++++
 dlls/user/dde/ddeml16.c                    | 18 ++++++-
 dlls/user/dde/misc.c                       | 18 ++++++-
 dlls/user/dde/server.c                     | 18 ++++++-
 dlls/user/display.c                        | 17 ++++++-
 dlls/user/exticon.c                        | 20 +++++++-
 dlls/user/lstr.c                           | 18 ++++++-
 dlls/user/message.c                        | 18 ++++++-
 dlls/user/misc.c                           | 18 ++++++-
 dlls/user/mouse.c                          | 13 +++++
 dlls/user/msg16.c                          | 18 ++++++-
 dlls/user/network.c                        | 20 +++++++-
 dlls/user/painting.c                       | 18 ++++++-
 dlls/user/property.c                       | 14 ++++++
 dlls/user/resource.c                       | 20 ++++++--
 dlls/user/resources/display.rc             | 15 ++++++
 dlls/user/resources/mouse.rc               | 15 ++++++
 dlls/user/resources/user32.rc              | 15 ++++++
 dlls/user/resources/user32_Ca.rc           | 18 +++++++
 dlls/user/resources/user32_Cs.rc           | 18 +++++++
 dlls/user/resources/user32_Da.rc           | 18 +++++++
 dlls/user/resources/user32_De.rc           | 18 +++++++
 dlls/user/resources/user32_En.rc           | 18 +++++++
 dlls/user/resources/user32_Eo.rc           | 18 +++++++
 dlls/user/resources/user32_Es.rc           | 18 +++++++
 dlls/user/resources/user32_Fi.rc           | 18 +++++++
 dlls/user/resources/user32_Fr.rc           | 18 +++++++
 dlls/user/resources/user32_Hu.rc           | 18 +++++++
 dlls/user/resources/user32_It.rc           | 18 +++++++
 dlls/user/resources/user32_Ja.rc           | 18 +++++++
 dlls/user/resources/user32_Ko.rc           | 18 +++++++
 dlls/user/resources/user32_Nl.rc           | 18 +++++++
 dlls/user/resources/user32_No.rc           | 18 +++++++
 dlls/user/resources/user32_Pl.rc           | 18 +++++++
 dlls/user/resources/user32_Pt.rc           | 18 +++++++
 dlls/user/resources/user32_Ru.rc           | 18 +++++++
 dlls/user/resources/user32_Sk.rc           | 18 +++++++
 dlls/user/resources/user32_Sv.rc           | 18 +++++++
 dlls/user/resources/user32_Wa.rc           | 18 +++++++
 dlls/user/resources/user32_Zh.rc           | 18 +++++++
 dlls/user/resources/user32_bitmaps.rc      | 16 ++++++
 dlls/user/resources/user32_cursors.rc      | 16 ++++++
 dlls/user/resources/user32_icons.rc        | 16 ++++++
 dlls/user/resources/version.rc             | 18 +++++++
 dlls/user/resources/version16.rc           | 18 +++++++
 dlls/user/tests/sysparams.c                | 21 ++++++--
 dlls/user/text.c                           | 18 ++++++-
 dlls/user/user_main.c                      | 20 +++++++-
 dlls/user/wnd16.c                          | 14 ++++++
 dlls/user/wsprintf.c                       | 18 ++++++-
 dlls/version/info.c                        | 18 ++++++-
 dlls/version/install.c                     | 18 ++++++-
 dlls/version/resource.c                    | 18 ++++++-
 dlls/version/ver16.c                       | 18 ++++++-
 dlls/win32s/w32skernel.c                   | 14 ++++++
 dlls/win32s/w32sys.c                       | 18 ++++++-
 dlls/win32s/win32s16.c                     | 18 ++++++-
 dlls/winaspi/aspi.c                        | 25 +++++++---
 dlls/winaspi/aspi.h                        | 19 +++++++-
 dlls/winaspi/winaspi16.c                   | 23 ++++++++-
 dlls/winaspi/winaspi32.c                   | 23 ++++++++-
 dlls/winaspi/winescsi.h                    | 18 +++++++
 dlls/winedos/devices.c                     | 16 +++++-
 dlls/winedos/dosaspi.c                     | 22 ++++++++-
 dlls/winedos/dosexe.h                      | 14 ++++++
 dlls/winedos/dosvm.c                       | 24 +++++++--
 dlls/winedos/dosvm.h                       | 14 ++++++
 dlls/winedos/int09.c                       | 20 +++++++-
 dlls/winedos/int10.c                       | 21 +++++++-
 dlls/winedos/int16.c                       | 21 +++++++-
 dlls/winedos/int17.c                       | 20 +++++++-
 dlls/winedos/int19.c                       | 20 +++++++-
 dlls/winedos/int20.c                       | 16 ++++++
 dlls/winedos/int21.c                       | 24 ++++++++-
 dlls/winedos/int29.c                       | 16 ++++++
 dlls/winedos/int31.c                       | 18 ++++++-
 dlls/winedos/int33.c                       | 20 +++++++-
 dlls/winedos/int67.c                       | 20 +++++++-
 dlls/winedos/ioports.c                     | 14 ++++++
 dlls/winedos/module.c                      | 20 ++++++--
 dlls/winedos/vga.c                         | 17 ++++++-
 dlls/winedos/vga.h                         | 13 +++++
 dlls/winedos/xms.c                         | 20 ++++++--
 dlls/wineps/afm.c                          | 19 ++++++--
 dlls/wineps/afm2c.c                        | 19 +++++++-
 dlls/wineps/bitblt.c                       | 17 ++++++-
 dlls/wineps/bitmap.c                       | 17 ++++++-
 dlls/wineps/brush.c                        | 17 ++++++-
 dlls/wineps/clipping.c                     | 17 ++++++-
 dlls/wineps/color.c                        | 17 ++++++-
 dlls/wineps/driver.c                       | 17 ++++++-
 dlls/wineps/escape.c                       | 18 ++++++-
 dlls/wineps/font.c                         | 17 ++++++-
 dlls/wineps/glyphlist.c                    | 19 +++++++-
 dlls/wineps/graphics.c                     | 17 ++++++-
 dlls/wineps/init.c                         | 17 ++++++-
 dlls/wineps/mkagl.c                        | 18 +++++++
 dlls/wineps/objects.c                      | 17 ++++++-
 dlls/wineps/pen.c                          | 17 ++++++-
 dlls/wineps/ppd.c                          | 18 ++++++-
 dlls/wineps/ps.c                           | 17 ++++++-
 dlls/wineps/psdlg.h                        | 14 ++++++
 dlls/wineps/psdrv.h                        | 21 ++++++--
 dlls/wineps/rsrc.rc                        | 15 ++++++
 dlls/wineps/text.c                         | 17 ++++++-
 dlls/wineps/truetype.c                     | 17 ++++++-
 dlls/wineps/type1afm.c                     | 17 ++++++-
 dlls/wineps/wps_De.rc                      | 18 +++++++
 dlls/wineps/wps_En.rc                      | 18 +++++++
 dlls/wineps/wps_Ru.rc                      | 18 +++++++
 dlls/wineps/wps_Sk.rc                      | 18 +++++++
 dlls/wineps/wps_xx.rc                      | 16 ++++++
 dlls/wininet/ftp.c                         | 18 ++++++-
 dlls/wininet/http.c                        | 17 ++++++-
 dlls/wininet/internet.c                    | 17 ++++++-
 dlls/wininet/internet.h                    | 22 +++++++++
 dlls/wininet/urlcache.c                    | 17 ++++++-
 dlls/wininet/utility.c                     | 17 ++++++-
 dlls/wininet/wininet_main.c                | 17 ++++++-
 dlls/winmm/driver.c                        | 18 ++++++-
 dlls/winmm/joystick.c                      | 18 ++++++-
 dlls/winmm/joystick/joystick.c             | 20 +++++++-
 dlls/winmm/lolvldrv.c                      | 18 ++++++-
 dlls/winmm/mci.c                           | 18 ++++++-
 dlls/winmm/mcianim/mcianim.c               | 18 ++++++-
 dlls/winmm/mciavi/info.c                   | 18 ++++++-
 dlls/winmm/mciavi/mciavi.c                 | 18 ++++++-
 dlls/winmm/mciavi/mciavi_res.rc            | 15 +++++-
 dlls/winmm/mciavi/mmoutput.c               | 18 ++++++-
 dlls/winmm/mciavi/private_mciavi.h         | 14 ++++++
 dlls/winmm/mciavi/wnd.c                    | 18 ++++++-
 dlls/winmm/mcicda/mcicda.c                 | 18 ++++++-
 dlls/winmm/mciseq/mcimidi.c                | 18 ++++++-
 dlls/winmm/mciwave/mciwave.c               | 18 ++++++-
 dlls/winmm/midimap/midimap.c               | 18 ++++++-
 dlls/winmm/mmio.c                          | 18 ++++++-
 dlls/winmm/mmsystem.c                      | 18 ++++++-
 dlls/winmm/sound16.c                       | 18 ++++++-
 dlls/winmm/time.c                          | 18 ++++++-
 dlls/winmm/wavemap/wavemap.c               | 18 ++++++-
 dlls/winmm/winemm.h                        | 14 +++++-
 dlls/winmm/wineoss/audio.c                 | 18 ++++++-
 dlls/winmm/wineoss/midi.c                  | 18 ++++++-
 dlls/winmm/wineoss/midipatch.c             | 15 ++++++
 dlls/winmm/wineoss/mixer.c                 | 18 ++++++-
 dlls/winmm/wineoss/mmaux.c                 | 18 ++++++-
 dlls/winmm/wineoss/oss.c                   | 14 ++++++
 dlls/winmm/wineoss/oss.h                   | 19 +++++++-
 dlls/winmm/winmm_En.rc                     | 18 +++++++
 dlls/winmm/winmm_Es.rc                     | 18 +++++++
 dlls/winmm/winmm_Fr.rc                     | 18 +++++++
 dlls/winmm/winmm_Nl.rc                     | 18 +++++++
 dlls/winmm/winmm_Pt.rc                     | 18 ++++++-
 dlls/winmm/winmm_Ru.rc                     | 18 +++++++
 dlls/winmm/winmm_Sk.rc                     | 18 +++++++
 dlls/winmm/winmm_res.rc                    | 16 +++++-
 dlls/winnls/winnls.c                       | 18 +++++++
 dlls/winsock/async.c                       | 22 +++++++--
 dlls/winsock/socket.c                      | 20 ++++++--
 dlls/winspool/info.c                       | 18 ++++++-
 dlls/winspool/wspool.c                     | 18 ++++++-
 dlls/wintrust/wintrust_main.c              | 22 ++++++++-
 dlls/wsock32/protocol.c                    | 18 ++++++-
 dlls/wsock32/socket.c                      | 18 ++++++-
 dlls/wsock32/wscontrol.h                   | 16 ++++++
 dlls/x11drv/desktop.c                      | 18 ++++++-
 dlls/x11drv/dga2.c                         | 18 ++++++-
 dlls/x11drv/dga2.h                         | 14 ++++++
 dlls/x11drv/mouse.c                        | 18 ++++++-
 dlls/x11drv/mwm.h                          | 14 ++++++
 dlls/x11drv/scroll.c                       | 18 ++++++-
 dlls/x11drv/window.c                       | 18 ++++++-
 dlls/x11drv/winpos.c                       | 18 ++++++-
 dlls/x11drv/x11ddraw.c                     | 18 ++++++-
 dlls/x11drv/x11ddraw.h                     | 14 ++++++
 dlls/x11drv/x11drv_main.c                  | 18 ++++++-
 dlls/x11drv/xrender.c                      | 18 ++++++-
 dlls/x11drv/xvidmode.c                     | 18 ++++++-
 dlls/x11drv/xvidmode.h                     | 14 ++++++
 files/change.c                             | 18 ++++++-
 files/directory.c                          | 20 ++++++--
 files/dos_fs.c                             | 20 ++++++--
 files/drive.c                              | 19 ++++++--
 files/file.c                               | 18 ++++++-
 files/profile.c                            | 18 ++++++-
 files/tape.c                               | 18 ++++++-
 graphics/bitblt.c                          | 18 ++++++-
 graphics/dispdib.c                         | 17 ++++++-
 graphics/enhmetafiledrv/dc.c               | 18 ++++++-
 graphics/enhmetafiledrv/graphics.c         | 18 ++++++-
 graphics/enhmetafiledrv/init.c             | 18 ++++++-
 graphics/enhmetafiledrv/mapping.c          | 14 ++++++
 graphics/enhmetafiledrv/objects.c          | 18 ++++++-
 graphics/env.c                             | 18 ++++++-
 graphics/escape.c                          | 18 ++++++-
 graphics/fontengine.c                      | 19 ++++++--
 graphics/mapping.c                         | 18 ++++++-
 graphics/metafiledrv/bitblt.c              | 18 ++++++-
 graphics/metafiledrv/dc.c                  | 13 +++++
 graphics/metafiledrv/graphics.c            | 18 ++++++-
 graphics/metafiledrv/init.c                | 18 ++++++-
 graphics/metafiledrv/mapping.c             | 14 ++++++
 graphics/metafiledrv/metafiledrv.h         | 16 ++++++
 graphics/metafiledrv/objects.c             | 18 ++++++-
 graphics/metafiledrv/text.c                | 17 ++++++-
 graphics/painting.c                        | 18 ++++++-
 graphics/path.c                            | 18 ++++++-
 graphics/win16drv/brush.c                  | 18 ++++++-
 graphics/win16drv/font.c                   | 18 ++++++-
 graphics/win16drv/graphics.c               | 18 ++++++-
 graphics/win16drv/init.c                   | 18 ++++++-
 graphics/win16drv/objects.c                | 18 ++++++-
 graphics/win16drv/pen.c                    | 18 ++++++-
 graphics/win16drv/prtdrv.c                 | 18 ++++++-
 graphics/win16drv/text.c                   | 18 ++++++-
 graphics/x11drv/bitblt.c                   | 18 ++++++-
 graphics/x11drv/bitmap.c                   | 18 ++++++-
 graphics/x11drv/brush.c                    | 18 ++++++-
 graphics/x11drv/clipping.c                 | 18 ++++++-
 graphics/x11drv/codepage.c                 | 18 ++++++-
 graphics/x11drv/dib.c                      | 20 ++++++--
 graphics/x11drv/graphics.c                 | 18 ++++++-
 graphics/x11drv/init.c                     | 18 ++++++-
 graphics/x11drv/objects.c                  | 18 ++++++-
 graphics/x11drv/opengl.c                   | 17 ++++++-
 graphics/x11drv/palette.c                  | 17 ++++++-
 graphics/x11drv/pen.c                      | 18 ++++++-
 graphics/x11drv/text.c                     | 18 ++++++-
 graphics/x11drv/xfont.c                    | 18 ++++++-
 if1632/builtin.c                           | 18 ++++++-
 if1632/relay.c                             | 18 ++++++-
 if1632/snoop.c                             | 18 ++++++-
 include/amaudio.h                          | 18 +++++++
 include/amvideo.h                          | 18 +++++++
 include/audevcod.h                         | 18 +++++++
 include/basetsd.h                          | 16 ++++++
 include/bitmap.h                           | 14 ++++++
 include/brush.h                            | 14 ++++++
 include/builtin16.h                        | 14 ++++++
 include/callback.h                         | 14 ++++++
 include/cderr.h                            | 18 +++++++
 include/cguid.h                            | 18 +++++++
 include/clipboard.h                        | 20 ++++++++
 include/color.h                            | 19 ++++++++
 include/comcat.h                           | 18 +++++++
 include/commctrl.h                         | 16 ++++++
 include/commdlg.h                          | 16 ++++++
 include/compobj.h                          | 18 +++++++
 include/console.h                          | 26 +++++++---
 include/control.h                          | 18 +++++++
 include/cpl.h                              | 20 +++++++-
 include/cursoricon.h                       | 14 ++++++
 include/d3d.h                              | 18 +++++++
 include/d3dcaps.h                          | 18 +++++++
 include/d3dhal.h                           | 22 ++++++++-
 include/d3dtypes.h                         | 18 +++++++
 include/d3dvec.inl                         | 18 +++++++
 include/dce.h                              | 14 ++++++
 include/dciddi.h                           | 20 +++++++-
 include/dde.h                              | 15 +++++-
 include/ddeml.h                            | 14 ++++++
 include/ddraw.h                            | 18 +++++++
 include/ddrawi.h                           | 22 ++++++++-
 include/digitalv.h                         | 18 ++++++-
 include/dinput.h                           | 18 +++++++
 include/dispdib.h                          | 13 +++++
 include/dlgs.h                             | 22 +++++++--
 include/docobj.h                           | 18 +++++++
 include/dplay.h                            | 18 +++++++
 include/dplobby.h                          | 19 ++++++++
 include/drive.h                            | 14 ++++++
 include/dsdriver.h                         | 22 ++++++++-
 include/dshow.h                            | 18 +++++++
 include/dsound.h                           | 18 +++++++
 include/enhmetafiledrv.h                   | 16 ++++++
 include/errors.h                           | 18 +++++++
 include/evcode.h                           | 18 +++++++
 include/file.h                             | 14 ++++++
 include/font.h                             | 14 ++++++
 include/gdi.h                              | 14 ++++++
 include/global.h                           | 14 ++++++
 include/guiddef.h                          | 18 +++++++
 include/heap.h                             | 14 ++++++
 include/hook.h                             | 14 ++++++
 include/imagehlp.h                         | 18 ++++++-
 include/imm.h                              | 18 ++++++-
 include/initguid.h                         | 20 +++++++-
 include/input.h                            | 14 ++++++
 include/instance.h                         | 14 ++++++
 include/lmcons.h                           | 18 +++++++
 include/local.h                            | 14 ++++++
 include/lzexpand.h                         | 15 +++++-
 include/mapi.h                             | 18 +++++++
 include/mapicode.h                         | 18 ++++++-
 include/mapidefs.h                         | 18 +++++++
 include/mciavi.h                           | 18 +++++++
 include/mcx.h                              | 18 +++++++
 include/message.h                          | 14 ++++++
 include/metafile.h                         | 14 ++++++
 include/minmax.h                           | 14 ++++++
 include/miscemu.h                          | 14 ++++++
 include/mmddk.h                            | 15 +++++-
 include/mmreg.h                            | 18 ++++++-
 include/mmsystem.h                         | 18 ++++++-
 include/module.h                           | 14 ++++++
 include/msacm.h                            | 18 ++++++-
 include/msacmdlg.h                         | 20 +++++++-
 include/msdos.h                            | 19 ++++++++
 include/msvcrt/crtdbg.h                    | 14 ++++++
 include/msvcrt/eh.h                        | 14 ++++++
 include/msvcrt/excpt.h                     | 18 +++++++
 include/msvcrt/locale.h                    | 14 ++++++
 include/msvcrt/malloc.h                    | 14 ++++++
 include/msvcrt/mbctype.h                   | 14 ++++++
 include/msvcrt/mbstring.h                  | 14 ++++++
 include/msvcrt/search.h                    | 14 ++++++
 include/msvcrt/setjmp.h                    | 14 ++++++
 include/msvcrt/stddef.h                    | 14 ++++++
 include/msvcrt/sys/timeb.h                 | 14 ++++++
 include/msvcrt/sys/types.h                 | 14 ++++++
 include/msvcrt/sys/utime.h                 | 14 ++++++
 include/msvcrt/time.h                      | 14 ++++++
 include/msvcrt/wctype.h                    | 14 ++++++
 include/nb30.h                             | 18 +++++++
 include/netspi.h                           | 16 ++++++
 include/nonclient.h                        | 14 ++++++
 include/nspapi.h                           | 16 ++++++
 include/ntddcdrm.h                         | 20 +++++++-
 include/ntddk.h                            | 22 +++++++--
 include/ntddstor.h                         | 20 +++++++-
 include/ntdef.h                            | 18 +++++++
 include/ntsecapi.h                         | 18 +++++++
 include/oaidl.h                            | 18 +++++++
 include/objbase.h                          | 18 +++++++
 include/objidl.h                           | 18 +++++++
 include/ocidl.h                            | 18 +++++++
 include/ole.h                              | 18 ++++++-
 include/ole2.h                             | 18 ++++++-
 include/ole2ver.h                          | 18 ++++++-
 include/oleauto.h                          | 18 +++++++
 include/olectl.h                           | 18 +++++++
 include/oledlg.h                           | 18 ++++++-
 include/oleidl.h                           | 18 +++++++
 include/options.h                          | 14 ++++++
 include/palette.h                          | 14 ++++++
 include/path.h                             | 14 ++++++
 include/pen.h                              | 14 ++++++
 include/poppack.h                          | 18 +++++++
 include/prsht.h                            | 18 +++++++
 include/psapi.h                            | 18 ++++++-
 include/pshpack1.h                         | 18 +++++++
 include/pshpack2.h                         | 18 +++++++
 include/pshpack4.h                         | 18 +++++++
 include/pshpack8.h                         | 18 +++++++
 include/queue.h                            | 14 ++++++
 include/ras.h                              | 18 +++++++
 include/region.h                           | 14 ++++++
 include/regstr.h                           | 19 +++++++-
 include/richedit.h                         | 18 +++++++
 include/rpc.h                              | 18 ++++++-
 include/rpcdce.h                           | 18 +++++++
 include/rpcdcep.h                          | 18 +++++++
 include/rpcndr.h                           | 18 +++++++
 include/rpcnterr.h                         | 18 +++++++
 include/rpcproxy.h                         | 18 +++++++
 include/selectors.h                        | 14 ++++++
 include/services.h                         | 14 ++++++
 include/servprov.h                         | 18 +++++++
 include/setupapi.h                         | 21 ++++++--
 include/shellapi.h                         | 18 +++++++
 include/shlguid.h                          | 18 +++++++
 include/shlobj.h                           | 18 +++++++
 include/shlwapi.h                          | 17 +++++++
 include/snoop.h                            | 17 +++++++
 include/spy.h                              | 17 +++++++
 include/sql.h                              | 18 ++++++-
 include/sqlext.h                           | 17 +++++++
 include/sqltypes.h                         | 17 ++++++-
 include/stackframe.h                       | 14 ++++++
 include/storage.h                          | 18 +++++++
 include/strmif.h                           | 18 +++++++
 include/syslevel.h                         | 14 ++++++
 include/sysmetrics.h                       | 14 ++++++
 include/tapi.h                             | 14 ++++++
 include/task.h                             | 14 ++++++
 include/tchar.h                            | 18 +++++++
 include/thread.h                           | 14 ++++++
 include/tlhelp32.h                         | 18 +++++++
 include/toolhelp.h                         | 18 +++++++
 include/unknwn.h                           | 18 +++++++
 include/urlmon.h                           | 16 +++++-
 include/user.h                             | 14 ++++++
 include/uuids.h                            | 18 +++++++
 include/ver.h                              | 14 ++++++
 include/vfw.h                              | 18 +++++++
 include/vfwmsgs.h                          | 18 +++++++
 include/win.h                              | 14 ++++++
 include/win16drv.h                         | 16 ++++++
 include/winbase.h                          | 18 +++++++
 include/wincon.h                           | 18 +++++++
 include/wincrypt.h                         | 18 +++++++
 include/windef.h                           | 14 ++++++
 include/windows.h                          | 18 +++++++
 include/windowsx.h                         | 17 ++++++-
 include/wine/debug.h                       | 19 ++++++--
 include/wine/exception.h                   | 14 ++++++
 include/wine/icmpapi.h                     | 16 ++++++
 include/wine/ipexport.h                    | 16 ++++++
 include/wine/library.h                     | 14 ++++++
 include/wine/mmsystem16.h                  | 18 ++++++-
 include/wine/obj_base.h                    | 16 ++++++
 include/wine/obj_cache.h                   | 16 ++++++
 include/wine/obj_channel.h                 | 19 +++++++-
 include/wine/obj_clientserver.h            | 16 ++++++
 include/wine/obj_commdlgbrowser.h          | 18 ++++++-
 include/wine/obj_connection.h              | 16 ++++++
 include/wine/obj_contextmenu.h             | 20 +++++++-
 include/wine/obj_control.h                 | 16 ++++++
 include/wine/obj_dataobject.h              | 15 ++++++
 include/wine/obj_dockingwindowframe.h      | 18 ++++++-
 include/wine/obj_dragdrop.h                | 16 ++++++
 include/wine/obj_enumidlist.h              | 16 ++++++
 include/wine/obj_errorinfo.h               | 16 ++++++
 include/wine/obj_extracticon.h             | 18 ++++++-
 include/wine/obj_inplace.h                 | 16 ++++++
 include/wine/obj_ksproperty.h              | 18 +++++++
 include/wine/obj_marshal.h                 | 16 ++++++
 include/wine/obj_misc.h                    | 16 ++++++
 include/wine/obj_moniker.h                 | 17 +++++++
 include/wine/obj_oleaut.h                  | 16 ++++++
 include/wine/obj_olefont.h                 | 16 ++++++
 include/wine/obj_oleobj.h                  | 16 ++++++
 include/wine/obj_oleundo.h                 | 16 ++++++
 include/wine/obj_oleview.h                 | 15 ++++++
 include/wine/obj_picture.h                 | 16 ++++++
 include/wine/obj_property.h                | 16 ++++++
 include/wine/obj_propertystorage.h         | 16 ++++++
 include/wine/obj_queryassociations.h       | 18 ++++++-
 include/wine/obj_serviceprovider.h         | 16 ++++++
 include/wine/obj_shellbrowser.h            | 18 ++++++-
 include/wine/obj_shellextinit.h            | 18 ++++++-
 include/wine/obj_shellfolder.h             | 16 ++++++
 include/wine/obj_shelllink.h               | 16 ++++++
 include/wine/obj_shellview.h               | 18 ++++++-
 include/wine/obj_storage.h                 | 16 ++++++
 include/wine/obj_webbrowser.h              | 16 +++++-
 include/wine/port.h                        | 15 ++++++
 include/wine/server.h                      | 14 ++++++
 include/wine/test.h                        | 14 ++++++
 include/wine/unicode.h                     | 14 ++++++
 include/wine/winaspi.h                     | 19 +++++++-
 include/wine/winbase16.h                   | 18 +++++++
 include/wine/windef16.h                    | 16 ++++++
 include/wine/wine_common_ver.rc            | 18 +++++++
 include/wine/wingdi16.h                    | 18 +++++++
 include/wine/winnet16.h                    | 14 ++++++
 include/wine/winsock16.h                   | 18 +++++++
 include/wine/winuser16.h                   | 18 +++++++
 include/wine_gl.h                          | 23 +++++++--
 include/winerror.h                         | 18 +++++++
 include/wingdi.h                           | 18 +++++++
 include/wininet.h                          | 18 +++++++
 include/winioctl.h                         | 18 +++++++
 include/winnetwk.h                         | 18 +++++++
 include/winnls.h                           | 18 +++++++
 include/winnt.h                            | 14 ++++++
 include/winpos.h                           | 14 ++++++
 include/winproc.h                          | 14 ++++++
 include/winreg.h                           | 19 +++++++-
 include/winres.h                           | 18 +++++++
 include/winresrc.h                         | 18 +++++++
 include/winsock.h                          | 16 ++++++
 include/winsock2.h                         | 17 +++++++
 include/winspool.h                         | 14 ++++++
 include/winsvc.h                           | 18 +++++++
 include/winuser.h                          | 18 +++++++
 include/winver.h                           | 14 ++++++
 include/wnaspi32.h                         | 18 +++++++
 include/wownt32.h                          | 16 ++++++
 include/wrc_rsc.h                          | 13 +++++
 include/ws2spi.h                           | 20 +++++++-
 include/ws2tcpip.h                         | 18 +++++++
 include/wshisotp.h                         | 17 ++++++-
 include/wsipx.h                            | 17 ++++++-
 include/wtypes.h                           | 16 ++++++
 include/x11drv.h                           | 17 +++++++
 include/x11font.h                          | 14 ++++++
 include/zmouse.h                           | 14 ++++++
 library/debug.c                            | 14 ++++++
 library/errno.c                            | 14 ++++++
 library/ldt.c                              | 14 ++++++
 library/loader.c                           | 14 ++++++
 library/port.c                             | 14 ++++++
 libtest/expand.c                           | 18 +++++++
 libtest/guitest.c                          | 20 +++++++-
 libtest/guitest.rc                         | 28 ++++++++---
 libtest/guitest.rh                         | 28 ++++++++---
 libtest/hello.c                            | 18 +++++++
 libtest/hello2.c                           | 18 +++++++
 libtest/hello3.c                           | 18 +++++++
 libtest/hello3res.rc                       | 18 +++++++
 libtest/hello4.c                           | 18 +++++++
 libtest/hello5.c                           | 17 +++++++
 libtest/new.c                              | 18 +++++++
 libtest/rolex.c                            | 17 ++++++-
 libtest/vartest.c                          | 13 +++++
 libtest/volinfo.c                          | 17 +++++++
 loader/elf.c                               | 18 ++++++-
 loader/loadorder.c                         | 18 ++++++-
 loader/main.c                              | 20 +++++++-
 loader/module.c                            | 22 +++++++--
 loader/ne/convert.c                        | 18 ++++++-
 loader/ne/module.c                         | 20 ++++++--
 loader/ne/resource.c                       | 18 ++++++-
 loader/ne/segment.c                        | 24 +++++++--
 loader/pe_image.c                          | 33 ++++++++-----
 loader/pe_resource.c                       | 18 ++++++-
 loader/resource.c                          | 18 ++++++-
 loader/task.c                              | 22 +++++++--
 memory/atom.c                              | 18 ++++++-
 memory/codepage.c                          | 18 ++++++-
 memory/environ.c                           | 14 ++++++
 memory/global.c                            | 18 ++++++-
 memory/heap.c                              | 18 ++++++-
 memory/instr.c                             | 20 ++++++--
 memory/local.c                             | 20 ++++++--
 memory/registry.c                          | 18 ++++++-
 memory/selector.c                          | 18 ++++++-
 memory/string.c                            | 18 ++++++-
 memory/virtual.c                           | 20 ++++++--
 misc/cpu.c                                 | 18 ++++++-
 misc/error.c                               | 16 +++++-
 misc/main.c                                | 18 ++++++-
 misc/options.c                             | 16 +++++-
 misc/registry.c                            | 18 ++++++-
 misc/system.c                              | 18 ++++++-
 misc/version.c                             | 18 ++++++-
 miscemu/main.c                             | 17 ++++++-
 msdos/dosconf.c                            | 17 ++++++-
 msdos/dosmem.c                             | 20 ++++++--
 msdos/dpmi.c                               | 18 ++++++-
 msdos/int11.c                              | 18 ++++++-
 msdos/int13.c                              | 20 +++++++-
 msdos/int15.c                              | 20 +++++++-
 msdos/int1a.c                              | 20 +++++++-
 msdos/int20.c                              | 16 ++++++
 msdos/int21.c                              | 24 ++++++++-
 msdos/int25.c                              | 20 +++++++-
 msdos/int26.c                              | 20 +++++++-
 msdos/int2a.c                              |  4 +-
 msdos/int2f.c                              | 22 +++++++--
 msdos/int3d.c                              | 18 ++++++-
 msdos/int41.c                              | 20 +++++++-
 msdos/int4b.c                              |  4 +-
 msdos/int5c.c                              | 18 ++++++-
 msdos/interrupts.c                         | 18 ++++++-
 msdos/ioports.c                            | 18 ++++++-
 msdos/ppdev.c                              | 20 +++++++-
 msdos/vxd.c                                | 18 ++++++-
 objects/bitmap.c                           | 18 ++++++-
 objects/brush.c                            | 18 ++++++-
 objects/clipping.c                         | 18 ++++++-
 objects/color.c                            | 18 ++++++-
 objects/dc.c                               | 17 ++++++-
 objects/dcvalues.c                         | 13 +++++
 objects/dib.c                              | 17 ++++++-
 objects/enhmetafile.c                      | 21 ++++++--
 objects/font.c                             | 20 ++++++--
 objects/gdiobj.c                           | 18 ++++++-
 objects/linedda.c                          | 14 ++++++
 objects/metafile.c                         | 17 ++++++-
 objects/palette.c                          | 19 +++++++-
 objects/pen.c                              | 18 ++++++-
 objects/region.c                           | 17 ++++++-
 objects/text.c                             | 17 ++++++-
 ole/ole2nls.c                              | 18 ++++++-
 ole/uuid.c                                 | 17 +++++++
 programs/avitools/aviinfo.c                | 18 +++++++
 programs/avitools/aviplay.c                | 14 ++++++
 programs/avitools/icinfo.c                 | 18 +++++++
 programs/clock/Da.rc                       | 14 ++++++
 programs/clock/De.rc                       | 13 +++++
 programs/clock/En.rc                       | 14 ++++++
 programs/clock/Es.rc                       | 13 +++++
 programs/clock/Fi.rc                       | 14 ++++++
 programs/clock/Fr.rc                       | 14 ++++++
 programs/clock/License_En.c                | 57 ++++++++--------------
 programs/clock/Pt.rc                       | 14 ++++++
 programs/clock/Sk.rc                       | 14 ++++++
 programs/clock/Sw.rc                       | 14 ++++++
 programs/clock/Wa.rc                       | 16 ++++++
 programs/clock/clock.rc                    | 14 ++++++
 programs/clock/language.c                  | 14 ++++++
 programs/clock/language.h                  | 14 ++++++
 programs/clock/license.c                   | 14 ++++++
 programs/clock/license.h                   | 14 ++++++
 programs/clock/main.c                      | 14 ++++++
 programs/clock/main.h                      | 14 ++++++
 programs/clock/rsrc.rc                     | 19 ++++++++
 programs/clock/winclock.c                  | 23 ++++-----
 programs/clock/winclock.h                  | 14 ++++++
 programs/cmdlgtst/cmdlgr.rc                | 26 +++++++---
 programs/cmdlgtst/cmdlgtst.c               | 19 ++++++--
 programs/cmdlgtst/cmdlgtst.h               | 18 +++++++
 programs/control/control.c                 | 15 +++++-
 programs/control/params.h                  | 15 +++++-
 programs/notepad/Da.rc                     | 14 ++++++
 programs/notepad/De.rc                     | 15 +++++-
 programs/notepad/En.rc                     | 14 ++++++
 programs/notepad/Es.rc                     | 14 ++++++
 programs/notepad/Fi.rc                     | 14 ++++++
 programs/notepad/Fr.rc                     | 14 ++++++
 programs/notepad/License_En.c              | 57 ++++++++--------------
 programs/notepad/Pt.rc                     | 14 ++++++
 programs/notepad/Sk.rc                     | 14 ++++++
 programs/notepad/Sw.rc                     | 14 ++++++
 programs/notepad/Wa.rc                     | 16 ++++++
 programs/notepad/dialog.c                  | 15 +++++-
 programs/notepad/dialog.h                  | 14 ++++++
 programs/notepad/language.c                | 14 ++++++
 programs/notepad/language.h                | 14 ++++++
 programs/notepad/license.c                 | 15 +++++-
 programs/notepad/license.h                 | 15 +++++-
 programs/notepad/main.c                    | 15 +++++-
 programs/notepad/main.h                    | 15 +++++-
 programs/notepad/notepad.rc                | 15 +++++-
 programs/notepad/rsrc.rc                   | 17 +++++++
 programs/notepad/search.c                  | 15 +++++-
 programs/osversioncheck/osversioncheck.c   | 14 ++++++
 programs/progman/Da.rc                     | 14 ++++++
 programs/progman/De.rc                     | 14 ++++++
 programs/progman/En.rc                     | 14 ++++++
 programs/progman/Es.rc                     | 14 ++++++
 programs/progman/Fi.rc                     | 14 ++++++
 programs/progman/Fr.rc                     | 14 ++++++
 programs/progman/Hu.rc                     | 14 ++++++
 programs/progman/It.rc                     | 14 ++++++
 programs/progman/Ko.rc                     | 14 ++++++
 programs/progman/License_En.c              | 57 ++++++++--------------
 programs/progman/Pt.rc                     | 14 ++++++
 programs/progman/Ru.rc                     | 14 ++++++
 programs/progman/Sk.rc                     | 14 ++++++
 programs/progman/Sw.rc                     | 14 ++++++
 programs/progman/Va.rc                     | 13 +++++
 programs/progman/Wa.rc                     | 16 ++++++
 programs/progman/Xx.rc                     | 14 ++++++
 programs/progman/accel.rc                  | 18 +++++++
 programs/progman/dialog.c                  | 14 ++++++
 programs/progman/group.c                   | 14 ++++++
 programs/progman/grpfile.c                 | 14 ++++++
 programs/progman/license.c                 | 18 +++++++
 programs/progman/license.h                 | 18 +++++++
 programs/progman/main.c                    | 14 ++++++
 programs/progman/progman.h                 | 14 ++++++
 programs/progman/program.c                 | 14 ++++++
 programs/progman/rsrc.rc                   | 17 +++++++
 programs/progman/string.c                  | 14 ++++++
 programs/regapi/regFixer.pl                | 16 +++++-
 programs/regapi/regRestorer.pl             | 16 +++++-
 programs/regapi/regSet.sh                  | 14 ++++++
 programs/regapi/regapi.c                   | 14 ++++++
 programs/regapi/tests/regapi.pl            | 19 +++++++-
 programs/regtest/regtest.c                 | 14 ++++++
 programs/uninstaller/main.c                | 15 +++++-
 programs/uninstaller/main.h                | 18 +++++++
 programs/uninstaller/rsrc.rc               | 15 +++++-
 programs/view/globals.h                    | 17 +++++++
 programs/view/init.c                       | 18 +++++++
 programs/view/resource.h                   | 18 +++++++
 programs/view/view.c                       | 18 +++++++
 programs/view/viewrc.rc                    | 18 +++++++
 programs/view/winmain.c                    | 18 +++++++
 programs/wcmd/batch.c                      | 16 +++++-
 programs/wcmd/builtins.c                   | 19 +++++++-
 programs/wcmd/directory.c                  | 19 +++++++-
 programs/wcmd/wcmd.h                       | 17 ++++++-
 programs/wcmd/wcmdmain.c                   | 16 +++++-
 programs/wcmd/wcmdrc.rc                    | 17 +++++++
 programs/wineconsole/dialog.c              | 16 +++++-
 programs/wineconsole/registry.c            | 14 ++++++
 programs/wineconsole/user.c                | 14 ++++++
 programs/wineconsole/winecon_private.h     | 14 ++++++
 programs/wineconsole/winecon_user.h        | 14 ++++++
 programs/wineconsole/wineconsole.c         | 14 ++++++
 programs/wineconsole/wineconsole_En.rc     | 18 +++++++
 programs/wineconsole/wineconsole_Fr.rc     | 18 +++++++
 programs/wineconsole/wineconsole_res.h     | 20 +++++++-
 programs/wineconsole/wineconsole_res.rc    | 18 +++++++
 programs/winemine/dialog.c                 | 16 +++++-
 programs/winemine/dialog.h                 | 15 +++++-
 programs/winemine/main.c                   | 16 +++++-
 programs/winemine/main.h                   | 18 +++++++
 programs/winemine/resource.h               | 15 +++++-
 programs/winemine/rsrc.rc                  | 15 +++++-
 programs/winetest/include/wine.pm          | 16 ++++++
 programs/winetest/make_ctests              | 19 ++++++++
 programs/winetest/make_symbols             | 14 ++++++
 programs/winetest/runtest                  | 16 ++++++
 programs/winetest/tests/wine.pl            | 16 ++++++
 programs/winetest/wine.xs                  | 25 +++++++---
 programs/winetest/winetest.c               | 16 ++++++
 programs/winetest/wtmain.c                 | 14 ++++++
 programs/winhelp/Da.rc                     | 14 ++++++
 programs/winhelp/De.rc                     | 14 ++++++
 programs/winhelp/En.rc                     | 14 ++++++
 programs/winhelp/Es.rc                     | 14 ++++++
 programs/winhelp/Fi.rc                     | 14 ++++++
 programs/winhelp/Fr.rc                     | 14 ++++++
 programs/winhelp/Hu.rc                     | 14 ++++++
 programs/winhelp/It.rc                     | 14 ++++++
 programs/winhelp/Ko.rc                     | 14 ++++++
 programs/winhelp/Pt.rc                     | 14 ++++++
 programs/winhelp/Sk.rc                     | 14 ++++++
 programs/winhelp/Sw.rc                     | 14 ++++++
 programs/winhelp/Va.rc                     | 13 +++++
 programs/winhelp/Wa.rc                     | 16 ++++++
 programs/winhelp/Xx.rc                     | 14 ++++++
 programs/winhelp/hlp2sgml.c                | 14 ++++++
 programs/winhelp/hlpfile.c                 | 14 ++++++
 programs/winhelp/hlpfile.h                 | 14 ++++++
 programs/winhelp/macro.c                   | 14 ++++++
 programs/winhelp/macro.h                   | 14 ++++++
 programs/winhelp/macro.lex.l               | 14 ++++++
 programs/winhelp/macro.yacc.y              | 14 ++++++
 programs/winhelp/rsrc.rc                   | 19 ++++++++
 programs/winhelp/string.c                  | 14 ++++++
 programs/winhelp/winhelp.c                 | 14 ++++++
 programs/winhelp/winhelp.h                 | 14 ++++++
 programs/winver/winver.c                   | 15 +++++-
 relay32/builtin32.c                        | 20 ++++++--
 relay32/relay386.c                         | 18 ++++++-
 relay32/snoop.c                            | 18 ++++++-
 scheduler/client.c                         | 14 ++++++
 scheduler/critsection.c                    | 20 ++++++--
 scheduler/handle.c                         | 18 ++++++-
 scheduler/pipe.c                           | 14 ++++++
 scheduler/process.c                        | 22 +++++++--
 scheduler/pthread.c                        | 14 ++++++
 scheduler/services.c                       | 18 ++++++-
 scheduler/synchro.c                        | 14 ++++++
 scheduler/sysdeps.c                        | 18 ++++++-
 scheduler/syslevel.c                       | 18 ++++++-
 scheduler/thread.c                         | 20 ++++++--
 scheduler/timer.c                          | 14 ++++++
 server/async.c                             | 13 +++++
 server/async.h                             | 19 ++++++++
 server/atom.c                              | 14 ++++++
 server/change.c                            | 14 ++++++
 server/console.c                           | 14 ++++++
 server/console.h                           | 14 ++++++
 server/context_i386.c                      | 14 ++++++
 server/context_sparc.c                     | 14 ++++++
 server/debugger.c                          | 14 ++++++
 server/device.c                            | 14 ++++++
 server/event.c                             | 14 ++++++
 server/file.c                              | 14 ++++++
 server/handle.c                            | 14 ++++++
 server/handle.h                            | 14 ++++++
 server/main.c                              | 14 ++++++
 server/mapping.c                           | 14 ++++++
 server/mutex.c                             | 14 ++++++
 server/named_pipe.c                        | 14 ++++++
 server/object.c                            | 14 ++++++
 server/object.h                            | 14 ++++++
 server/pipe.c                              | 14 ++++++
 server/process.c                           | 14 ++++++
 server/process.h                           | 14 ++++++
 server/protocol.def                        | 14 ++++++
 server/ptrace.c                            | 14 ++++++
 server/queue.c                             | 14 ++++++
 server/registry.c                          | 14 ++++++
 server/request.c                           | 14 ++++++
 server/request.h                           | 14 ++++++
 server/select.c                            | 14 ++++++
 server/semaphore.c                         | 14 ++++++
 server/serial.c                            | 14 ++++++
 server/snapshot.c                          | 14 ++++++
 server/sock.c                              | 14 ++++++
 server/thread.c                            | 14 ++++++
 server/thread.h                            | 14 ++++++
 server/timer.c                             | 14 ++++++
 server/trace.c                             | 14 ++++++
 server/unicode.c                           | 14 ++++++
 server/unicode.h                           | 14 ++++++
 server/user.c                              | 14 ++++++
 server/user.h                              | 14 ++++++
 server/window.c                            | 14 ++++++
 tools/bin2res.c                            | 14 ++++++
 tools/bug_report.pl                        | 17 +++++--
 tools/c2man.pl                             | 16 +++++-
 tools/examine-relay                        | 13 +++++
 tools/fnt2bdf.c                            | 13 +++++
 tools/fnt2bdf.h                            | 18 +++++++
 tools/font_convert.sh                      | 17 +++++++
 tools/genpatch                             | 17 ++++++-
 tools/make_X11wrappers                     | 15 +++++-
 tools/make_authors                         | 17 +++++++
 tools/make_debug                           | 14 ++++++
 tools/make_requests                        | 14 ++++++
 tools/makedep.c                            | 14 ++++++
 tools/testrun                              | 16 ++++++
 tools/winapi/c_function.pm                 | 18 +++++++
 tools/winapi/c_parser.pm                   | 18 +++++++
 tools/winapi/config.pm                     | 18 +++++++
 tools/winapi/function.pm                   | 18 +++++++
 tools/winapi/make_filter                   | 17 +++++++
 tools/winapi/make_filter_options.pm        | 18 +++++++
 tools/winapi/make_parser.pm                | 18 +++++++
 tools/winapi/options.pm                    | 18 +++++++
 tools/winapi/output.pm                     | 18 +++++++
 tools/winapi/setup.pm                      | 18 +++++++
 tools/winapi/trampoline                    | 17 +++++++
 tools/winapi/type.pm                       | 18 +++++++
 tools/winapi/util.pm                       | 18 +++++++
 tools/winapi/winapi_check                  | 17 +++++++
 tools/winapi/winapi_check_options.pm       | 18 +++++++
 tools/winapi/winapi_extract                | 15 ++++++
 tools/winapi/winapi_extract_options.pm     | 18 +++++++
 tools/winapi/winapi_fixup                  | 15 ++++++
 tools/winapi/winapi_fixup_documentation.pm | 18 +++++++
 tools/winapi/winapi_fixup_editor.pm        | 18 +++++++
 tools/winapi/winapi_fixup_options.pm       | 18 +++++++
 tools/winapi/winapi_fixup_statements.pm    | 18 +++++++
 tools/winapi/winapi_module_user.pm         | 18 +++++++
 tools/winapi_check/modules.pm              | 18 +++++++
 tools/winapi_check/nativeapi.pm            | 18 +++++++
 tools/winapi_check/preprocessor.pm         | 18 +++++++
 tools/winapi_check/winapi.pm               | 18 +++++++
 tools/winapi_check/winapi_check            | 15 ++++++
 tools/winapi_check/winapi_documentation.pm | 18 +++++++
 tools/winapi_check/winapi_function.pm      | 18 +++++++
 tools/winapi_check/winapi_global.pm        | 18 +++++++
 tools/winapi_check/winapi_local.pm         | 18 +++++++
 tools/winapi_check/winapi_options.pm       | 18 +++++++
 tools/winapi_check/winapi_parser.pm        | 18 +++++++
 tools/winebuild/build.h                    | 15 ++++++
 tools/winebuild/import.c                   | 14 ++++++
 tools/winebuild/main.c                     | 14 ++++++
 tools/winebuild/parser.c                   | 14 ++++++
 tools/winebuild/relay.c                    | 14 ++++++
 tools/winebuild/res16.c                    | 14 ++++++
 tools/winebuild/res32.c                    | 14 ++++++
 tools/winebuild/spec16.c                   | 17 ++++++-
 tools/winebuild/spec32.c                   | 18 +++++--
 tools/winebuild/utils.c                    | 29 ++++++++++-
 tools/winecheck                            | 17 ++++++-
 tools/wineconf                             | 23 +++++++--
 tools/wineconf.libs/autoconf.eng           | 17 +++++++
 tools/wineconf.libs/autoconf.tcl           | 17 +++++++
 tools/wineconf.libs/browsers.eng           | 17 +++++++
 tools/wineconf.libs/dirbrowser.tcl         | 17 +++++++
 tools/wineconf.libs/general.eng            | 17 +++++++
 tools/wineconf.libs/getfilename.tcl        | 16 ++++++
 tools/wineconf.libs/message.tcl            | 16 ++++++
 tools/wineconf.libs/message2.tcl           | 16 ++++++
 tools/wineconf.libs/saveRC.tcl             | 17 +++++++
 tools/wineconf.libs/wineconf.eng           | 17 +++++++
 tools/wineconf.libs/wineconf.tcl           | 17 +++++++
 tools/wineconf.libs/wineconf1.tcl          | 17 +++++++
 tools/wineconf.tcl                         | 17 +++++++
 tools/winedump/cvinclude.h                 | 16 ++++++
 tools/winedump/debug.c                     | 14 ++++++
 tools/winedump/function_grep.pl            | 17 ++++++-
 tools/winedump/main.c                      | 14 ++++++
 tools/winedump/misc.c                      | 14 ++++++
 tools/winedump/msmangle.c                  | 14 ++++++
 tools/winedump/output.c                    | 14 ++++++
 tools/winedump/pe.c                        | 14 ++++++
 tools/winedump/pe.h                        | 20 ++++++++
 tools/winedump/search.c                    | 14 ++++++
 tools/winedump/symbol.c                    | 14 ++++++
 tools/winedump/winedump.h                  | 14 ++++++
 tools/wineinstall                          | 19 +++++++-
 tools/winelauncher.in                      | 15 +++++-
 tools/winemaker                            | 15 ++++++
 tools/wineshelllink                        | 15 ++++++
 tools/wmc/lang.c                           | 13 +++++
 tools/wmc/lang.h                           | 13 +++++
 tools/wmc/mcl.c                            | 13 +++++
 tools/wmc/mcy.y                            | 16 ++++++
 tools/wmc/utils.c                          | 13 +++++
 tools/wmc/utils.h                          | 13 +++++
 tools/wmc/wmc.c                            | 13 +++++
 tools/wmc/wmc.h                            | 13 +++++
 tools/wmc/wmctypes.h                       | 13 +++++
 tools/wmc/write.c                          | 13 +++++
 tools/wmc/write.h                          | 13 +++++
 tools/wrc/dumpres.c                        | 15 +++++-
 tools/wrc/dumpres.h                        | 13 +++++
 tools/wrc/genres.c                         | 15 ++++++
 tools/wrc/genres.h                         | 13 +++++
 tools/wrc/newstruc.c                       | 13 +++++
 tools/wrc/newstruc.h                       | 13 +++++
 tools/wrc/parser.h                         | 14 ++++++
 tools/wrc/parser.l                         | 15 ++++++
 tools/wrc/parser.y                         | 15 ++++++
 tools/wrc/ppl.l                            | 15 ++++++
 tools/wrc/ppy.y                            | 16 ++++++
 tools/wrc/preproc.c                        | 13 +++++
 tools/wrc/preproc.h                        | 13 +++++
 tools/wrc/readres.c                        | 13 +++++
 tools/wrc/readres.h                        | 13 +++++
 tools/wrc/utils.c                          | 13 +++++
 tools/wrc/utils.h                          | 13 +++++
 tools/wrc/wrc.c                            | 16 +++++-
 tools/wrc/wrc.h                            | 13 +++++
 tools/wrc/wrctypes.h                       | 13 +++++
 tools/wrc/writeres.c                       | 13 +++++
 tools/wrc/writeres.h                       | 13 +++++
 tsx11/locking.c                            | 16 ++++++
 unicode/cpmap.pl                           | 14 ++++++
 unicode/cptable.c                          | 14 ++++++
 unicode/defaults                           | 16 ++++++
 unicode/mbtowc.c                           | 14 ++++++
 unicode/string.c                           | 14 ++++++
 unicode/utf8.c                             | 14 ++++++
 unicode/wctomb.c                           | 14 ++++++
 win32/console.c                            | 18 ++++++-
 win32/device.c                             | 17 ++++++-
 win32/editline.c                           | 18 ++++++-
 win32/except.c                             | 18 ++++++-
 win32/file.c                               | 18 ++++++-
 win32/init.c                               | 18 ++++++-
 win32/kernel32.c                           | 17 ++++++-
 win32/newfns.c                             | 20 ++++++--
 win32/time.c                               | 18 ++++++-
 windows/caret.c                            | 18 ++++++-
 windows/class.c                            | 18 ++++++-
 windows/clipboard.c                        | 18 ++++++-
 windows/cursoricon.c                       | 22 +++++++--
 windows/dce.c                              | 18 ++++++-
 windows/defdlg.c                           | 17 ++++++-
 windows/defwnd.c                           | 18 ++++++-
 windows/dialog.c                           | 18 ++++++-
 windows/driver.c                           | 18 ++++++-
 windows/focus.c                            | 17 ++++++-
 windows/hook.c                             | 18 ++++++-
 windows/input.c                            | 23 +++++++--
 windows/keyboard.c                         | 17 ++++++-
 windows/mdi.c                              | 18 ++++++-
 windows/message.c                          | 20 ++++++--
 windows/msgbox.c                           | 18 ++++++-
 windows/multimon.c                         | 14 ++++++
 windows/nonclient.c                        | 19 ++++++--
 windows/painting.c                         | 20 ++++++--
 windows/queue.c                            | 18 ++++++-
 windows/rect.c                             | 13 +++++
 windows/scroll.c                           | 16 +++++-
 windows/spy.c                              | 18 ++++++-
 windows/struct32.c                         | 14 ++++++
 windows/struct32.h                         | 21 +++++++-
 windows/syscolor.c                         | 17 ++++++-
 windows/sysmetrics.c                       | 13 +++++
 windows/sysparams.c                        | 18 ++++++-
 windows/timer.c                            | 18 ++++++-
 windows/user.c                             | 26 +++++++---
 windows/win.c                              | 20 ++++++--
 windows/winhelp.c                          | 20 +++++++-
 windows/winpos.c                           | 18 ++++++-
 windows/winproc.c                          | 22 +++++++--
 windows/x11drv/clipboard.c                 | 18 ++++++-
 windows/x11drv/event.c                     | 20 ++++++--
 windows/x11drv/keyboard.c                  | 22 +++++++--
 windows/x11drv/wineclipsrv.c               | 14 ++++++
 1627 files changed, 26208 insertions(+), 1814 deletions(-)

diff --git a/console/generic.c b/console/generic.c
index 6cb0181b5bb..effa6eaae33 100644
--- a/console/generic.c
+++ b/console/generic.c
@@ -1,10 +1,25 @@
-/* generic.c */
-/* Copyright 1999 - Joseph Pranevich */
-
-/* This is a driver to implement, when possible, "high-level"
-   routines using only low level calls. This is to make it possible
-   to have accelerated functions for the individual drivers...
-   or to simply not bother with them. */
+/*
+ * Copyright 1999 - Joseph Pranevich
+ *
+ * This is a driver to implement, when possible, "high-level"
+ * routines using only low level calls. This is to make it possible
+ * to have accelerated functions for the individual drivers...
+ * or to simply not bother with them.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 /* When creating new drivers, you need to assign all the functions that
    that driver supports into the driver struct. If it is a supplementary
@@ -15,9 +30,9 @@
 #include <stdio.h>
 
 #include "console.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(console);
+WINE_DEFAULT_DEBUG_CHANNEL(console);
 
 static void GENERIC_MoveLine(char row1, char row2, char col1, char col2);
 static void GENERIC_ClearLine(char row, char col1, char col2, int bgcolor,
diff --git a/console/interface.c b/console/interface.c
index 5d5c03ad74f..8d64e0cfcea 100644
--- a/console/interface.c
+++ b/console/interface.c
@@ -1,10 +1,26 @@
-/* interface.c */
-
-/* The primary purpose of this function is to provide CONSOLE_*
-   reotines that immediately call the appropiate driver handler.
-   This cleans up code in the individual modules considerably.
-   This could be done using a macro, but additional functionality
-   may be provided here in the future. */
+/*
+ * Copyright 1999 - Joseph Pranevich
+ *
+ * The primary purpose of this function is to provide CONSOLE_*
+ * routines that immediately call the appropriate driver handler.
+ * This cleans up code in the individual modules considerably.
+ * This could be done using a macro, but additional functionality
+ * may be provided here in the future.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include "config.h"
 
diff --git a/console/ncurses.c b/console/ncurses.c
index 73600c36da8..72b073d738d 100644
--- a/console/ncurses.c
+++ b/console/ncurses.c
@@ -1,5 +1,20 @@
-/* ncurses.c */
-/* Copyright 1999 - Joseph Pranevich */
+/*
+ * Copyright 1999 - Joseph Pranevich
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include "config.h"
 
@@ -23,10 +38,10 @@
    driver, it should make sure to perserve the old values. 
 */
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "options.h"
 
-DEFAULT_DEBUG_CHANNEL(console);
+WINE_DEFAULT_DEBUG_CHANNEL(console);
 
 #undef ERR /* Use ncurses's err() */
 #ifdef HAVE_NCURSES_H
diff --git a/console/tty.c b/console/tty.c
index 647af5cb9dd..278d5f85fbf 100644
--- a/console/tty.c
+++ b/console/tty.c
@@ -1,10 +1,24 @@
-/* tty.c */
-/* Copyright 1999 - Joseph Pranevich */
-
-/* This is the console driver for TTY-based consoles, i.e. consoles
-   without cursor placement, etc. It's also a pretty decent starting
-   point for other driers.
-*/
+/*
+ * Copyright 1999 - Joseph Pranevich
+ *
+ * This is the console driver for TTY-based consoles, i.e. consoles
+ * without cursor placement, etc. It's also a pretty decent starting
+ * point for other drivers.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 /* When creating new drivers, you need to assign all the functions that
    that driver supports into the driver struct. If it is a supplementary
diff --git a/console/xterm.c b/console/xterm.c
index 22d1e86700a..d74d9caf20f 100644
--- a/console/xterm.c
+++ b/console/xterm.c
@@ -1,12 +1,27 @@
-/* xterm.c */
-
-/* This "driver" is designed to go on top of an existing driver
-   to provide support for features only present if using an
-   xterm or compatible program for your console output. 
-   Currently, it supports resizing and separating debug messages from
-   program output.
-   It does not currently support changing the title bar.
-*/
+/*
+ * Copyright 1999 - Joseph Pranevich
+ *
+ * This "driver" is designed to go on top of an existing driver
+ * to provide support for features only present if using an
+ * xterm or compatible program for your console output. 
+ * Currently, it supports resizing and separating debug messages from
+ * program output.
+ * It does not currently support changing the title bar.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include "config.h"
 #include "wine/port.h"
@@ -27,9 +42,9 @@
 
 #include "console.h"
 #include "options.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(console);
+WINE_DEFAULT_DEBUG_CHANNEL(console);
 
 char console_xterm_prog[80];
 
diff --git a/controls/button.c b/controls/button.c
index 4edaaf5d853..c99512f8554 100644
--- a/controls/button.c
+++ b/controls/button.c
@@ -3,6 +3,20 @@
  * Copyright (C) 1993 Johannes Ruscheinski
  * Copyright (C) 1993 David Metcalfe
  * Copyright (C) 1994 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
diff --git a/controls/combo.c b/controls/combo.c
index f09969a27ec..3c29b6691bb 100644
--- a/controls/combo.c
+++ b/controls/combo.c
@@ -3,6 +3,20 @@
  * 
  * Copyright 1997 Alex Korobka
  * 
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * FIXME: roll up in Netscape 3.01.
  */
 
@@ -18,9 +32,9 @@
 #include "user.h"
 #include "win.h"
 #include "controls.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(combo);
+WINE_DEFAULT_DEBUG_CHANNEL(combo);
 
   /* bits in the dwKeyData */
 #define KEYDATA_ALT             0x2000
diff --git a/controls/desktop.c b/controls/desktop.c
index fbed461995b..73f00ea671a 100644
--- a/controls/desktop.c
+++ b/controls/desktop.c
@@ -2,6 +2,20 @@
  * Desktop window class.
  *
  * Copyright 1994 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
diff --git a/controls/edit.c b/controls/edit.c
index 1eb2c9cfa9e..d100a3fcdf2 100644
--- a/controls/edit.c
+++ b/controls/edit.c
@@ -5,6 +5,20 @@
  *	Copyright  William Magro, 1995, 1996
  *	Copyright  Frans van Dorsselaer, 1996, 1997
  *
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /*
@@ -25,11 +39,11 @@
 #include "controls.h"
 #include "local.h"
 #include "user.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(edit);
-DECLARE_DEBUG_CHANNEL(combo);
-DECLARE_DEBUG_CHANNEL(relay);
+WINE_DEFAULT_DEBUG_CHANNEL(edit);
+WINE_DECLARE_DEBUG_CHANNEL(combo);
+WINE_DECLARE_DEBUG_CHANNEL(relay);
 
 #define BUFLIMIT_MULTI		65534	/* maximum buffer size (not including '\0')
 					   FIXME: BTW, new specs say 65535 (do you dare ???) */
diff --git a/controls/icontitle.c b/controls/icontitle.c
index f3f62c42761..afe7dc50128 100644
--- a/controls/icontitle.c
+++ b/controls/icontitle.c
@@ -2,6 +2,20 @@
  * Icontitle window class.
  *
  * Copyright 1997 Alex Korobka
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
diff --git a/controls/listbox.c b/controls/listbox.c
index 65de3f18d04..e5667cd071a 100644
--- a/controls/listbox.c
+++ b/controls/listbox.c
@@ -2,6 +2,20 @@
  * Listbox controls
  *
  * Copyright 1996 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -17,10 +31,10 @@
 #include "spy.h"
 #include "user.h"
 #include "controls.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(listbox);
-DECLARE_DEBUG_CHANNEL(combo);
+WINE_DEFAULT_DEBUG_CHANNEL(listbox);
+WINE_DECLARE_DEBUG_CHANNEL(combo);
 
 /* Unimplemented yet:
  * - LBS_USETABSTOPS
diff --git a/controls/menu.c b/controls/menu.c
index be99d058a98..7ad400ccc37 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -4,6 +4,20 @@
  * Copyright 1993 Martin Ayotte
  * Copyright 1994 Alexandre Julliard
  * Copyright 1997 Morten Welinder
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /*
@@ -32,10 +46,10 @@
 #include "user.h"
 #include "message.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(menu);
-DECLARE_DEBUG_CHANNEL(accel);
+WINE_DEFAULT_DEBUG_CHANNEL(menu);
+WINE_DECLARE_DEBUG_CHANNEL(accel);
 
 /* internal popup menu window messages */
 
diff --git a/controls/scroll.c b/controls/scroll.c
index fcf09ce36f9..7e5c56e3fd1 100644
--- a/controls/scroll.c
+++ b/controls/scroll.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1993 Martin Ayotte
  * Copyright 1994, 1996 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
@@ -10,11 +24,11 @@
 #include "wine/winuser16.h"
 #include "controls.h"
 #include "win.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "user.h"
 #include "spy.h"
 
-DEFAULT_DEBUG_CHANNEL(scroll);
+WINE_DEFAULT_DEBUG_CHANNEL(scroll);
 
 typedef struct
 {
diff --git a/controls/static.c b/controls/static.c
index 40837bba20e..d573e118ff9 100644
--- a/controls/static.c
+++ b/controls/static.c
@@ -3,6 +3,19 @@
  *
  * Copyright  David W. Metcalfe, 1993
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
@@ -11,9 +24,9 @@
 #include "cursoricon.h"
 #include "controls.h"
 #include "user.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(static);
+WINE_DEFAULT_DEBUG_CHANNEL(static);
 
 static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style );
 static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style );
diff --git a/controls/uitools.c b/controls/uitools.c
index ef0db234cb1..7669246a8a5 100644
--- a/controls/uitools.c
+++ b/controls/uitools.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1997 Dimitrie O. Paun
  * Copyright 1997 Bertho A. Stultiens
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
@@ -10,9 +24,9 @@
 #include "wine/winuser16.h"
 #include "winuser.h"
 #include "user.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(graphics);
+WINE_DEFAULT_DEBUG_CHANNEL(graphics);
 
 static const WORD wPattern_AA55[8] = { 0xaaaa, 0x5555, 0xaaaa, 0x5555,
                                        0xaaaa, 0x5555, 0xaaaa, 0x5555 };
diff --git a/debugger/break.c b/debugger/break.c
index 15be1b4d985..2bc0e0cb8ea 100644
--- a/debugger/break.c
+++ b/debugger/break.c
@@ -4,6 +4,20 @@
  * Copyright 1994 Martin von Loewis
  * Copyright 1995 Alexandre Julliard
  * Copyright 1999,2000 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/debugger/dbg.y b/debugger/dbg.y
index bc370f17e66..45b971efda4 100644
--- a/debugger/dbg.y
+++ b/debugger/dbg.y
@@ -5,6 +5,20 @@
  * Copyright 1993 Eric Youngdale
  * Copyright 1995 Morten Welinder
  * Copyright 2000 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/debugger/debug.l b/debugger/debug.l
index e6f6f6ed96b..0774f06a76d 100644
--- a/debugger/debug.l
+++ b/debugger/debug.l
@@ -3,6 +3,20 @@
  *
  * Copyright 1993 Eric Youngdale
  *           2000 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 %{
diff --git a/debugger/debugger.h b/debugger/debugger.h
index a9bad40d678..b766ec66b69 100644
--- a/debugger/debugger.h
+++ b/debugger/debugger.h
@@ -2,6 +2,20 @@
  * Debugger definitions
  *
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_DEBUGGER_H
diff --git a/debugger/display.c b/debugger/display.c
index 2bf402ec47a..ce58c16219e 100644
--- a/debugger/display.c
+++ b/debugger/display.c
@@ -3,6 +3,19 @@
  *
  * Copyright (C) 1997, Eric Youngdale.
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
diff --git a/debugger/expr.c b/debugger/expr.c
index aa452391c0f..2144a44b98b 100644
--- a/debugger/expr.c
+++ b/debugger/expr.c
@@ -3,6 +3,19 @@
  *
  * Copyright (C) 1997, Eric Youngdale.
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/debugger/expr.h b/debugger/expr.h
index c2d19bd5a59..2b43846aef0 100644
--- a/debugger/expr.h
+++ b/debugger/expr.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 1997, Eric Youngdale.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #define EXP_OP_LOR		0x01
 #define EXP_OP_LAND		0x02
 #define EXP_OP_OR		0x03
diff --git a/debugger/ext_debugger.c b/debugger/ext_debugger.c
index 84dee52ac9d..636d16c3197 100644
--- a/debugger/ext_debugger.c
+++ b/debugger/ext_debugger.c
@@ -1,10 +1,21 @@
 /* 
- *  File    : external.c
- *  Author  : Kevin Holbrook
- *  Created : July 18, 1999
+ * Convenience functions to handle use of external debugger.
  *
- *  Convenience functions to handle use of external debugger.
+ * Copyright 1999 Kevin Holbrook
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 
@@ -45,7 +56,7 @@
  *
  * Usage:
  *
- *   #include "debugtools.h"
+ *   #include "wine/debug.h"
  *
  *   DEBUG_ExternalDebugger();
  *
diff --git a/debugger/hash.c b/debugger/hash.c
index a9abbda76d8..454ff8d5aac 100644
--- a/debugger/hash.c
+++ b/debugger/hash.c
@@ -2,6 +2,20 @@
  * File hash.c - generate hash tables for Wine debugger symbols
  *
  * Copyright (C) 1993, Eric Youngdale.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 
diff --git a/debugger/info.c b/debugger/info.c
index 31f4dee1899..149004959e3 100644
--- a/debugger/info.c
+++ b/debugger/info.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1993 Eric Youngdale
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/debugger/intvar.h b/debugger/intvar.h
index 65f068dd3b3..c63534f3984 100644
--- a/debugger/intvar.h
+++ b/debugger/intvar.h
@@ -1,8 +1,22 @@
 /* -*- tab-width: 8; c-basic-offset: 4 -*- */
 
 /* Wine internal debugger
- * Definitionz for internal variables
- * Eric Pouech (c) 2000
+ * Definitions for internal variables
+ * Copyright 2000 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
    /* break handling */
diff --git a/debugger/memory.c b/debugger/memory.c
index f6740b137b3..f8bcf743c7a 100644
--- a/debugger/memory.c
+++ b/debugger/memory.c
@@ -4,6 +4,20 @@
  * Copyright 1993 Eric Youngdale
  * Copyright 1995 Alexandre Julliard
  * Copyright 2000 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/debugger/module.c b/debugger/module.c
index dfc43abf40e..3ecd97d264e 100644
--- a/debugger/module.c
+++ b/debugger/module.c
@@ -4,6 +4,20 @@
  *
  * Copyright (C) 1993, Eric Youngdale.
  * 		 2000, Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "config.h"
 #include <stdlib.h>
diff --git a/debugger/msc.c b/debugger/msc.c
index b3311de294e..31911299e22 100644
--- a/debugger/msc.c
+++ b/debugger/msc.c
@@ -5,6 +5,20 @@
  * Copyright (C) 1996, Eric Youngdale.
  * Copyright (C) 1999, 2000, Ulrich Weigand.
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * Note - this handles reading debug information for 32 bit applications
  * that run under Windows-NT for example.  I doubt that this would work well
  * for 16 bit applications, but I don't think it really matters since the
diff --git a/debugger/registers.c b/debugger/registers.c
index ea953ca2d27..04b9b1e1257 100644
--- a/debugger/registers.c
+++ b/debugger/registers.c
@@ -2,6 +2,20 @@
  * Debugger register handling
  *
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/debugger/source.c b/debugger/source.c
index d7375242cbe..65fc73c6eb8 100644
--- a/debugger/source.c
+++ b/debugger/source.c
@@ -3,6 +3,19 @@
  *
  * Copyright (C) 1997, Eric Youngdale.
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/debugger/stabs.c b/debugger/stabs.c
index efe6e983051..70b8f91cf4f 100644
--- a/debugger/stabs.c
+++ b/debugger/stabs.c
@@ -5,6 +5,20 @@
  *
  * Copyright (C) 1996, Eric Youngdale.
  *		 1999, 2000 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/debugger/stack.c b/debugger/stack.c
index b892a0e8995..c0f460de267 100644
--- a/debugger/stack.c
+++ b/debugger/stack.c
@@ -4,6 +4,20 @@
  * Copyright 1995 Alexandre Julliard
  * Copyright 1996 Eric Youngdale
  * Copyright 1999 Ove Kåven
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/debugger/types.c b/debugger/types.c
index 94816bc7a83..c8cd76dd13e 100644
--- a/debugger/types.c
+++ b/debugger/types.c
@@ -3,7 +3,21 @@
  *
  * Copyright (C) 1997, Eric Youngdale.
  *
- * This really doesn't do much at the moment, but it forms the framework
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Note: This really doesn't do much at the moment, but it forms the framework
  * upon which full support for datatype handling will eventually be built.
  */
 
diff --git a/debugger/winedbg.c b/debugger/winedbg.c
index e52df277659..5ea7013bf89 100644
--- a/debugger/winedbg.c
+++ b/debugger/winedbg.c
@@ -2,7 +2,21 @@
 
 /* Wine internal debugger
  * Interface to Windows debugger API
- * Eric Pouech (c) 2000
+ * Copyright 2000 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c
index 7f9e99dd3ca..68a5b7807d4 100644
--- a/dlls/advapi32/advapi.c
+++ b/dlls/advapi32/advapi.c
@@ -2,6 +2,20 @@
  * Win32 advapi functions
  *
  * Copyright 1995 Sven Verdoolaege
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <errno.h>
@@ -15,9 +29,9 @@
 #include "winnls.h"
 #include "winerror.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(advapi);
+WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 /******************************************************************************
  * GetUserNameA [ADVAPI32.@]
diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c
index 061b8eaa2cd..f7b1a25efa8 100644
--- a/dlls/advapi32/crypt.c
+++ b/dlls/advapi32/crypt.c
@@ -1,5 +1,20 @@
 /*
- * dlls/advapi32/crypt.c
+ * Copyright 1999 Ian Schmidt
+ * Copyright 2001 Travis Michielsen
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 ///////////////////////
@@ -22,9 +37,9 @@
 #include "winreg.h"
 #include "winbase.h"
 #include "winuser.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(crypt);
+WINE_DEFAULT_DEBUG_CHANNEL(crypt);
 
 HWND crypt_hWindow = 0;
 
diff --git a/dlls/advapi32/crypt.h b/dlls/advapi32/crypt.h
index 257c83b66b2..61f6f0ee41f 100644
--- a/dlls/advapi32/crypt.h
+++ b/dlls/advapi32/crypt.h
@@ -2,6 +2,20 @@
  * Driver routines
  *
  * Copyright 2001 - Travis Michielsen
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_CRYPT_H
diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c
index fa749430614..0bd3877d7e1 100644
--- a/dlls/advapi32/eventlog.c
+++ b/dlls/advapi32/eventlog.c
@@ -2,6 +2,20 @@
  * Win32 advapi functions
  *
  * Copyright 1995 Sven Verdoolaege, 1998 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "winbase.h"
@@ -9,9 +23,9 @@
 #include "winerror.h"
 #include "heap.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(advapi);
+WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 /******************************************************************************
  * BackupEventLogA [ADVAPI32.@]
diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
index fe89cf08fa4..bb969e2d8e1 100644
--- a/dlls/advapi32/registry.c
+++ b/dlls/advapi32/registry.c
@@ -10,6 +10,20 @@
  *
  * This file is concerned about handle management and interaction with the Wine server.
  * Registry file I/O is in misc/registry.c.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -22,9 +36,9 @@
 #include "wine/unicode.h"
 #include "heap.h"
 #include "wine/server.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(reg);
+WINE_DEFAULT_DEBUG_CHANNEL(reg);
 
 
 /* check if value type needs string conversion (Ansi<->Unicode) */
diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
index e87c88daa11..44d59a9ae7e 100644
--- a/dlls/advapi32/security.c
+++ b/dlls/advapi32/security.c
@@ -1,7 +1,23 @@
 /*
- * dlls/advapi32/security.c
+ * Copyright 1999, 2000 Juergen Schmied <juergen.schmied@debitel.net>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  *  FIXME: for all functions thunking down to Rtl* functions:  implement SetLastError()
  */
+
 #include <string.h>
 
 #include "windef.h"
@@ -9,9 +25,9 @@
 #include "heap.h"
 #include "ntddk.h"
 #include "ntsecapi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(advapi);
+WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 #define CallWin32ToNt(func) \
 	{ NTSTATUS ret; \
diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c
index 4cbd596289a..55acfd216d9 100644
--- a/dlls/advapi32/service.c
+++ b/dlls/advapi32/service.c
@@ -2,6 +2,20 @@
  * Win32 advapi functions
  *
  * Copyright 1995 Sven Verdoolaege
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -13,9 +27,9 @@
 #include "winreg.h"
 #include "wine/unicode.h"
 #include "heap.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(advapi);
+WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 static DWORD   start_dwNumServiceArgs;
 static LPWSTR *start_lpServiceArgVectors;
diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c
index a4997d6f808..43a24f1e483 100644
--- a/dlls/avifil32/api.c
+++ b/dlls/avifil32/api.c
@@ -1,6 +1,20 @@
 /*
  * Copyright 1999 Marcus Meissner
  * Copyright 2001 Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -13,9 +27,9 @@
 #include "winerror.h"
 #include "ole2.h"
 #include "vfw.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(avifile);
+WINE_DEFAULT_DEBUG_CHANNEL(avifile);
 
 #include "avifile_private.h"
 
diff --git a/dlls/avifil32/avifile_private.h b/dlls/avifil32/avifile_private.h
index 7aaa60edfc6..756e55336aa 100644
--- a/dlls/avifil32/avifile_private.h
+++ b/dlls/avifil32/avifile_private.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2001 Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_AVIFILE_PRIVATE_H
 #define __WINE_AVIFILE_PRIVATE_H
 
diff --git a/dlls/avifil32/comentry.c b/dlls/avifil32/comentry.c
index 6f92babbecf..1ead934e8f0 100644
--- a/dlls/avifil32/comentry.c
+++ b/dlls/avifil32/comentry.c
@@ -1,5 +1,19 @@
 /*
  * Copyright 2001 Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -12,10 +26,10 @@
 #include "winerror.h"
 #include "ole2.h"
 #include "vfw.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "avifile_private.h"
 
-DEFAULT_DEBUG_CHANNEL(avifile);
+WINE_DEFAULT_DEBUG_CHANNEL(avifile);
 
 static HRESULT WINAPI
 IClassFactory_fnQueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj);
diff --git a/dlls/avifil32/iafile.c b/dlls/avifil32/iafile.c
index 131e89f4dc0..92b05ec419b 100644
--- a/dlls/avifil32/iafile.c
+++ b/dlls/avifil32/iafile.c
@@ -2,6 +2,20 @@
  * Copyright 1999 Marcus Meissner
  * Copyright 2001 Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * FIXME - implements editing/writing.
  */
 
@@ -14,10 +28,10 @@
 #include "mmsystem.h"
 #include "winerror.h"
 #include "vfw.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "avifile_private.h"
 
-DEFAULT_DEBUG_CHANNEL(avifile);
+WINE_DEFAULT_DEBUG_CHANNEL(avifile);
 
 #define	AVIFILE_STREAMS_MAX	4
 
diff --git a/dlls/avifil32/iastream.c b/dlls/avifil32/iastream.c
index 2a958b22e3a..bd76c3aab0a 100644
--- a/dlls/avifil32/iastream.c
+++ b/dlls/avifil32/iastream.c
@@ -1,5 +1,19 @@
 /*
  * Copyright 2001 Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -11,10 +25,10 @@
 #include "mmsystem.h"
 #include "winerror.h"
 #include "vfw.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "avifile_private.h"
 
-DEFAULT_DEBUG_CHANNEL(avifile);
+WINE_DEFAULT_DEBUG_CHANNEL(avifile);
 
 static HRESULT WINAPI IAVIStream_fnQueryInterface(IAVIStream*iface,REFIID refiid,LPVOID *obj);
 static ULONG WINAPI IAVIStream_fnAddRef(IAVIStream*iface);
diff --git a/dlls/avifil32/igframe.c b/dlls/avifil32/igframe.c
index 4964ec7005c..546a2fdcfb7 100644
--- a/dlls/avifil32/igframe.c
+++ b/dlls/avifil32/igframe.c
@@ -1,6 +1,20 @@
 /*
  * Copyright 2001 Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * FIXME - implements color space(depth) converter.
  */
 
@@ -13,10 +27,10 @@
 #include "mmsystem.h"
 #include "winerror.h"
 #include "vfw.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "avifile_private.h"
 
-DEFAULT_DEBUG_CHANNEL(avifile);
+WINE_DEFAULT_DEBUG_CHANNEL(avifile);
 
 static HRESULT WINAPI IGetFrame_fnQueryInterface(IGetFrame* iface,REFIID refiid,LPVOID *obj);
 static ULONG WINAPI IGetFrame_fnAddRef(IGetFrame* iface);
diff --git a/dlls/avifil32/main.c b/dlls/avifil32/main.c
index 71783d1933d..bb09d8783cf 100644
--- a/dlls/avifil32/main.c
+++ b/dlls/avifil32/main.c
@@ -1,5 +1,19 @@
 /*
  * Copyright 2001 Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -11,10 +25,10 @@
 #include "mmsystem.h"
 #include "winerror.h"
 #include "vfw.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "avifile_private.h"
 
-DEFAULT_DEBUG_CHANNEL(avifile);
+WINE_DEFAULT_DEBUG_CHANNEL(avifile);
 
 WINE_AVIFILE_DATA AVIFILE_data;
 
diff --git a/dlls/avifil32/string.c b/dlls/avifil32/string.c
index 562ec177d82..0c85d586d58 100644
--- a/dlls/avifil32/string.c
+++ b/dlls/avifil32/string.c
@@ -1,5 +1,19 @@
 /*
  * Copyright 2001 Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -11,10 +25,10 @@
 #include "mmsystem.h"
 #include "winerror.h"
 #include "vfw.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "avifile_private.h"
 
-DEFAULT_DEBUG_CHANNEL(avifile);
+WINE_DEFAULT_DEBUG_CHANNEL(avifile);
 
 
 /****************************************************************************
diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c
index dbcc02334c7..6b6e6a6952a 100644
--- a/dlls/comctl32/animate.c
+++ b/dlls/comctl32/animate.c
@@ -5,6 +5,20 @@
  * Copyright 1998, 1999 Eric Kohl
  * 		   1999 Eric Pouech
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * NOTES
  *   I will only improve this control once in a while.
  *     Eric <ekohl@abo.rhein-zeitung.de>
@@ -19,9 +33,9 @@
 #include "commctrl.h"
 #include "vfw.h"
 #include "mmsystem.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(animate);
+WINE_DEFAULT_DEBUG_CHANNEL(animate);
 
 static struct {
     HMODULE	hModule;
diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c
index 3cc712c9c5e..1da42e7aed0 100644
--- a/dlls/comctl32/comboex.c
+++ b/dlls/comctl32/comboex.c
@@ -1,4 +1,28 @@
 /*
+ * ComboBoxEx control v2 (mod6)
+ *
+ * Copyright 1998, 1999 Eric Kohl
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * NOTES
+ *   This is just a dummy control. An author is needed! Any volunteers?
+ *   I will only improve this control once in a while.
+ *     Eric <ekohl@abo.rhein-zeitung.de>
+ *
+ *
  * TODO   <-------------
  *  1. The following extended styles need to be implemented, use will
  *     result in a FIXME:
@@ -14,20 +38,8 @@
  *           I_INDENTCALLBACK
  *  3. No use is made of the iOverlay image.
  *  4. Notify CBEN_DRAGBEGIN is not implemented.
- */
-
-
-/*
- * ComboBoxEx control v2 (mod6)
- *
- * Copyright 1998, 1999 Eric Kohl
  *
- * NOTES
- *   This is just a dummy control. An author is needed! Any volunteers?
- *   I will only improve this control once in a while.
- *     Eric <ekohl@abo.rhein-zeitung.de>
  *
-
  * Changes  Guy Albertelli <galberte@neo.lrun.com>
  * v1  Implemented messages: CB_SETITEMHEIGHT, WM_WINDOWPOSCHANGING,
  *      WM_DRAWITEM, and WM_MEASUREITEM. Fixed WM_CREATE. Fixed height
@@ -84,15 +96,15 @@
 #include <string.h>
 #include "winbase.h"
 #include "commctrl.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "wine/unicode.h"
 
-DEFAULT_DEBUG_CHANNEL(comboex);
+WINE_DEFAULT_DEBUG_CHANNEL(comboex);
 /*
  * The following is necessary for the test done in COMBOEX_DrawItem
  * to determine whether to dump out the DRAWITEM structure or not.
  */
-DECLARE_DEBUG_CHANNEL(message);
+WINE_DECLARE_DEBUG_CHANNEL(message);
 
 /* Item structure */
 typedef struct
diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h
index b72cefc1f4e..120e096c323 100644
--- a/dlls/comctl32/comctl32.h
+++ b/dlls/comctl32/comctl32.h
@@ -5,6 +5,19 @@
  * Copyright 1999 Thuy Nguyen
  * Copyright 1999 Eric Kohl
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_COMCTL32_H
diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c
index f426b3cef16..fedd06a3f75 100644
--- a/dlls/comctl32/comctl32undoc.c
+++ b/dlls/comctl32/comctl32undoc.c
@@ -5,6 +5,20 @@
  *           1998 Juergen Schmied <j.schmied@metronet.de>
  *           2000 Eric Kohl for CodeWeavers
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * NOTES
  *     All of these functions are UNDOCUMENTED!! And I mean UNDOCUMENTED!!!!
  *     Do NOT rely on names or contents of undocumented structures and types!!!
@@ -30,9 +44,9 @@
 #include "wine/unicode.h"
 #include "comctl32.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(commctrl);
+WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
 
 
 extern HANDLE COMCTL32_hHeap; /* handle to the private heap */
diff --git a/dlls/comctl32/comctl_De.rc b/dlls/comctl32/comctl_De.rc
index 18bb4ab3a6f..77b80c5a1c4 100644
--- a/dlls/comctl32/comctl_De.rc
+++ b/dlls/comctl32/comctl_De.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000 Uwe Bonnes
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
diff --git a/dlls/comctl32/comctl_En.rc b/dlls/comctl32/comctl_En.rc
index 76e5a71ea46..8001d592792 100644
--- a/dlls/comctl32/comctl_En.rc
+++ b/dlls/comctl32/comctl_En.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1999 Eric Kohl
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c
index 1a999b729ba..7da5e590e4f 100644
--- a/dlls/comctl32/commctrl.c
+++ b/dlls/comctl32/commctrl.c
@@ -4,6 +4,19 @@
  * Copyright 1997 Dimitrie O. Paun
  * Copyright 1998,2000 Eric Kohl
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -16,9 +29,9 @@
 #define NO_SHLWAPI_STREAM
 #include "shlwapi.h"
 #include "comctl32.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(commctrl);
+WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
 
 extern void ANIMATE_Register(void);
 extern void ANIMATE_Unregister(void);
diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c
index 477b7a4dc40..e620dea5692 100644
--- a/dlls/comctl32/datetime.c
+++ b/dlls/comctl32/datetime.c
@@ -5,6 +5,19 @@
  * Copyright 1999, 2000 Alex Priem <alexp@sci.kun.nl>
  * Copyright 2000 Chris Morgan <cmorgan@wpi.edu>
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * TODO:
  *   - All messages.
@@ -19,9 +32,9 @@
 #include "winbase.h"
 #include "wingdi.h"
 #include "commctrl.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(datetime);
+WINE_DEFAULT_DEBUG_CHANNEL(datetime);
 
 typedef struct
 {
diff --git a/dlls/comctl32/draglist.c b/dlls/comctl32/draglist.c
index d7225c202aa..46364c84ee2 100644
--- a/dlls/comctl32/draglist.c
+++ b/dlls/comctl32/draglist.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1999 Eric Kohl
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * NOTES
  *   This is just a dummy control. An author is needed! Any volunteers?
  *   I will only improve this control once in a while.
@@ -13,9 +27,9 @@
  */
 
 #include "commctrl.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(commctrl);
+WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
 
 
 static DWORD dwLastScrollTime = 0;
diff --git a/dlls/comctl32/flatsb.c b/dlls/comctl32/flatsb.c
index 774f8e4a161..a4bdb3fd925 100644
--- a/dlls/comctl32/flatsb.c
+++ b/dlls/comctl32/flatsb.c
@@ -4,6 +4,20 @@
  * Copyright 1998, 1999 Eric Kohl
  * Copyright 1998 Alex Priem
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * NOTES
  *   This is just a dummy control. An author is needed! Any volunteers?
  *   I will only improve this control once in a while.
@@ -19,9 +33,9 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "commctrl.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(commctrl);
+WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
 
 typedef struct
 {
diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c
index d4cdda2a908..29b35cf14d2 100644
--- a/dlls/comctl32/header.c
+++ b/dlls/comctl32/header.c
@@ -4,6 +4,20 @@
  *  Copyright 1998 Eric Kohl
  *  Copyright 2000 Eric Kohl for CodeWeavers
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  *  TODO:
  *   - Imagelist support (partially).
  *   - Callback items (under construction).
@@ -24,9 +38,9 @@
 #include "commctrl.h"
 #include "comctl32.h"
 #include "imagelist.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(header);
+WINE_DEFAULT_DEBUG_CHANNEL(header);
 
 typedef struct 
 {
diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c
index 349a5a40347..55aa230276a 100644
--- a/dlls/comctl32/hotkey.c
+++ b/dlls/comctl32/hotkey.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1998, 1999 Eric Kohl
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * NOTES
  *   Development in progress. An author is needed! Any volunteers?
  *   I will only improve this control once in a while.
@@ -16,9 +30,9 @@
 #include <string.h>
 #include "winbase.h"
 #include "commctrl.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(hotkey);
+WINE_DEFAULT_DEBUG_CHANNEL(hotkey);
 
 typedef struct tagHOTKEY_INFO
 {
diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
index 7aa5c3e3f36..01bbcbf062b 100644
--- a/dlls/comctl32/imagelist.c
+++ b/dlls/comctl32/imagelist.c
@@ -6,6 +6,20 @@
  *            2001 Michael Stefaniuc
  *            2001 Charles Loep for CodeWeavers
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  *  TODO:
  *    - Fix ImageList_DrawIndirect (xBitmap, yBitmap, rgbFg, rgbBk, dwRop).
  *    - Fix ImageList_GetIcon.
@@ -36,9 +50,9 @@
 #include "wine/obj_storage.h"
 #include "commctrl.h"
 #include "imagelist.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(imagelist);
+WINE_DEFAULT_DEBUG_CHANNEL(imagelist);
 
 
 #define MAX_OVERLAYIMAGE 15
diff --git a/dlls/comctl32/imagelist.h b/dlls/comctl32/imagelist.h
index e710466b1e3..d23166f72c9 100644
--- a/dlls/comctl32/imagelist.h
+++ b/dlls/comctl32/imagelist.h
@@ -2,6 +2,20 @@
  * ImageList definitions
  *
  * Copyright 1998 Eric Kohl
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
  
 #ifndef __WINE_IMAGELIST_H
diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c
index 1d9616c84cd..dc97321562d 100644
--- a/dlls/comctl32/ipaddress.c
+++ b/dlls/comctl32/ipaddress.c
@@ -6,6 +6,20 @@
  * Copyright 1998, 1999 Eric Kohl
  * Copyright 1998 Alex Priem <alexp@sci.kun.nl>
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * NOTES
  *
  * TODO:
@@ -28,9 +42,9 @@
 
 #include "winbase.h"
 #include "commctrl.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ipaddress);
+WINE_DEFAULT_DEBUG_CHANNEL(ipaddress);
 
 typedef struct
 {
diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index 485df24a27c..a948d701baf 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -7,6 +7,20 @@
  * Copyright 2001 Codeweavers Inc.
  * Copyright 2002 Dimitrie O. Paun
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * NOTES
  * Listview control implementation. 
  *
@@ -54,9 +68,9 @@
 #include "winnt.h"
 #include "heap.h"
 #include "commctrl.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(listview);
+WINE_DEFAULT_DEBUG_CHANNEL(listview);
 
 /* Some definitions for inline edit control */    
 typedef BOOL (*EditlblCallbackW)(HWND, LPWSTR, DWORD);
diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c
index 2a758cc3014..ec1b87d19f0 100644
--- a/dlls/comctl32/monthcal.c
+++ b/dlls/comctl32/monthcal.c
@@ -7,6 +7,20 @@
  *		  James Abbatiello <abbeyj@wpi.edu>
  * Copyright 2000 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * TODO:
  *   - Notifications.
  *
@@ -28,9 +42,9 @@
 #include "winnls.h"
 #include "commctrl.h"
 #include "comctl32.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(monthcal);
+WINE_DEFAULT_DEBUG_CHANNEL(monthcal);
 
 #define MC_SEL_LBUTUP	    1	/* Left button released */
 #define MC_SEL_LBUTDOWN	    2	/* Left button pressed in calendar */
diff --git a/dlls/comctl32/nativefont.c b/dlls/comctl32/nativefont.c
index 0ac909c149a..bc9e4f883b0 100644
--- a/dlls/comctl32/nativefont.c
+++ b/dlls/comctl32/nativefont.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1998, 1999 Eric Kohl
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * NOTES
  *   This is just a dummy control. An author is needed! Any volunteers?
  *   I will only improve this control once in a while.
@@ -16,9 +30,9 @@
 #include <string.h>
 #include "winbase.h"
 #include "commctrl.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(nativefont);
+WINE_DEFAULT_DEBUG_CHANNEL(nativefont);
 
 typedef struct
 {
diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c
index c15f188a1dc..247906e77fa 100644
--- a/dlls/comctl32/pager.c
+++ b/dlls/comctl32/pager.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1998, 1999 Eric Kohl
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * NOTES
  *    Tested primarily with the controlspy Pager application.
  *       Susan Farley (susan@codeweavers.com)
@@ -17,9 +31,9 @@
 #include <string.h>
 #include "winbase.h"
 #include "commctrl.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(pager);
+WINE_DEFAULT_DEBUG_CHANNEL(pager);
 
 typedef struct
 {
diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c
index 5708150f6f5..9b83fef5d41 100644
--- a/dlls/comctl32/progress.c
+++ b/dlls/comctl32/progress.c
@@ -4,14 +4,27 @@
  * Copyright 1997, 2002 Dimitrie O. Paun
  * Copyright 1998, 1999 Eric Kohl
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
 #include "winbase.h"
 #include "commctrl.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(progress);
+WINE_DEFAULT_DEBUG_CHANNEL(progress);
 
 typedef struct
 {
diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c
index aead13a6636..8098a58be6e 100644
--- a/dlls/comctl32/propsheet.c
+++ b/dlls/comctl32/propsheet.c
@@ -4,6 +4,20 @@
  * Copyright 1998 Francis Beaudet
  * Copyright 1999 Thuy Nguyen
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * TODO:
  *   - Tab order
  *   - Unicode property sheets
@@ -15,7 +29,7 @@
 #include "prsht.h"
 #include "winnls.h"
 #include "comctl32.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "heap.h"
 
 
@@ -145,7 +159,7 @@ static BOOL PROPSHEET_DoCommand(HWND hwnd, WORD wID);
 BOOL WINAPI
 PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
-DEFAULT_DEBUG_CHANNEL(propsheet);
+WINE_DEFAULT_DEBUG_CHANNEL(propsheet);
 
 #define add_flag(a) if (dwFlags & a) {strcat(string, #a );strcat(string," ");}
 /******************************************************************************
diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
index 5dce2573d1a..2c4931443ad 100644
--- a/dlls/comctl32/rebar.c
+++ b/dlls/comctl32/rebar.c
@@ -24,6 +24,20 @@
  *
  * Copyright 1998, 1999 Eric Kohl
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * NOTES
  *   An author is needed! Any volunteers?
  *   I will only improve this control once in a while.
@@ -127,9 +141,9 @@
 #include "wine/unicode.h"
 #include "commctrl.h"
 /* #include "spy.h" */
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(rebar);
+WINE_DEFAULT_DEBUG_CHANNEL(rebar);
 
 typedef struct
 {
diff --git a/dlls/comctl32/rsrc.rc b/dlls/comctl32/rsrc.rc
index 75d67331573..b8b7a2c827d 100644
--- a/dlls/comctl32/rsrc.rc
+++ b/dlls/comctl32/rsrc.rc
@@ -1,6 +1,22 @@
 /*
  * Top level resource file for Common Controls
  *
+ * Copyright 1999 Bertho Stultiens
+ * Copyright 1999 Eric Kohl
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
diff --git a/dlls/comctl32/smoothscroll.c b/dlls/comctl32/smoothscroll.c
index e3bf9b65dc2..dd1683d2f98 100644
--- a/dlls/comctl32/smoothscroll.c
+++ b/dlls/comctl32/smoothscroll.c
@@ -3,6 +3,20 @@
  *
  * Copyright 2000 Marcus Meissner <marcus@jet.franken.de>
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * TODO
  *     - actually add smooth scrolling
  */
@@ -11,9 +25,9 @@
 #include "winreg.h"
 #include "winerror.h"
 #include "commctrl.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(commctrl);
+WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
 
 static DWORD	smoothscroll = 2;
 
diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c
index da3f3d35828..a0d0cf2f875 100644
--- a/dlls/comctl32/status.c
+++ b/dlls/comctl32/status.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1996 Bruce Milner
  * Copyright 1998, 1999 Eric Kohl
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 /*
  * FIXME/TODO
@@ -16,9 +30,9 @@
 #include "winbase.h"
 #include "wine/unicode.h"
 #include "commctrl.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(statusbar);
+WINE_DEFAULT_DEBUG_CHANNEL(statusbar);
 
 typedef struct
 {
diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c
index c9704023e6b..59e23f16ddf 100644
--- a/dlls/comctl32/tab.c
+++ b/dlls/comctl32/tab.c
@@ -5,6 +5,20 @@
  * Copyright 1999 Alex Priem <alexp@sci.kun.nl>
  * Copyright 1999 Francis Beaudet
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * TODO:
  *  Image list support
  *  Unicode support (under construction)
@@ -18,10 +32,10 @@
 #include "winbase.h"
 #include "commctrl.h"
 #include "comctl32.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include <math.h>
 
-DEFAULT_DEBUG_CHANNEL(tab);
+WINE_DEFAULT_DEBUG_CHANNEL(tab);
 
 typedef struct
 {
diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index 6eff4e50656..11a0084ee4a 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -4,6 +4,20 @@
  * Copyright 1998,1999 Eric Kohl
  * Copyright 2000 Eric Kohl for CodeWeavers
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  *  Differences between MSDN and actual native control operation:
  *   1. MSDN says: "TBSTYLE_LIST: Creates a flat toolbar with button text
  *                  to the right of the bitmap. Otherwise, this style is
@@ -55,9 +69,9 @@
 #include "commctrl.h"
 #include "imagelist.h"
 #include "comctl32.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(toolbar);
+WINE_DEFAULT_DEBUG_CHANNEL(toolbar);
 
 typedef struct
 {
diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c
index 712f38dcae7..4c3887e4e3e 100644
--- a/dlls/comctl32/tooltips.c
+++ b/dlls/comctl32/tooltips.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1998, 1999 Eric Kohl
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * TODO:
  *   - Unicode support (started).
  *   - Custom draw support.
@@ -62,9 +76,9 @@
 #include "winbase.h"
 #include "wine/unicode.h"
 #include "commctrl.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(tooltips);
+WINE_DEFAULT_DEBUG_CHANNEL(tooltips);
 
 typedef struct
 {
diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c
index 2a356b58d6f..4bc2e595432 100644
--- a/dlls/comctl32/trackbar.c
+++ b/dlls/comctl32/trackbar.c
@@ -4,6 +4,19 @@
  * Copyright 1998, 1999 Eric Kohl <ekohl@abo.rhein-zeitung.de>
  * Copyright 1998,1999 Alex Priem <alexp@sci.kun.nl>
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * TODO:
  *   - Some messages.
@@ -26,9 +39,9 @@
 
 #include "winbase.h"
 #include "commctrl.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(trackbar);
+WINE_DEFAULT_DEBUG_CHANNEL(trackbar);
 
 typedef struct
 {
diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index ec7d73c1fb5..649ba1faaba 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -4,6 +4,20 @@
  * Copyright 1998,1999 Alex Priem <alexp@sci.kun.nl>
  * Copyright 1999 Sylvain St-Germain
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * Note that TREEVIEW_INFO * and HTREEITEM are the same thing.
  *
  * Note2: All items always! have valid (allocated) pszText field.
@@ -34,7 +48,7 @@
 #include "wingdi.h"
 #include "commctrl.h"
 #include "comctl32.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 /* internal structures */
 
@@ -150,7 +164,7 @@ VOID TREEVIEW_Register (VOID);
 VOID TREEVIEW_Unregister (VOID);
 
 
-DEFAULT_DEBUG_CHANNEL(treeview);
+WINE_DEFAULT_DEBUG_CHANNEL(treeview);
 
 
 #define TEXT_CALLBACK_SIZE 260
diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c
index ee67fea14b7..a08b6e044e4 100644
--- a/dlls/comctl32/updown.c
+++ b/dlls/comctl32/updown.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1997 Dimitrie O. Paun
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * TODO:
  *   - I think I do not handle correctly the WS_BORDER style.
  *     (Should be fixed. <ekohl@abo.rhein-zeitung.de>)
@@ -31,9 +45,9 @@
 #include "winuser.h"
 #include "commctrl.h"
 #include "winnls.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(updown);
+WINE_DEFAULT_DEBUG_CHANNEL(updown);
 
 #define UPDOWN_BUDDYCLASSNAMELEN 40
 
diff --git a/dlls/commdlg/cdlg.h b/dlls/commdlg/cdlg.h
index aca356a60ae..9fb24e94d70 100644
--- a/dlls/commdlg/cdlg.h
+++ b/dlls/commdlg/cdlg.h
@@ -2,6 +2,20 @@
  *  Common Dialog Boxes interface (32 bit)
  *
  * Copyright 1998 Bertho A. Stultiens
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef _WINE_DLL_CDLG_H
diff --git a/dlls/commdlg/cdlg32.c b/dlls/commdlg/cdlg32.c
index 0ac3f55d4d7..faa143a2eac 100644
--- a/dlls/commdlg/cdlg32.c
+++ b/dlls/commdlg/cdlg32.c
@@ -3,15 +3,29 @@
  *  Find/Replace
  *
  * Copyright 1999 Bertho A. Stultiens
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "winbase.h"
 #include "wine/winbase16.h"
 #include "commdlg.h"
 #include "cderr.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(commdlg);
+WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 
 #include "cdlg.h"
 
diff --git a/dlls/commdlg/cdlg_Ca.rc b/dlls/commdlg/cdlg_Ca.rc
index 6c217e3927b..51c9f4ab231 100644
--- a/dlls/commdlg/cdlg_Ca.rc
+++ b/dlls/commdlg/cdlg_Ca.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Marc Huguet Puig
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
diff --git a/dlls/commdlg/cdlg_Cs.rc b/dlls/commdlg/cdlg_Cs.rc
index cb05794dc6c..fb94c83440d 100644
--- a/dlls/commdlg/cdlg_Cs.rc
+++ b/dlls/commdlg/cdlg_Cs.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1996 Roman Dolejsi
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
diff --git a/dlls/commdlg/cdlg_Da.rc b/dlls/commdlg/cdlg_Da.rc
index 5d80b10c66f..09c7312f8a8 100644
--- a/dlls/commdlg/cdlg_Da.rc
+++ b/dlls/commdlg/cdlg_Da.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1995 Morten Welinder
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
diff --git a/dlls/commdlg/cdlg_De.rc b/dlls/commdlg/cdlg_De.rc
index 84f7bd27380..b04360b00a5 100644
--- a/dlls/commdlg/cdlg_De.rc
+++ b/dlls/commdlg/cdlg_De.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1994 Martin von Loewis
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
diff --git a/dlls/commdlg/cdlg_En.rc b/dlls/commdlg/cdlg_En.rc
index 0dd844244b2..225411562d0 100644
--- a/dlls/commdlg/cdlg_En.rc
+++ b/dlls/commdlg/cdlg_En.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
diff --git a/dlls/commdlg/cdlg_Eo.rc b/dlls/commdlg/cdlg_Eo.rc
index 0d3dced4652..c31919c5d0e 100644
--- a/dlls/commdlg/cdlg_Eo.rc
+++ b/dlls/commdlg/cdlg_Eo.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1996 Duncan C Thomson
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
diff --git a/dlls/commdlg/cdlg_Es.rc b/dlls/commdlg/cdlg_Es.rc
index e1ac37a5e89..6155f11558a 100644
--- a/dlls/commdlg/cdlg_Es.rc
+++ b/dlls/commdlg/cdlg_Es.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1995 Jon Tombs
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
diff --git a/dlls/commdlg/cdlg_Fi.rc b/dlls/commdlg/cdlg_Fi.rc
index 0ea15d60716..a9130a28003 100644
--- a/dlls/commdlg/cdlg_Fi.rc
+++ b/dlls/commdlg/cdlg_Fi.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1995 Jukka Iivonen
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
diff --git a/dlls/commdlg/cdlg_Fr.rc b/dlls/commdlg/cdlg_Fr.rc
index 8a07a050545..c37b228f561 100644
--- a/dlls/commdlg/cdlg_Fr.rc
+++ b/dlls/commdlg/cdlg_Fr.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
diff --git a/dlls/commdlg/cdlg_Hu.rc b/dlls/commdlg/cdlg_Hu.rc
index 551c7954efb..127cddcac77 100644
--- a/dlls/commdlg/cdlg_Hu.rc
+++ b/dlls/commdlg/cdlg_Hu.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1997 John Zero
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 OPEN_FILE DIALOG 36, 24, 275, 134
diff --git a/dlls/commdlg/cdlg_It.rc b/dlls/commdlg/cdlg_It.rc
index ff27f61e632..9d3a9577f2e 100644
--- a/dlls/commdlg/cdlg_It.rc
+++ b/dlls/commdlg/cdlg_It.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1996 Tristan Tarrant
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
diff --git a/dlls/commdlg/cdlg_Ja.rc b/dlls/commdlg/cdlg_Ja.rc
index 13b1112bc4d..77be2f9e9a7 100644
--- a/dlls/commdlg/cdlg_Ja.rc
+++ b/dlls/commdlg/cdlg_Ja.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000 Junichi Kuchinishi
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
diff --git a/dlls/commdlg/cdlg_Ko.rc b/dlls/commdlg/cdlg_Ko.rc
index ce728dbe340..2f9dab7ab5e 100644
--- a/dlls/commdlg/cdlg_Ko.rc
+++ b/dlls/commdlg/cdlg_Ko.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1996 Bang Jun Young
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
diff --git a/dlls/commdlg/cdlg_Nl.rc b/dlls/commdlg/cdlg_Nl.rc
index d7f257191cf..620c0bd5ef8 100644
--- a/dlls/commdlg/cdlg_Nl.rc
+++ b/dlls/commdlg/cdlg_Nl.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1999 Klaas van Gend
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
diff --git a/dlls/commdlg/cdlg_No.rc b/dlls/commdlg/cdlg_No.rc
index f0948380f49..c0f8cd4f683 100644
--- a/dlls/commdlg/cdlg_No.rc
+++ b/dlls/commdlg/cdlg_No.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1994 Dag Asheim
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
diff --git a/dlls/commdlg/cdlg_Pl.rc b/dlls/commdlg/cdlg_Pl.rc
index 7ac49d0467d..97d365b3066 100644
--- a/dlls/commdlg/cdlg_Pl.rc
+++ b/dlls/commdlg/cdlg_Pl.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1997 Mikolaj Zalewski
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 /* LTEXT "Wyswietl pliki &typu:", 1089, 6, 104, 90, 9 */
diff --git a/dlls/commdlg/cdlg_Pt.rc b/dlls/commdlg/cdlg_Pt.rc
index 734a65a84b3..3e00cb53938 100644
--- a/dlls/commdlg/cdlg_Pt.rc
+++ b/dlls/commdlg/cdlg_Pt.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1997 Ricardo R. Massaro
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
diff --git a/dlls/commdlg/cdlg_Ru.rc b/dlls/commdlg/cdlg_Ru.rc
index 861799e1ff4..3c54ac18562 100644
--- a/dlls/commdlg/cdlg_Ru.rc
+++ b/dlls/commdlg/cdlg_Ru.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1999 Alexander Kanavin
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
diff --git a/dlls/commdlg/cdlg_Sk.rc b/dlls/commdlg/cdlg_Sk.rc
index 7168eeb5ada..5319e8ea254 100644
--- a/dlls/commdlg/cdlg_Sk.rc
+++ b/dlls/commdlg/cdlg_Sk.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000 Simen Zamecnik
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 
 /* Slovak strings in CP1250 */
diff --git a/dlls/commdlg/cdlg_Sv.rc b/dlls/commdlg/cdlg_Sv.rc
index 0fac3021b62..929f1097258 100644
--- a/dlls/commdlg/cdlg_Sv.rc
+++ b/dlls/commdlg/cdlg_Sv.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Karl Backström
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
diff --git a/dlls/commdlg/cdlg_Wa.rc b/dlls/commdlg/cdlg_Wa.rc
index a875d0a4f43..1ecbc4e27e3 100644
--- a/dlls/commdlg/cdlg_Wa.rc
+++ b/dlls/commdlg/cdlg_Wa.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1999 Pablo Saratxaga
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_WALON, SUBLANG_DEFAULT
 
 /* 
diff --git a/dlls/commdlg/cdlg_Zh.rc b/dlls/commdlg/cdlg_Zh.rc
index b2f1e7ace54..3a7beb6cbc6 100644
--- a/dlls/commdlg/cdlg_Zh.rc
+++ b/dlls/commdlg/cdlg_Zh.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000 Aric Stewart
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
diff --git a/dlls/commdlg/cdlg_xx.rc b/dlls/commdlg/cdlg_xx.rc
index 53cb1b0a061..2e08dbcb5a3 100644
--- a/dlls/commdlg/cdlg_xx.rc
+++ b/dlls/commdlg/cdlg_xx.rc
@@ -1,5 +1,22 @@
 /*
  * Language neutral resources for Common Dialogs
+ *
+ * Copyright 1999 Bertho Stultiens
+ * Copyright 1999 Klaas van Gend
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "winver.h"
diff --git a/dlls/commdlg/colordlg.c b/dlls/commdlg/colordlg.c
index 5f19daebae9..d08e6a8d4ef 100644
--- a/dlls/commdlg/colordlg.c
+++ b/dlls/commdlg/colordlg.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1994 Martin Ayotte
  * Copyright 1996 Albrecht Kleine
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* BUGS : still seems to not refresh correctly
@@ -20,10 +34,10 @@
 #include "wine/winuser16.h"
 #include "commdlg.h"
 #include "dlgs.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "cderr.h"
 
-DEFAULT_DEBUG_CHANNEL(commdlg);
+WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 
 #include "cdlg.h"
 
diff --git a/dlls/commdlg/filedlg.c b/dlls/commdlg/filedlg.c
index a09dabb31b2..daf5c3cd480 100644
--- a/dlls/commdlg/filedlg.c
+++ b/dlls/commdlg/filedlg.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1994 Martin Ayotte
  * Copyright 1996 Albrecht Kleine
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <ctype.h>
 #include <stdlib.h>
@@ -17,10 +31,10 @@
 #include "wine/unicode.h"
 #include "heap.h"
 #include "commdlg.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "cderr.h"
 
-DEFAULT_DEBUG_CHANNEL(commdlg);
+WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 
 #include "cdlg.h"
 
diff --git a/dlls/commdlg/filedlg95.c b/dlls/commdlg/filedlg95.c
index d14312855a6..5aa9827f276 100644
--- a/dlls/commdlg/filedlg95.c
+++ b/dlls/commdlg/filedlg95.c
@@ -1,6 +1,23 @@
 /*
  * COMMDLG - File Open Dialogs Win95 look and feel
  *
+ * Copyright 1999 Francois Boisvert
+ * Copyright 1999, 2000 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * FIXME: The whole concept of handling unicode is badly broken.
  *	many hook-messages expecting a pointer to a
  *	OPENFILENAMEA or W structure. With the current architecture
@@ -45,7 +62,7 @@
 #include "commdlg.h"
 #include "dlgs.h"
 #include "cdlg.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "cderr.h"
 #include "shellapi.h"
 #include "shlguid.h"
@@ -53,7 +70,7 @@
 #include "shlwapi.h"
 #include "wine/obj_contextmenu.h"
 
-DEFAULT_DEBUG_CHANNEL(commdlg);
+WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 
 #define UNIMPLEMENTED_FLAGS \
 (OFN_CREATEPROMPT | OFN_DONTADDTORECENT |\
diff --git a/dlls/commdlg/filedlgbrowser.c b/dlls/commdlg/filedlgbrowser.c
index c5d071ebbce..26532459cb6 100644
--- a/dlls/commdlg/filedlgbrowser.c
+++ b/dlls/commdlg/filedlgbrowser.c
@@ -1,7 +1,22 @@
 /*
  *  Implementation of IShellBrowser for the File Open common dialog
  * 
+ * Copyright 1999 Francois Boisvert
+ * Copyright 1999, 2000 Juergen Schmied
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
@@ -20,9 +35,9 @@
 #include "cdlg.h"
 #include "shlguid.h"
 #include "wine/obj_serviceprovider.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(commdlg);
+WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 
 typedef struct
 {
diff --git a/dlls/commdlg/filedlgbrowser.h b/dlls/commdlg/filedlgbrowser.h
index 5329405f116..7bd22aee5a0 100644
--- a/dlls/commdlg/filedlgbrowser.h
+++ b/dlls/commdlg/filedlgbrowser.h
@@ -1,11 +1,26 @@
 /*
  *  Implementation of IShellBrowser for the File Open common dialog
  * 
+ * Copyright 1999 Francois Boisvert
+ * Copyright 1999, 2000 Juergen Schmied
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef SHBROWSER_H
-#define SHBROWSER_H TRUE
+#define SHBROWSER_H
 
 #include "shlobj.h"
 #include "winbase.h"
diff --git a/dlls/commdlg/filetitle.c b/dlls/commdlg/filetitle.c
index d378f908987..8c610756b30 100644
--- a/dlls/commdlg/filetitle.c
+++ b/dlls/commdlg/filetitle.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1994 Martin Ayotte
  * Copyright 1996 Albrecht Kleine
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -10,11 +24,11 @@
 #include "winbase.h"
 #include "winnls.h"
 #include "commdlg.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "heap.h"	/* Has to go */
 
-DEFAULT_DEBUG_CHANNEL(commdlg);
+WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 
 #include "cdlg.h"
 
diff --git a/dlls/commdlg/finddlg.c b/dlls/commdlg/finddlg.c
index 02d52f255ad..269ccb43e38 100644
--- a/dlls/commdlg/finddlg.c
+++ b/dlls/commdlg/finddlg.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1994 Martin Ayotte
  * Copyright 1996 Albrecht Kleine
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <ctype.h>
@@ -12,10 +26,10 @@
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
 #include "commdlg.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "cderr.h"
 
-DEFAULT_DEBUG_CHANNEL(commdlg);
+WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 
 #include "cdlg.h"
 
diff --git a/dlls/commdlg/finddlg32.c b/dlls/commdlg/finddlg32.c
index 4843e28d414..77880495772 100644
--- a/dlls/commdlg/finddlg32.c
+++ b/dlls/commdlg/finddlg32.c
@@ -3,6 +3,20 @@
  *  Find/Replace
  *
  * Copyright 1998,1999 Bertho A. Stultiens
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -14,9 +28,9 @@
 #include "commdlg.h"
 #include "cderr.h"
 #include "dlgs.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(commdlg);
+WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 
 #include "cdlg.h"
 
diff --git a/dlls/commdlg/fontdlg.c b/dlls/commdlg/fontdlg.c
index 13579e93022..fd4618bf0fe 100644
--- a/dlls/commdlg/fontdlg.c
+++ b/dlls/commdlg/fontdlg.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1994 Martin Ayotte
  * Copyright 1996 Albrecht Kleine
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <ctype.h>
@@ -18,10 +32,10 @@
 #include "heap.h"
 #include "commdlg.h"
 #include "dlgs.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "cderr.h"
 
-DEFAULT_DEBUG_CHANNEL(commdlg);
+WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 
 #include "cdlg.h"
 
diff --git a/dlls/commdlg/generic.c b/dlls/commdlg/generic.c
index 89c08f33dd2..097f0451403 100644
--- a/dlls/commdlg/generic.c
+++ b/dlls/commdlg/generic.c
@@ -5,13 +5,27 @@
  * Copyright 1996 Albrecht Kleine
  * Copyright 1998,1999 Bertho Stultiens
  * Copyright 1999 Klaas van Gend
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "winbase.h"
 #include "commdlg.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(commdlg);
+WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 
 #include "cdlg.h"
 
diff --git a/dlls/commdlg/printdlg.c b/dlls/commdlg/printdlg.c
index b876ab10660..9a57a868019 100644
--- a/dlls/commdlg/printdlg.c
+++ b/dlls/commdlg/printdlg.c
@@ -5,6 +5,20 @@
  * Copyright 1996 Albrecht Kleine
  * Copyright 1999 Klaas van Gend
  * Copyright 2000 Huw D M Davies
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <ctype.h>
 #include <stdlib.h>
@@ -18,12 +32,12 @@
 #include "wine/winuser16.h"
 #include "commdlg.h"
 #include "dlgs.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "cderr.h"
 #include "winspool.h"
 #include "winerror.h"
 
-DEFAULT_DEBUG_CHANNEL(commdlg);
+WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 
 #include "cdlg.h"
 
diff --git a/dlls/commdlg/rsrc.rc b/dlls/commdlg/rsrc.rc
index 447a51ba7d6..f8f22b66f8a 100644
--- a/dlls/commdlg/rsrc.rc
+++ b/dlls/commdlg/rsrc.rc
@@ -1,6 +1,21 @@
 /*
  * Top level resource file for Common Dialogs
  *
+ * Copyright 1999 Bertho Stultiens
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
diff --git a/dlls/crtdll/crtdll_main.c b/dlls/crtdll/crtdll_main.c
index fd6ffa02c55..75b51abf7f1 100644
--- a/dlls/crtdll/crtdll_main.c
+++ b/dlls/crtdll/crtdll_main.c
@@ -2,13 +2,27 @@
  * Old C RunTime DLL - All functionality is provided by msvcrt.
  *
  * Copyright 2000 Jon Griffiths
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "config.h"
 #include "windef.h"
 #include "winbase.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(crtdll);
+WINE_DEFAULT_DEBUG_CHANNEL(crtdll);
 
 /* from msvcrt */
 extern void __getmainargs( int *argc, char ***argv, char ***envp,
diff --git a/dlls/dciman32/dciman_main.c b/dlls/dciman32/dciman_main.c
index 4d210624fd0..f4e2c60df7e 100644
--- a/dlls/dciman32/dciman_main.c
+++ b/dlls/dciman32/dciman_main.c
@@ -3,13 +3,27 @@
  * "Device Context Interface" ?
  * 
  * Copyright 2000 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
 
 #include "winbase.h"
 #include "winerror.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 /***********************************************************************
  *		DCIOpenProvider (DCIMAN32.@)
diff --git a/dlls/ddraw/convert.c b/dlls/ddraw/convert.c
index 9091c194a00..eeeb8492c95 100644
--- a/dlls/ddraw/convert.c
+++ b/dlls/ddraw/convert.c
@@ -1,8 +1,26 @@
+/*
+ * Copyright 2000 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <string.h>
 #include "ddraw_private.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 /* *************************************
       16 / 15 bpp to palettized 8 bpp
diff --git a/dlls/ddraw/d3d_private.h b/dlls/ddraw/d3d_private.h
index 82cdb9147c1..ec601da0961 100644
--- a/dlls/ddraw/d3d_private.h
+++ b/dlls/ddraw/d3d_private.h
@@ -1,8 +1,23 @@
 /* Direct3D private include file
-   (c) 1998 Lionel ULMER
-   
-   This files contains all the structure that are not exported
-   through d3d.h and all common macros. */
+ * Copyright (c) 1998 Lionel ULMER
+ *
+ * This file contains all the structure that are not exported
+ * through d3d.h and all common macros.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef __GRAPHICS_WINE_D3D_PRIVATE_H
 #define __GRAPHICS_WINE_D3D_PRIVATE_H
diff --git a/dlls/ddraw/d3dcommon.c b/dlls/ddraw/d3dcommon.c
index 5e9f5173819..3f87d9b515b 100644
--- a/dlls/ddraw/d3dcommon.c
+++ b/dlls/ddraw/d3dcommon.c
@@ -1,18 +1,33 @@
 /* Direct3D Common functions
-   (c) 1998 Lionel ULMER
-   
-   This file contains all common miscellaneous code that spans
-   different 'objects' */
+ * Copyright (c) 1998 Lionel ULMER
+ *
+ * This file contains all common miscellaneous code that spans
+ * different 'objects'
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include "windef.h"
 #include "wine/obj_base.h"
 #include "ddraw.h"
 #include "d3d.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "d3d_private.h"
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 void _dump_renderstate(D3DRENDERSTATETYPE type, DWORD value) {
   char *states[] = {
diff --git a/dlls/ddraw/d3ddevice/main.c b/dlls/ddraw/d3ddevice/main.c
index 7ba5530d03a..780212b137f 100644
--- a/dlls/ddraw/d3ddevice/main.c
+++ b/dlls/ddraw/d3ddevice/main.c
@@ -1,7 +1,21 @@
 /* Direct3D Device
-   (c) 1998 Lionel ULMER
-   
-   This files contains all the common stuff for D3D devices.
+ * Copyright (c) 1998 Lionel ULMER
+ *   
+ * This file contains all the common stuff for D3D devices.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -13,11 +27,11 @@
 #include "wine/obj_base.h"
 #include "ddraw.h"
 #include "d3d.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "d3d_private.h"
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 /*******************************************************************************
  *				IDirect3DDevice2
diff --git a/dlls/ddraw/d3ddevice/mesa.c b/dlls/ddraw/d3ddevice/mesa.c
index 6c0879b379e..af8c3813720 100644
--- a/dlls/ddraw/d3ddevice/mesa.c
+++ b/dlls/ddraw/d3ddevice/mesa.c
@@ -1,8 +1,23 @@
 /* Direct3D Device
-   (c) 1998 Lionel ULMER
-   
-   This files contains the MESA implementation of all the D3D devices that
-   Wine supports. */
+ * Copyright (c) 1998 Lionel ULMER
+ *   
+ * This file contains the MESA implementation of all the D3D devices that
+ * Wine supports.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include "config.h"
 
@@ -13,11 +28,11 @@
 #include "wine/obj_base.h"
 #include "ddraw.h"
 #include "d3d.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "mesa_private.h"
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 ICOM_VTABLE(IDirect3DDevice2) OpenGL_vtable;
 ICOM_VTABLE(IDirect3DDevice) OpenGL_vtable_dx3;
diff --git a/dlls/ddraw/d3dexecutebuffer.c b/dlls/ddraw/d3dexecutebuffer.c
index 0a3db7e5a24..e90ad3890fa 100644
--- a/dlls/ddraw/d3dexecutebuffer.c
+++ b/dlls/ddraw/d3dexecutebuffer.c
@@ -1,8 +1,22 @@
 /* Direct3D ExecuteBuffer
-   (c) 1998 Lionel ULMER
-   
-   This files contains the implementation of Direct3DExecuteBuffer. */
-
+ * Copyright (c) 1998 Lionel ULMER
+ *
+ * This file contains the implementation of Direct3DExecuteBuffer.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include "config.h"
 
@@ -13,13 +27,13 @@
 #include "wine/obj_base.h"
 #include "ddraw.h"
 #include "d3d.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "mesa_private.h"
 
 #define D3DDPRIVATE(x) mesa_d3dd_private *odev=((mesa_d3dd_private*)(x)->private)
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 /* Structure to store the 'semi transformed' vertices */
 typedef struct {
diff --git a/dlls/ddraw/d3dlight.c b/dlls/ddraw/d3dlight.c
index d0a85c91fdd..a734f9ae12a 100644
--- a/dlls/ddraw/d3dlight.c
+++ b/dlls/ddraw/d3dlight.c
@@ -1,8 +1,22 @@
 /* Direct3D Light
-   (c) 1998 Lionel ULMER
-   
-   This files contains the implementation of Direct3DLight. */
-
+ * Copyright (c) 1998 Lionel ULMER
+ *
+ * This file contains the implementation of Direct3DLight.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include "config.h"
 #include "windef.h"
@@ -10,11 +24,11 @@
 #include "wine/obj_base.h"
 #include "ddraw.h"
 #include "d3d.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "mesa_private.h"
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
     
 #define D3DLPRIVATE(x) mesa_d3dl_private*dlpriv=((mesa_d3dl_private*)x->private)
 
diff --git a/dlls/ddraw/d3dmaterial.c b/dlls/ddraw/d3dmaterial.c
index 1e9215748a8..64e61a009cf 100644
--- a/dlls/ddraw/d3dmaterial.c
+++ b/dlls/ddraw/d3dmaterial.c
@@ -1,7 +1,22 @@
 /* Direct3D Material
-   (c) 1998 Lionel ULMER
-   
-   This files contains the implementation of Direct3DMaterial2. */
+ * Copyright (c) 1998 Lionel ULMER
+ *
+ * This file contains the implementation of Direct3DMaterial2.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include "config.h"
 #include "windef.h"
@@ -9,11 +24,11 @@
 #include "wine/obj_base.h"
 #include "ddraw.h"
 #include "d3d.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "mesa_private.h"
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 static ICOM_VTABLE(IDirect3DMaterial2) material2_vtable;
 static ICOM_VTABLE(IDirect3DMaterial) material_vtable;
diff --git a/dlls/ddraw/d3dtexture.c b/dlls/ddraw/d3dtexture.c
index b1500cfbdd5..199a1dac19b 100644
--- a/dlls/ddraw/d3dtexture.c
+++ b/dlls/ddraw/d3dtexture.c
@@ -1,8 +1,22 @@
 /* Direct3D Texture
-   (c) 1998 Lionel ULMER
-   
-   This files contains the implementation of interface Direct3DTexture2. */
-
+ * Copyright (c) 1998 Lionel ULMER
+ *
+ * This file contains the implementation of interface Direct3DTexture2.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include "config.h"
 
@@ -13,14 +27,14 @@
 #include "wine/obj_base.h"
 #include "ddraw.h"
 #include "d3d.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "mesa_private.h"
 
 #define D3DDPRIVATE(x) mesa_d3dd_private*odev=(mesa_d3dd_private*)(x)->private
 #define D3DTPRIVATE(x) mesa_d3dt_private*dtpriv=(mesa_d3dt_private*)(x)->private
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 /* Define this if you want to save to a file all the textures used by a game
    (can be funny to see how they managed to cram all the pictures in
diff --git a/dlls/ddraw/d3dviewport.c b/dlls/ddraw/d3dviewport.c
index ed91eabe97e..4cf4608a6dd 100644
--- a/dlls/ddraw/d3dviewport.c
+++ b/dlls/ddraw/d3dviewport.c
@@ -1,7 +1,22 @@
 /* Direct3D Viewport
-   (c) 1998 Lionel ULMER
-   
-   This files contains the implementation of Direct3DViewport2. */
+ * Copyright (c) 1998 Lionel ULMER
+ *
+ * This file contains the implementation of Direct3DViewport2.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include "config.h"
 #include "windef.h"
@@ -9,12 +24,12 @@
 #include "wine/obj_base.h"
 #include "ddraw.h"
 #include "d3d.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "d3d_private.h"
 #include "mesa_private.h"
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 #ifdef HAVE_OPENGL
 
diff --git a/dlls/ddraw/dclipper/main.c b/dlls/ddraw/dclipper/main.c
index b7fc60f4f04..9f642913f54 100644
--- a/dlls/ddraw/dclipper/main.c
+++ b/dlls/ddraw/dclipper/main.c
@@ -2,6 +2,20 @@
  *
  * Copyright 2000 Marcus Meissner
  * Copyright 2000 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -16,9 +30,9 @@
 #include "dclipper/main.h"
 #include "ddraw/main.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 /******************************************************************************
  *			DirectDrawCreateClipper (DDRAW.@)
diff --git a/dlls/ddraw/dclipper/main.h b/dlls/ddraw/dclipper/main.h
index 74063dd9979..1873781fc97 100644
--- a/dlls/ddraw/dclipper/main.h
+++ b/dlls/ddraw/dclipper/main.h
@@ -1,4 +1,20 @@
-/* Copyright 2000 TransGaming Technologies Inc. */
+/*
+ * Copyright 2000 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef WINE_DDRAW_DCLIPPER_MAIN_H_INCLUDED
 #define WINE_DDRAW_DCLIPPER_MAIN_H_INCLUDED
diff --git a/dlls/ddraw/ddcomimpl.h b/dlls/ddraw/ddcomimpl.h
index da4afd8f4e8..a1be07d129d 100644
--- a/dlls/ddraw/ddcomimpl.h
+++ b/dlls/ddraw/ddcomimpl.h
@@ -1,6 +1,20 @@
 /* A few helpful macros for implementing COM objects.
  *
  * Copyright 2000 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stddef.h>
diff --git a/dlls/ddraw/ddraw/hal.c b/dlls/ddraw/ddraw/hal.c
index b48f6594216..9710e52d8e8 100644
--- a/dlls/ddraw/ddraw/hal.c
+++ b/dlls/ddraw/ddraw/hal.c
@@ -1,11 +1,25 @@
 /*	DirectDraw HAL driver
  *
  * Copyright 2001 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "ddraw.h"
 #include "ddrawi.h"
 #include "d3dhal.h"
@@ -25,7 +39,7 @@
 #include "dsurface/user.h"
 #include "dsurface/hal.h"
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 static ICOM_VTABLE(IDirectDraw7) HAL_DirectDraw_VTable;
 
diff --git a/dlls/ddraw/ddraw/hal.h b/dlls/ddraw/ddraw/hal.h
index 0128ba1c8d7..89cc8d881aa 100644
--- a/dlls/ddraw/ddraw/hal.h
+++ b/dlls/ddraw/ddraw/hal.h
@@ -1,4 +1,21 @@
-/* Copyright 2001 TransGaming Technologies, Inc. */
+/*
+ * Copyright 2001 TransGaming Technologies, Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef WINE_DDRAW_DDRAW_HAL_H_INCLUDED
 #define WINE_DDRAW_DDRAW_HAL_H_INCLUDED
 
diff --git a/dlls/ddraw/ddraw/main.c b/dlls/ddraw/ddraw/main.c
index d932370531b..fc47f99fd58 100644
--- a/dlls/ddraw/ddraw/main.c
+++ b/dlls/ddraw/ddraw/main.c
@@ -3,6 +3,20 @@
  * Copyright 1997-2000 Marcus Meissner
  * Copyright 1998-2000 Lionel Ulmer (most of Direct3D stuff)
  * Copyright 2000-2001 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /*
@@ -19,7 +33,7 @@
 #include "winerror.h"
 #include "ddraw.h"
 #include "d3d.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "bitmap.h"
 
 #include "ddraw_private.h"
@@ -30,7 +44,7 @@
 #include "dsurface/dib.h"
 #include "dsurface/fakezbuffer.h"
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 extern ICOM_VTABLE(IDirectDraw) DDRAW_IDirectDraw_VTable;
 extern ICOM_VTABLE(IDirectDraw2) DDRAW_IDirectDraw2_VTable;
diff --git a/dlls/ddraw/ddraw/main.h b/dlls/ddraw/ddraw/main.h
index fe9413f6048..6b730c96697 100644
--- a/dlls/ddraw/ddraw/main.h
+++ b/dlls/ddraw/ddraw/main.h
@@ -1,4 +1,20 @@
-/* Copyright 2000-2001 TransGaming Technologies Inc. */
+/*
+ * Copyright 2000-2001 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef WINE_DDRAW_DDRAW_MAIN_H_INCLUDED
 #define WINE_DDRAW_DDRAW_MAIN_H_INCLUDED
diff --git a/dlls/ddraw/ddraw/thunks.c b/dlls/ddraw/ddraw/thunks.c
index f5676394870..69a928adde9 100644
--- a/dlls/ddraw/ddraw/thunks.c
+++ b/dlls/ddraw/ddraw/thunks.c
@@ -1,5 +1,19 @@
 /* Direct Draw Thunks and old vtables
  * Copyright 2000 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "ddraw.h"
 #include "ddraw_private.h"
diff --git a/dlls/ddraw/ddraw/user.c b/dlls/ddraw/ddraw/user.c
index 219766023dd..b7810279abd 100644
--- a/dlls/ddraw/ddraw/user.c
+++ b/dlls/ddraw/ddraw/user.c
@@ -1,10 +1,24 @@
 /*	DirectDraw driver for User-based primary surfaces
  *
  * Copyright 2000-2001 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "ddraw.h"
 
 #include <assert.h>
@@ -19,7 +33,7 @@
 #include "dsurface/dib.h"
 #include "dsurface/user.h"
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 static ICOM_VTABLE(IDirectDraw7) User_DirectDraw_VTable;
 
diff --git a/dlls/ddraw/ddraw/user.h b/dlls/ddraw/ddraw/user.h
index 56d9a5ff339..7cd70ae277e 100644
--- a/dlls/ddraw/ddraw/user.h
+++ b/dlls/ddraw/ddraw/user.h
@@ -1,4 +1,20 @@
-/* Copyright 2000-2001 TransGaming Technologies Inc. */
+/*
+ * Copyright 2000-2001 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef WINE_DDRAW_DDRAW_USER_H_INCLUDED
 #define WINE_DDRAW_DDRAW_USER_H_INCLUDED
diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
index 9677186f925..a7ad8dd0952 100644
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -1,4 +1,20 @@
-/* Copyright 2000-2001 TransGaming Technologies Inc. */
+/*
+ * Copyright 2000-2001 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H
 #define __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H
diff --git a/dlls/ddraw/direct3d/main.c b/dlls/ddraw/direct3d/main.c
index 9012b8cb5f4..b212f8f7039 100644
--- a/dlls/ddraw/direct3d/main.c
+++ b/dlls/ddraw/direct3d/main.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include "config.h"
 
 #include <assert.h>
@@ -9,11 +27,11 @@
 #include "winerror.h"
 #include "ddraw.h"
 #include "d3d.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "d3d_private.h"
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 static ICOM_VTABLE(IDirect3D) d3dvt;
 static ICOM_VTABLE(IDirect3D2) d3d2vt;
diff --git a/dlls/ddraw/direct3d/mesa.c b/dlls/ddraw/direct3d/mesa.c
index 0187e9e4122..fa5a5366aba 100644
--- a/dlls/ddraw/direct3d/mesa.c
+++ b/dlls/ddraw/direct3d/mesa.c
@@ -1,3 +1,22 @@
+/*
+ * Copyright 2000 Marcus Meissner
+ * Copyright 2000 Peter Hunnisett
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include "config.h"
 
 #include <assert.h>
@@ -13,9 +32,9 @@
 #include "ddraw_private.h"
 #include "mesa_private.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 /*******************************************************************************
  *				IDirect3D
diff --git a/dlls/ddraw/dpalette/hal.c b/dlls/ddraw/dpalette/hal.c
index 44dc9f4baba..77a50a0056d 100644
--- a/dlls/ddraw/dpalette/hal.c
+++ b/dlls/ddraw/dpalette/hal.c
@@ -1,11 +1,25 @@
 /*	DirectDrawPalette HAL driver
  *
  * Copyright 2001 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
 #include "winerror.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include <assert.h>
 #include <string.h>
@@ -15,7 +29,7 @@
 #include "dpalette/hal.h"
 #include "ddraw/main.h"
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 static ICOM_VTABLE(IDirectDrawPalette) DDRAW_HAL_Palette_VTable;
 
diff --git a/dlls/ddraw/dpalette/hal.h b/dlls/ddraw/dpalette/hal.h
index d6bdad7f27a..751f9b9be78 100644
--- a/dlls/ddraw/dpalette/hal.h
+++ b/dlls/ddraw/dpalette/hal.h
@@ -1,4 +1,20 @@
-/* Copyright 2000-2001 TransGaming Technologies Inc. */
+/*
+ * Copyright 2000-2001 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef WINE_DDRAW_DPALETTE_HAL_H_INCLUDED
 #define WINE_DDRAW_DPALETTE_HAL_H_INCLUDED
diff --git a/dlls/ddraw/dpalette/main.c b/dlls/ddraw/dpalette/main.c
index 2e9ef231a1f..31259432147 100644
--- a/dlls/ddraw/dpalette/main.c
+++ b/dlls/ddraw/dpalette/main.c
@@ -2,11 +2,25 @@
  *
  * Copyright 1997-2000 Marcus Meissner
  * Copyright 2000-2001 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
 #include "winerror.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include <assert.h>
 #include <string.h>
@@ -15,7 +29,7 @@
 #include "dpalette/main.h"
 #include "ddraw/main.h"
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 #define SIZE_BITS (DDPCAPS_1BIT | DDPCAPS_2BIT | DDPCAPS_4BIT | DDPCAPS_8BIT)
 
diff --git a/dlls/ddraw/dpalette/main.h b/dlls/ddraw/dpalette/main.h
index 6730c60958d..b3ac2a04f65 100644
--- a/dlls/ddraw/dpalette/main.h
+++ b/dlls/ddraw/dpalette/main.h
@@ -1,4 +1,20 @@
-/* Copyright 2000-2001 TransGaming Technologies Inc. */
+/*
+ * Copyright 2000-2001 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef WINE_DDRAW_DPALETTE_MAIN_H_INCLUDED
 #define WINE_DDRAW_DPALETTE_MAIN_H_INCLUDED
diff --git a/dlls/ddraw/dsurface/dib.c b/dlls/ddraw/dsurface/dib.c
index 35ced4d1c6a..7574ef5497f 100644
--- a/dlls/ddraw/dsurface/dib.c
+++ b/dlls/ddraw/dsurface/dib.c
@@ -3,6 +3,20 @@
  * Copyright 1997-2000 Marcus Meissner
  * Copyright 1998-2000 Lionel Ulmer
  * Copyright 2000-2001 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -12,12 +26,12 @@
 #include <string.h>
 #include "winerror.h"
 #include "bitmap.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "ddraw_private.h"
 #include "dsurface/main.h"
 #include "dsurface/dib.h"
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 static ICOM_VTABLE(IDirectDrawSurface7) DIB_IDirectDrawSurface7_VTable;
 
diff --git a/dlls/ddraw/dsurface/dib.h b/dlls/ddraw/dsurface/dib.h
index 0d03e54db1c..dc0831418e6 100644
--- a/dlls/ddraw/dsurface/dib.h
+++ b/dlls/ddraw/dsurface/dib.h
@@ -1,4 +1,20 @@
-/* Copyright 2000-2001 TransGaming Technologies Inc. */
+/*
+ * Copyright 2000-2001 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef DDRAW_DSURFACE_DIB_H_INCLUDED
 #define DDRAW_DSURFACE_DIB_H_INCLUDED
diff --git a/dlls/ddraw/dsurface/fakezbuffer.c b/dlls/ddraw/dsurface/fakezbuffer.c
index b806d6eb20f..54781bd809b 100644
--- a/dlls/ddraw/dsurface/fakezbuffer.c
+++ b/dlls/ddraw/dsurface/fakezbuffer.c
@@ -6,6 +6,20 @@
  * a Z-Buffer surface. However it does not store an image and does not
  * support Lock/Unlock or GetDC. It is merely a placeholder required by the
  * Direct3D architecture.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -16,14 +30,14 @@
 #include "ddraw.h"
 #include "d3d.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "ddcomimpl.h"
 #include "ddraw_private.h"
 #include "dsurface/main.h"
 #include "dsurface/fakezbuffer.h"
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 static ICOM_VTABLE(IDirectDrawSurface7) FakeZBuffer_IDirectDrawSurface7_VTable;
 
diff --git a/dlls/ddraw/dsurface/fakezbuffer.h b/dlls/ddraw/dsurface/fakezbuffer.h
index 9d419f46d3f..4c7074aeb94 100644
--- a/dlls/ddraw/dsurface/fakezbuffer.h
+++ b/dlls/ddraw/dsurface/fakezbuffer.h
@@ -1,4 +1,20 @@
-/* Copyright 200 TransGaming Technologies Inc. */
+/*
+ * Copyright 200 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef DDRAW_DSURFACE_FAKEZBUFFER_H_INCLUDED
 #define DDRAW_DSURFACE_FAKEZBUFFER_H_INCLUDED
diff --git a/dlls/ddraw/dsurface/gamma.c b/dlls/ddraw/dsurface/gamma.c
index 8632ad7c51e..eb874dd717c 100644
--- a/dlls/ddraw/dsurface/gamma.c
+++ b/dlls/ddraw/dsurface/gamma.c
@@ -1,6 +1,20 @@
 /*		DirectDrawGammaControl implementation
  *
  * Copyright 2001 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -9,11 +23,11 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "ddraw_private.h"
 #include "dsurface/main.h"
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 #define CONVERT(pddgc) COM_INTERFACE_CAST(IDirectDrawSurfaceImpl,	\
 					  IDirectDrawGammaControl,	\
diff --git a/dlls/ddraw/dsurface/hal.c b/dlls/ddraw/dsurface/hal.c
index 9948a8452a7..5cf70e5df13 100644
--- a/dlls/ddraw/dsurface/hal.c
+++ b/dlls/ddraw/dsurface/hal.c
@@ -1,6 +1,20 @@
 /*	DirectDrawSurface HAL driver
  *
  * Copyright 2001 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -8,7 +22,7 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "ddraw_private.h"
 #include "ddraw/user.h"
 #include "ddraw/hal.h"
@@ -17,7 +31,7 @@
 #include "dsurface/user.h"
 #include "dsurface/hal.h"
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 static ICOM_VTABLE(IDirectDrawSurface7) HAL_IDirectDrawSurface7_VTable;
 
diff --git a/dlls/ddraw/dsurface/hal.h b/dlls/ddraw/dsurface/hal.h
index 790a5d3dd05..70186b33a1c 100644
--- a/dlls/ddraw/dsurface/hal.h
+++ b/dlls/ddraw/dsurface/hal.h
@@ -1,4 +1,20 @@
-/* Copyright 2000-2001 TransGaming Technologies Inc. */
+/*
+ * Copyright 2000-2001 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef DDRAW_DSURFACE_HAL_H_INCLUDED
 #define DDRAW_DSURFACE_HAL_H_INCLUDED
diff --git a/dlls/ddraw/dsurface/main.c b/dlls/ddraw/dsurface/main.c
index 68acf603f27..a62d105262a 100644
--- a/dlls/ddraw/dsurface/main.c
+++ b/dlls/ddraw/dsurface/main.c
@@ -3,6 +3,20 @@
  * Copyright 1997-2000 Marcus Meissner
  * Copyright 1998-2000 Lionel Ulmer (most of Direct3D stuff)
  * Copyright 2000-2001 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "config.h"
 #include "winerror.h"
@@ -10,13 +24,13 @@
 #include <assert.h>
 #include <string.h>
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "ddraw_private.h"
 #include "dsurface/main.h"
 #include "ddraw/main.h"
 #include "dsurface/thunks.h"
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 /** Creation/Destruction functions */
 
diff --git a/dlls/ddraw/dsurface/main.h b/dlls/ddraw/dsurface/main.h
index bd6d2a9b0e7..5615095d5d0 100644
--- a/dlls/ddraw/dsurface/main.h
+++ b/dlls/ddraw/dsurface/main.h
@@ -1,4 +1,20 @@
-/* Copyright 2000-2001 TransGaming Technologies Inc. */
+/*
+ * Copyright 2000-2001 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef DDRAW_DSURFACE_MAIN_H_INCLUDED
 #define DDRAW_DSURFACE_MAIN_H_INCLUDED
diff --git a/dlls/ddraw/dsurface/thunks.c b/dlls/ddraw/dsurface/thunks.c
index 543865f6e95..d6a9a546f15 100644
--- a/dlls/ddraw/dsurface/thunks.c
+++ b/dlls/ddraw/dsurface/thunks.c
@@ -1,5 +1,19 @@
 /* IDirectDrawSurface3 -> IDirectDrawSurface7 thunks
  * Copyright 2000 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/dlls/ddraw/dsurface/thunks.h b/dlls/ddraw/dsurface/thunks.h
index 989f0a79e3a..7759af3c753 100644
--- a/dlls/ddraw/dsurface/thunks.h
+++ b/dlls/ddraw/dsurface/thunks.h
@@ -1,4 +1,20 @@
-/* Copyright 2000 TransGaming Technologies Inc. */
+/*
+ * Copyright 2000 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef DDRAW_DSURFACE_THUNKS_H_INCLUDED
 #define DDRAW_DSURFACE_THUNKS_H_INCLUDED
diff --git a/dlls/ddraw/dsurface/user.c b/dlls/ddraw/dsurface/user.c
index e909f9700ae..3c01f3eda95 100644
--- a/dlls/ddraw/dsurface/user.c
+++ b/dlls/ddraw/dsurface/user.c
@@ -1,6 +1,20 @@
 /*	User-based primary surface driver
  *
  * Copyright 2000-2001 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -10,14 +24,14 @@
 #include <string.h>
 
 #include "winerror.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "ddraw_private.h"
 #include "dsurface/main.h"
 #include "dsurface/dib.h"
 #include "dsurface/user.h"
 #include "dsurface/wndproc.h"
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 /* if you use OWN_WINDOW, don't use SYNC_UPDATE, or you may get trouble */
 /* #define SYNC_UPDATE */
diff --git a/dlls/ddraw/dsurface/user.h b/dlls/ddraw/dsurface/user.h
index c8c394eae60..26e2e915fa3 100644
--- a/dlls/ddraw/dsurface/user.h
+++ b/dlls/ddraw/dsurface/user.h
@@ -1,4 +1,20 @@
-/* Copyright 2000-2001 TransGaming Technologies Inc. */
+/*
+ * Copyright 2000-2001 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef DDRAW_DSURFACE_USER_H_INCLUDED
 #define DDRAW_DSURFACE_USER_H_INCLUDED
diff --git a/dlls/ddraw/dsurface/wndproc.c b/dlls/ddraw/dsurface/wndproc.c
index 47dc508db84..3b5155b13f0 100644
--- a/dlls/ddraw/dsurface/wndproc.c
+++ b/dlls/ddraw/dsurface/wndproc.c
@@ -1,6 +1,20 @@
 /*	User-based primary surface driver
  *
  * Copyright 2000 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -14,9 +28,9 @@
 #include "ddraw_private.h"
 #include "dsurface/wndproc.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 static LRESULT WINAPI DirectDrawSurface_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
 
diff --git a/dlls/ddraw/dsurface/wndproc.h b/dlls/ddraw/dsurface/wndproc.h
index f83548b6e2f..d5b31f7da63 100644
--- a/dlls/ddraw/dsurface/wndproc.h
+++ b/dlls/ddraw/dsurface/wndproc.h
@@ -1,4 +1,20 @@
-/* Copyright 2000 TransGaming Technologies Inc. */
+/*
+ * Copyright 2000 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef DDRAW_DSURFACE_WNDPROC_H_INCLUDED
 #define DDRAW_DSURFACE_WNDPROC_H_INCLUDED
diff --git a/dlls/ddraw/helper.c b/dlls/ddraw/helper.c
index 79eb52a3416..15dfe4256b1 100644
--- a/dlls/ddraw/helper.c
+++ b/dlls/ddraw/helper.c
@@ -4,6 +4,20 @@
  * Copyright 1997-1999 Marcus Meissner
  * Copyright 1998 Lionel Ulmer (most of Direct3D stuff)
  * Copyright 2000 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -17,9 +31,9 @@
 #include "wine/exception.h"
 #include "ddraw_private.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 /******************************************************************************
  *		debug output functions
diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c
index d309d9bbd5e..766af8a1665 100644
--- a/dlls/ddraw/main.c
+++ b/dlls/ddraw/main.c
@@ -6,6 +6,20 @@
  *
  * This file contains the (internal) driver registration functions,
  * driver enumeration APIs and DirectDraw creation functions.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -22,14 +36,14 @@
 
 /* This for all the enumeration and creation of D3D-related objects */
 #include "ddraw_private.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #define MAX_DDRAW_DRIVERS 3
 static const ddraw_driver* DDRAW_drivers[MAX_DDRAW_DRIVERS];
 static int DDRAW_num_drivers; /* = 0 */
 static int DDRAW_default_driver;
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 /**********************************************************************/
 
diff --git a/dlls/ddraw/mesa.c b/dlls/ddraw/mesa.c
index e18430d58bd..62bf5600807 100644
--- a/dlls/ddraw/mesa.c
+++ b/dlls/ddraw/mesa.c
@@ -1,7 +1,22 @@
 /* Direct3D Common functions
-   (c) 1998 Lionel ULMER
-   
-   This file contains all MESA common code */
+ * Copyright (c) 1998 Lionel ULMER
+ *
+ * This file contains all MESA common code
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include "config.h"
 
@@ -9,11 +24,11 @@
 #include "wine/obj_base.h"
 #include "ddraw.h"
 #include "d3d.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "mesa_private.h"
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
     
 #define D3DTPRIVATE(x) mesa_d3dt_private *dtpriv = (mesa_d3dt_private*)(x)->private
 
diff --git a/dlls/ddraw/mesa_private.h b/dlls/ddraw/mesa_private.h
index dec0d04b00e..1120d62de8a 100644
--- a/dlls/ddraw/mesa_private.h
+++ b/dlls/ddraw/mesa_private.h
@@ -1,8 +1,23 @@
 /* MESA private include file
-   (c) 1998 Lionel ULMER
-   
-   This file contains all structures that are not exported
-   through d3d.h and all common macros. */
+ * Copyright (c) 1998 Lionel ULMER
+ *
+ * This file contains all structures that are not exported
+ * through d3d.h and all common macros.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef __GRAPHICS_WINE_MESA_PRIVATE_H
 #define __GRAPHICS_WINE_MESA_PRIVATE_H
diff --git a/dlls/ddraw/struct_convert.c b/dlls/ddraw/struct_convert.c
index e6d1402732d..2d0950c9231 100644
--- a/dlls/ddraw/struct_convert.c
+++ b/dlls/ddraw/struct_convert.c
@@ -1,6 +1,20 @@
 /*	ddraw/d3d structure version conversion
  *
  * Copyright 2000 TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
diff --git a/dlls/ddraw/version.rc b/dlls/ddraw/version.rc
index 1659b9f4602..d96b7fa773c 100644
--- a/dlls/ddraw/version.rc
+++ b/dlls/ddraw/version.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2001 Ove Kaaven
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #define WINE_FILEDESCRIPTION_STR "Wine DirectDraw"
 #define WINE_FILENAME_STR "ddraw.dll"
 #define WINE_PRODUCTVERSION 4,7,0,0
diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
index fc4e81da8c0..ffd40afb587 100644
--- a/dlls/dinput/device.c
+++ b/dlls/dinput/device.c
@@ -3,6 +3,20 @@
  * Copyright 1998 Marcus Meissner
  * Copyright 1998,1999 Lionel Ulmer
  *
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* This file contains all the Device specific functions that can be used as stubs
@@ -13,14 +27,14 @@
 #include "config.h"
 
 #include <string.h>
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winbase.h"
 #include "winerror.h"
 #include "windef.h"
 #include "dinput.h"
 #include "device_private.h"
 
-DEFAULT_DEBUG_CHANNEL(dinput);
+WINE_DEFAULT_DEBUG_CHANNEL(dinput);
 
 /******************************************************************************
  *	Various debugging tools
diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h
index 5d87a35d92e..ee009686cef 100644
--- a/dlls/dinput/device_private.h
+++ b/dlls/dinput/device_private.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000 Lionel Ulmer
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_DLLS_DINPUT_DINPUTDEVICE_PRIVATE_H
 #define __WINE_DLLS_DINPUT_DINPUTDEVICE_PRIVATE_H
 
diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
index c8d890e07f3..3f5e576bf72 100644
--- a/dlls/dinput/dinput_main.c
+++ b/dlls/dinput/dinput_main.c
@@ -3,6 +3,20 @@
  * Copyright 1998 Marcus Meissner
  * Copyright 1998,1999 Lionel Ulmer
  *
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 /* Status:
  *
@@ -22,13 +36,13 @@
 #include <assert.h>
 #include <string.h>
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winbase.h"
 #include "winerror.h"
 #include "windef.h"
 #include "dinput_private.h"
 
-DEFAULT_DEBUG_CHANNEL(dinput);
+WINE_DEFAULT_DEBUG_CHANNEL(dinput);
 
 static ICOM_VTABLE(IDirectInputA) ddiavt;
 static ICOM_VTABLE(IDirectInput7A) ddi7avt;
diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h
index 3aff85d79a6..e2d9204d29e 100644
--- a/dlls/dinput/dinput_private.h
+++ b/dlls/dinput/dinput_private.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000 Lionel Ulmer
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_DLLS_DINPUT_DINPUT_PRIVATE_H
 #define __WINE_DLLS_DINPUT_DINPUT_PRIVATE_H
 
diff --git a/dlls/dinput/joystick/linux.c b/dlls/dinput/joystick/linux.c
index 914b382861f..a58db60dd2f 100644
--- a/dlls/dinput/joystick/linux.c
+++ b/dlls/dinput/joystick/linux.c
@@ -3,6 +3,19 @@
  * Copyright 1998 Marcus Meissner
  * Copyright 1998,1999 Lionel Ulmer
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -25,7 +38,7 @@
 #endif
 #define JOYDEV	"/dev/js0"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winbase.h"
 #include "winerror.h"
 #include "windef.h"
@@ -34,7 +47,7 @@
 #include "dinput_private.h"
 #include "device_private.h"
 
-DEFAULT_DEBUG_CHANNEL(dinput);
+WINE_DEFAULT_DEBUG_CHANNEL(dinput);
 
 /* Wine joystick driver object instances */
 #define WINE_JOYSTICK_AXIS_BASE   0
diff --git a/dlls/dinput/joystick/linuxinput.c b/dlls/dinput/joystick/linuxinput.c
index b8be708acba..4e9d40e056c 100644
--- a/dlls/dinput/joystick/linuxinput.c
+++ b/dlls/dinput/joystick/linuxinput.c
@@ -3,6 +3,19 @@
  * Copyright 1998,2000 Marcus Meissner
  * Copyright 1998,1999 Lionel Ulmer
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -31,7 +44,7 @@
 
 #define EVDEVPREFIX	"/dev/input/event"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winbase.h"
 #include "winerror.h"
 #include "windef.h"
@@ -40,7 +53,7 @@
 #include "dinput_private.h"
 #include "device_private.h"
 
-DEFAULT_DEBUG_CHANNEL(dinput);
+WINE_DEFAULT_DEBUG_CHANNEL(dinput);
 
 /* Wine joystick driver object instances */
 #define WINE_JOYSTICK_AXIS_BASE   0
diff --git a/dlls/dinput/keyboard/main.c b/dlls/dinput/keyboard/main.c
index bbe3ca65639..4581faaf058 100644
--- a/dlls/dinput/keyboard/main.c
+++ b/dlls/dinput/keyboard/main.c
@@ -3,6 +3,19 @@
  * Copyright 1998 Marcus Meissner
  * Copyright 1998,1999 Lionel Ulmer
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -18,9 +31,9 @@
 
 #include "dinput_private.h"
 #include "device_private.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(dinput);
+WINE_DEFAULT_DEBUG_CHANNEL(dinput);
 
 static ICOM_VTABLE(IDirectInputDevice2A) SysKeyboardAvt;
 static ICOM_VTABLE(IDirectInputDevice7A) SysKeyboard7Avt;
diff --git a/dlls/dinput/mouse/main.c b/dlls/dinput/mouse/main.c
index b4011f51782..e9650ab9c16 100644
--- a/dlls/dinput/mouse/main.c
+++ b/dlls/dinput/mouse/main.c
@@ -3,6 +3,19 @@
  * Copyright 1998 Marcus Meissner
  * Copyright 1998,1999 Lionel Ulmer
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -19,11 +32,11 @@
 
 #include "dinput_private.h"
 #include "device_private.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #define MOUSE_HACK
 
-DEFAULT_DEBUG_CHANNEL(dinput);
+WINE_DEFAULT_DEBUG_CHANNEL(dinput);
 
 /* Wine mouse driver object instances */
 #define WINE_MOUSE_X_AXIS_INSTANCE 0x0001
diff --git a/dlls/dplayx/dpclassfactory.c b/dlls/dplayx/dpclassfactory.c
index aa0fb7941d5..5fa2a962723 100644
--- a/dlls/dplayx/dpclassfactory.c
+++ b/dlls/dplayx/dpclassfactory.c
@@ -1,11 +1,29 @@
+/*
+ * Copyright 1999, 2000 Peter Hunnisett
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <string.h>
 #include "windef.h"
 #include "wine/obj_base.h"
 #include "winerror.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "dpinit.h"
 
-DEFAULT_DEBUG_CHANNEL(dplay);
+WINE_DEFAULT_DEBUG_CHANNEL(dplay);
 
 
 /*******************************************************************************
diff --git a/dlls/dplayx/dpinit.h b/dlls/dplayx/dpinit.h
index 92063d7d591..3516b7af6af 100644
--- a/dlls/dplayx/dpinit.h
+++ b/dlls/dplayx/dpinit.h
@@ -1,3 +1,20 @@
+/*
+ * Copyright 1999, 2000 Peter Hunnisett
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef __WINE_DPINIT_H
 #define __WINE_DPINIT_H
diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c
index f1550131a33..d06fdaf38ed 100644
--- a/dlls/dplayx/dplay.c
+++ b/dlls/dplayx/dplay.c
@@ -4,6 +4,19 @@
  *
  * <presently under construction - contact hunnise@nortelnetworks.com>
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -19,7 +32,7 @@
 #include "winnls.h"
 #include "wine/unicode.h"
 #include "dplay.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "dpinit.h"
 #include "dplayx_global.h"
@@ -28,7 +41,7 @@
 #include "dplaysp.h"
 #include "dplay_global.h"
 
-DEFAULT_DEBUG_CHANNEL(dplay);
+WINE_DEFAULT_DEBUG_CHANNEL(dplay);
 
 /* FIXME: Should this be externed? */
 extern HRESULT DPL_CreateCompoundAddress 
diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h
index 94208c20f1e..8d939bc92f1 100644
--- a/dlls/dplayx/dplay_global.h
+++ b/dlls/dplayx/dplay_global.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000 Peter Hunnisett
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_DPLAY_GLOBAL_INCLUDED
 #define __WINE_DPLAY_GLOBAL_INCLUDED
 
diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c
index e38d2b6aa01..8c205359151 100644
--- a/dlls/dplayx/dplaysp.c
+++ b/dlls/dplayx/dplaysp.c
@@ -2,11 +2,25 @@
  * Providers require to communicate with Direct Play 
  *
  * Copyright 2000 Peter Hunnisett <hunnise@nortelnetworks.com>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
 #include "winerror.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "dpinit.h"
 #include "dplaysp.h"
@@ -18,7 +32,7 @@
 
 /* FIXME: Need to add interface locking inside procedures */
 
-DEFAULT_DEBUG_CHANNEL(dplay);
+WINE_DEFAULT_DEBUG_CHANNEL(dplay);
 
 /* Prototypes */
 static BOOL DPSP_CreateIUnknown( LPVOID lpSP );
diff --git a/dlls/dplayx/dplaysp.h b/dlls/dplayx/dplaysp.h
index 3bb3f4c5f99..ae14d4a1b43 100644
--- a/dlls/dplayx/dplaysp.h
+++ b/dlls/dplayx/dplaysp.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000 Peter Hunnisett
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_DIRECT_PLAY_SP_H
 #define __WINE_DIRECT_PLAY_SP_H
 
diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c
index 58261bd6d0e..fbc5fba267f 100644
--- a/dlls/dplayx/dplayx_global.c
+++ b/dlls/dplayx/dplayx_global.c
@@ -4,6 +4,19 @@
  *
  * <presently under construction - contact hunnise@nortelnetworks.com>
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* NOTE: Methods that begin with DPLAYX_ are used for dealing with 
@@ -11,7 +24,7 @@
  */ 
 
 #include <string.h>
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winbase.h"
 #include "winerror.h"
 #include "wine/unicode.h"
@@ -22,7 +35,7 @@
 #include "dplayx_global.h"
 #include "dplayx_messages.h" /* For CreateMessageReceptionThread only */
 
-DEFAULT_DEBUG_CHANNEL(dplay);
+WINE_DEFAULT_DEBUG_CHANNEL(dplay);
 
 /* FIXME: Need to do all that fun other dll referencing type of stuff */
 
diff --git a/dlls/dplayx/dplayx_global.h b/dlls/dplayx/dplayx_global.h
index bc51533ee11..ffb1e4e78ba 100644
--- a/dlls/dplayx/dplayx_global.h
+++ b/dlls/dplayx/dplayx_global.h
@@ -1,3 +1,20 @@
+/*
+ * Copyright 1999, 2000 Peter Hunnisett
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef __WINE_DPLAYX_GLOBAL
 #define __WINE_DPLAYX_GLOBAL
diff --git a/dlls/dplayx/dplayx_main.c b/dlls/dplayx/dplayx_main.c
index 5543b1612ab..8eb8e7daa23 100644
--- a/dlls/dplayx/dplayx_main.c
+++ b/dlls/dplayx/dplayx_main.c
@@ -4,13 +4,27 @@
  * Copyright 1999,2000 - Peter Hunnisett 
  *
  * contact <hunnise@nortelnetworks.com>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "winerror.h"
 #include "winbase.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "dplayx_global.h"
 
-DEFAULT_DEBUG_CHANNEL(dplay);
+WINE_DEFAULT_DEBUG_CHANNEL(dplay);
 
 /* This is a globally exported variable at ordinal 6 of DPLAYX.DLL */
 DWORD gdwDPlaySPRefCount = 0; /* FIXME: Should it be initialized here? */
diff --git a/dlls/dplayx/dplayx_messages.c b/dlls/dplayx/dplayx_messages.c
index 1e4342e91e9..43fd09e4308 100644
--- a/dlls/dplayx/dplayx_messages.c
+++ b/dlls/dplayx/dplayx_messages.c
@@ -4,11 +4,24 @@
  *
  * <presently under construction - contact hunnise@nortelnetworks.com>
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
 #include "winbase.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "wingdi.h"
 #include "winuser.h"
@@ -19,7 +32,7 @@
 #include "dplayx_global.h"
 #include "name_server.h"
 
-DEFAULT_DEBUG_CHANNEL(dplay);
+WINE_DEFAULT_DEBUG_CHANNEL(dplay);
 
 typedef struct tagMSGTHREADINFO
 {
diff --git a/dlls/dplayx/dplayx_messages.h b/dlls/dplayx/dplayx_messages.h
index 191858b47dd..635118836f0 100644
--- a/dlls/dplayx/dplayx_messages.h
+++ b/dlls/dplayx/dplayx_messages.h
@@ -1,3 +1,20 @@
+/*
+ * Copyright 2000 Peter Hunnisett
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef __WINE_DPLAYX_MESSAGES__
 #define __WINE_DPLAYX_MESSAGES__
diff --git a/dlls/dplayx/dplayx_queue.h b/dlls/dplayx/dplayx_queue.h
index 0ef9b46ee7e..12c1f687849 100644
--- a/dlls/dplayx/dplayx_queue.h
+++ b/dlls/dplayx/dplayx_queue.h
@@ -1,7 +1,20 @@
 /* A queue definition based on sys/queue.h TAILQ definitions
  * 
- * Blame any implementation mistakes on Peter Hunnisett
- * <hunnise@nortelnetworks.com>
+ * Copyright 2000 Peter Hunnisett
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_DPLAYX_QUEUE_H
diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c
index 19361807419..ebb208192ef 100644
--- a/dlls/dplayx/dplobby.c
+++ b/dlls/dplayx/dplobby.c
@@ -4,13 +4,26 @@
  *
  * <presently under construction - contact hunnise@nortelnetworks.com>
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <string.h>
 #include "winerror.h"
 #include "winnt.h"
 #include "winreg.h"
 #include "winnls.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "dplobby.h"
 #include "dpinit.h"
@@ -18,7 +31,7 @@
 #include "dplayx_messages.h"
 #include "dplayx_queue.h"
 
-DEFAULT_DEBUG_CHANNEL(dplay);
+WINE_DEFAULT_DEBUG_CHANNEL(dplay);
 
 /*****************************************************************************
  * Predeclare the interface implementation structures
diff --git a/dlls/dplayx/lobbysp.c b/dlls/dplayx/lobbysp.c
index 3a1883088b9..364b77dfaaf 100644
--- a/dlls/dplayx/lobbysp.c
+++ b/dlls/dplayx/lobbysp.c
@@ -2,16 +2,30 @@
  * Providers interface required to communicate with Direct Play
  *
  * Copyright 2001 Peter Hunnisett <hunnise@nortelnetworks.com>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "winerror.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "lobbysp.h"
 #include "dplay_global.h"
 #include "dpinit.h"
 
-DEFAULT_DEBUG_CHANNEL(dplay);
+WINE_DEFAULT_DEBUG_CHANNEL(dplay);
 
 /* Prototypes */
 static BOOL DPLSP_CreateIUnknown( LPVOID lpSP );
diff --git a/dlls/dplayx/lobbysp.h b/dlls/dplayx/lobbysp.h
index ff3bc6d9379..a9efe35b258 100644
--- a/dlls/dplayx/lobbysp.h
+++ b/dlls/dplayx/lobbysp.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2001 Peter Hunnisett
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_LOBBY_SP_H
 #define __WINE_LOBBY_SP_H
 
diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c
index 8323dab5317..8f97b09b691 100644
--- a/dlls/dplayx/name_server.c
+++ b/dlls/dplayx/name_server.c
@@ -4,6 +4,19 @@
  *
  * <presently under construction - contact hunnise@nortelnetworks.com>
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
  
 /* NOTE: Methods with the NS_ prefix are name server methods */
@@ -12,7 +25,7 @@
 #include "winbase.h"
 #include "winnls.h"
 #include "wine/unicode.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "mmsystem.h"
 
 #include "dplayx_global.h"
@@ -23,7 +36,7 @@
 
 /* FIXME: Need to create a crit section, store and use it */
 
-DEFAULT_DEBUG_CHANNEL(dplay);
+WINE_DEFAULT_DEBUG_CHANNEL(dplay);
 
 /* NS specific structures */
 struct NSCacheData
diff --git a/dlls/dplayx/name_server.h b/dlls/dplayx/name_server.h
index 36a95a890d7..51caa877646 100644
--- a/dlls/dplayx/name_server.h
+++ b/dlls/dplayx/name_server.h
@@ -1,3 +1,20 @@
+/*
+ * Copyright 2000 Peter Hunnisett
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef __WINE_DPLAYX_NAMESERVER
 #define __WINE_DPLAYX_NAMESERVER
diff --git a/dlls/dplayx/version.rc b/dlls/dplayx/version.rc
index 545e647202f..e49955d9236 100644
--- a/dlls/dplayx/version.rc
+++ b/dlls/dplayx/version.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2001 Ove Kaaven
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #define WINE_FILEDESCRIPTION_STR "Wine DirectPlay"
 #define WINE_FILENAME_STR "dplayx.dll"
 #define WINE_PRODUCTVERSION 4,7,0,0
diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
index 3e0c9698f75..25448d64d18 100644
--- a/dlls/dsound/dsound_main.c
+++ b/dlls/dsound/dsound_main.c
@@ -3,6 +3,20 @@
  * Copyright 1998 Marcus Meissner
  * Copyright 1998 Rob Riggs
  * Copyright 2000-2001 TransGaming Technologies, Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 /*
  * Most thread locking is complete. There may be a few race
@@ -41,11 +55,11 @@
 #include "mmsystem.h"
 #include "mmddk.h"
 #include "wine/windef16.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "dsound.h"
 #include "dsdriver.h"
 
-DEFAULT_DEBUG_CHANNEL(dsound);
+WINE_DEFAULT_DEBUG_CHANNEL(dsound);
 
 /* these are eligible for tuning... they must be high on slow machines... */
 /* some stuff may get more responsive with lower values though... */
diff --git a/dlls/gdi/bidi16.c b/dlls/gdi/bidi16.c
index 71786dafc55..cebd7d264fe 100644
--- a/dlls/gdi/bidi16.c
+++ b/dlls/gdi/bidi16.c
@@ -1,13 +1,29 @@
 /*
  * Win16 BiDi functions
- * Right now, most of these functions do nothing.
+ * Copyright 2000 Erez Volk
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * NOTE: Right now, most of these functions do nothing.
  */
 
 #include "windef.h"
 #include "wine/wingdi16.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(gdi);
+WINE_DEFAULT_DEBUG_CHANNEL(gdi);
 
 /***********************************************************************
  *		RawTextOut   (GDI.530)
diff --git a/dlls/gdi/driver.c b/dlls/gdi/driver.c
index 40a7f3ad90f..94698b03d66 100644
--- a/dlls/gdi/driver.c
+++ b/dlls/gdi/driver.c
@@ -2,6 +2,20 @@
  * Graphics driver management functions
  *
  * Copyright 1996 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -11,9 +25,9 @@
 
 #include "gdi.h"
 #include "win16drv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(driver);
+WINE_DEFAULT_DEBUG_CHANNEL(driver);
 
 struct graphics_driver
 {
diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c
index f45469eb0a5..72a7e847007 100644
--- a/dlls/gdi/freetype.c
+++ b/dlls/gdi/freetype.c
@@ -4,6 +4,20 @@
  * Copyright 2001 Huw D M Davies for CodeWeavers.
  *
  * This file contains the WineEng* functions.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 
@@ -17,7 +31,7 @@
 #include "wine/port.h"
 #include "gdi.h"
 #include "font.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include <sys/stat.h>
 #include <string.h>
@@ -25,7 +39,7 @@
 #include <stdio.h>
 #include <assert.h>
 
-DEFAULT_DEBUG_CHANNEL(font);
+WINE_DEFAULT_DEBUG_CHANNEL(font);
 
 #ifdef HAVE_FREETYPE
 
diff --git a/dlls/gdi/gdi_main.c b/dlls/gdi/gdi_main.c
index 0fac9f50ecd..3e9e3d1674e 100644
--- a/dlls/gdi/gdi_main.c
+++ b/dlls/gdi/gdi_main.c
@@ -1,5 +1,21 @@
 /*
  * GDI initialization code
+ *
+ * Copyright 2000 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
diff --git a/dlls/gdi/printdrv.c b/dlls/gdi/printdrv.c
index 8922f05cee9..e9d3489061c 100644
--- a/dlls/gdi/printdrv.c
+++ b/dlls/gdi/printdrv.c
@@ -5,6 +5,20 @@
  * Copyright 1998 Huw Davies
  * Copyright 1998 Andreas Mohr
  * Copyright 1999 Klaas van Gend
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -23,12 +37,12 @@
 #include "winspool.h"
 #include "winerror.h"
 #include "winreg.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "gdi.h"
 #include "heap.h"
 #include "file.h"
 
-DEFAULT_DEBUG_CHANNEL(print);
+WINE_DEFAULT_DEBUG_CHANNEL(print);
 
 static char PrinterModel[]	= "Printer Model";
 static char DefaultDevMode[]	= "Default DevMode";
diff --git a/dlls/gdi/version.rc b/dlls/gdi/version.rc
index 59a3f679a61..bd2a6bcbbb8 100644
--- a/dlls/gdi/version.rc
+++ b/dlls/gdi/version.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2001 Dmitry Timoshkov
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #define WINE_FILEVERSION_STR "1.0"
 #define WINE_FILEDESCRIPTION_STR "Wine core dll"
 #define WINE_FILENAME_STR "gdi32.dll"
diff --git a/dlls/gdi/version16.rc b/dlls/gdi/version16.rc
index 1300216797f..3095dd6e217 100644
--- a/dlls/gdi/version16.rc
+++ b/dlls/gdi/version16.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2001 Dmitry Timoshkov
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #define WINE_FILEVERSION_STR "1.0"
 #define WINE_FILEDESCRIPTION_STR "Wine core dll"
 #define WINE_FILENAME_STR "gdi.exe"
diff --git a/dlls/gdi/wing.c b/dlls/gdi/wing.c
index d382b8415c9..e692dc4841d 100644
--- a/dlls/gdi/wing.c
+++ b/dlls/gdi/wing.c
@@ -1,18 +1,32 @@
 /*
  * WinG support
  *
- * Started by Robert Pouliot <krynos@clic.net>
+ * Copyright (C) Robert Pouliot <krynos@clic.net>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
 
 #include "wine/winuser16.h"
 #include "bitmap.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "palette.h"
 #include "windef.h"
 
-DEFAULT_DEBUG_CHANNEL(wing);
+WINE_DEFAULT_DEBUG_CHANNEL(wing);
 
 
 typedef enum WING_DITHER_TYPE
diff --git a/dlls/glu32/glu.c b/dlls/glu32/glu.c
index 560a84d0cc0..df400baf628 100644
--- a/dlls/glu32/glu.c
+++ b/dlls/glu32/glu.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2001 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include "winbase.h"
 
 /***********************************************************************
diff --git a/dlls/icmp/icmp_main.c b/dlls/icmp/icmp_main.c
index 0e1f468f430..fb2f348732d 100644
--- a/dlls/icmp/icmp_main.c
+++ b/dlls/icmp/icmp_main.c
@@ -5,6 +5,20 @@
  *   RW Hall, 1999, based on public domain code PING.C by Mike Muus (1983) 
  *   and later works (c) 1989 Regents of Univ. of California - see copyright 
  *   notice at end of source-code.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* Future work:
@@ -52,7 +66,7 @@
 #include "winerror.h"
 #include "wine/ipexport.h"
 #include "wine/icmpapi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 /* Set up endiannes macros for the ip and ip_icmp BSD headers */
 #ifndef BIG_ENDIAN
@@ -81,7 +95,7 @@
 #include "ip_icmp.h"
 
 
-DEFAULT_DEBUG_CHANNEL(icmp);
+WINE_DEFAULT_DEBUG_CHANNEL(icmp);
 
 /* Define the following macro to use the winsock functions */
 /*#define ICMP_WIN*/
@@ -514,11 +528,7 @@ DWORD WINAPI IcmpSendEcho(
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/dlls/icmp/ip.h b/dlls/icmp/ip.h
index 8883d91a5ac..69480875da0 100644
--- a/dlls/icmp/ip.h
+++ b/dlls/icmp/ip.h
@@ -10,11 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/dlls/icmp/ip_icmp.h b/dlls/icmp/ip_icmp.h
index 33e6375758d..ce5449526d2 100644
--- a/dlls/icmp/ip_icmp.h
+++ b/dlls/icmp/ip_icmp.h
@@ -10,11 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c
index 935e3194810..43c2909bcfd 100644
--- a/dlls/imagehlp/access.c
+++ b/dlls/imagehlp/access.c
@@ -2,6 +2,20 @@
  *	IMAGEHLP library
  *
  *	Copyright 1998	Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -9,10 +23,10 @@
 #include "winnt.h"
 #include "winerror.h"
 #include "windef.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "imagehlp.h"
 
-DEFAULT_DEBUG_CHANNEL(imagehlp);
+WINE_DEFAULT_DEBUG_CHANNEL(imagehlp);
 
 /***********************************************************************
  *           Data
diff --git a/dlls/imagehlp/debug.c b/dlls/imagehlp/debug.c
index 9d191ff5d2e..330493b2321 100644
--- a/dlls/imagehlp/debug.c
+++ b/dlls/imagehlp/debug.c
@@ -2,15 +2,29 @@
  *	IMAGEHLP library
  *
  *	Copyright 1998	Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "winerror.h"
 #include "winbase.h"
 #include "windef.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "imagehlp.h"
 
-DEFAULT_DEBUG_CHANNEL(imagehlp);
+WINE_DEFAULT_DEBUG_CHANNEL(imagehlp);
 
 /***********************************************************************
  *		FindDebugInfoFile (IMAGEHLP.@)
diff --git a/dlls/imagehlp/imagehlp_main.c b/dlls/imagehlp/imagehlp_main.c
index ee64d22c95d..d638c09863e 100644
--- a/dlls/imagehlp/imagehlp_main.c
+++ b/dlls/imagehlp/imagehlp_main.c
@@ -2,15 +2,29 @@
  *	IMAGEHLP library
  *
  *	Copyright 1998	Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "imagehlp.h"
 #include "winerror.h"
 #include "winbase.h"
 #include "windef.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(imagehlp);
+WINE_DEFAULT_DEBUG_CHANNEL(imagehlp);
 
 /**********************************************************************/
 
diff --git a/dlls/imagehlp/integrity.c b/dlls/imagehlp/integrity.c
index e6e7b6742c0..0627a2bde19 100644
--- a/dlls/imagehlp/integrity.c
+++ b/dlls/imagehlp/integrity.c
@@ -2,15 +2,29 @@
  *	IMAGEHLP library
  *
  *	Copyright 1998	Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
 #include "imagehlp.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(imagehlp);
+WINE_DEFAULT_DEBUG_CHANNEL(imagehlp);
 
 /***********************************************************************
  *		ImageAddCertificate (IMAGEHLP.@)
diff --git a/dlls/imagehlp/internal.c b/dlls/imagehlp/internal.c
index 60049a7e6a6..dc8096f1db1 100644
--- a/dlls/imagehlp/internal.c
+++ b/dlls/imagehlp/internal.c
@@ -2,12 +2,26 @@
  *	IMAGEHLP library
  *
  *	Copyright 1998	Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "winbase.h"
 #include "winerror.h"
 #include "windef.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "imagehlp.h"
 
 /***********************************************************************
diff --git a/dlls/imagehlp/modify.c b/dlls/imagehlp/modify.c
index 31c62cb36f2..25fef449984 100644
--- a/dlls/imagehlp/modify.c
+++ b/dlls/imagehlp/modify.c
@@ -2,15 +2,29 @@
  *	IMAGEHLP library
  *
  *	Copyright 1998	Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "winbase.h"
 #include "winerror.h"
 #include "windef.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "imagehlp.h"
 
-DEFAULT_DEBUG_CHANNEL(imagehlp);
+WINE_DEFAULT_DEBUG_CHANNEL(imagehlp);
 
 static WORD CalcCheckSum(DWORD StartValue, LPVOID BaseAddress, DWORD WordCount);
 
diff --git a/dlls/imagehlp/symbol.c b/dlls/imagehlp/symbol.c
index 00ac33c8e0e..214082d633b 100644
--- a/dlls/imagehlp/symbol.c
+++ b/dlls/imagehlp/symbol.c
@@ -2,15 +2,29 @@
  *	IMAGEHLP library
  *
  *	Copyright 1998	Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "winbase.h"
 #include "winerror.h"
 #include "windef.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "imagehlp.h"
 
-DEFAULT_DEBUG_CHANNEL(imagehlp);
+WINE_DEFAULT_DEBUG_CHANNEL(imagehlp);
 
 /***********************************************************************
  *		SymCleanup (IMAGEHLP.@)
diff --git a/dlls/imm32/imc.c b/dlls/imm32/imc.c
index 5d27182fe43..07715bf908c 100644
--- a/dlls/imm32/imc.c
+++ b/dlls/imm32/imc.c
@@ -2,6 +2,20 @@
  *	Input Method Context
  *
  *	Copyright 2000 Hidenori Takeshima
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -13,8 +27,8 @@
 #include "winerror.h"
 #include "immddk.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(imm);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(imm);
 
 #include "imm_private.h"
 
diff --git a/dlls/imm32/imekl.c b/dlls/imm32/imekl.c
index e895fcf7046..c21ce2c77b6 100644
--- a/dlls/imm32/imekl.c
+++ b/dlls/imm32/imekl.c
@@ -2,6 +2,20 @@
  *	IME Keyboard Layout
  *
  *	Copyright 2000 Hidenori Takeshima
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -16,8 +30,8 @@
 #include "winreg.h"
 #include "immddk.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(imm);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(imm);
 
 #include "imm_private.h"
 
diff --git a/dlls/imm32/imewnd.c b/dlls/imm32/imewnd.c
index a305d2c0286..07ab5d08274 100644
--- a/dlls/imm32/imewnd.c
+++ b/dlls/imm32/imewnd.c
@@ -7,6 +7,20 @@
  * FIXME:
  *	- handle all messages.
  *	- handle all notifications.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -18,8 +32,8 @@
 #include "winerror.h"
 #include "immddk.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(imm);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(imm);
 
 #include "imm_private.h"
 
diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index 1689b3d58a6..0e5dbaf98e1 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -2,6 +2,20 @@
  *	IMM32 stubs - please implement!
  *
  *	Copyright 1998	Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "winbase.h"
@@ -11,8 +25,8 @@
 #include "winerror.h"
 #include "immddk.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(imm);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(imm);
 
 /***********************************************************************
  *		ImmAssociateContext (IMM32.@)
diff --git a/dlls/imm32/imm_private.h b/dlls/imm32/imm_private.h
index 1e20b4b49fd..7603fcf2fa0 100644
--- a/dlls/imm32/imm_private.h
+++ b/dlls/imm32/imm_private.h
@@ -2,6 +2,20 @@
  *	private header for implementing IMM.
  *
  *	Copyright 2000 Hidenori Takeshima
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 typedef struct IMM32_tagTHREADDATA	IMM32_THREADDATA;
diff --git a/dlls/imm32/immddk.h b/dlls/imm32/immddk.h
index 9377d66455f..662a8c215d3 100644
--- a/dlls/imm32/immddk.h
+++ b/dlls/imm32/immddk.h
@@ -1,4 +1,22 @@
-/* DDK version of imm.h - imm.h for IMM and IME. */
+/*
+ * DDK version of imm.h - imm.h for IMM and IME.
+ *
+ * Copyright 2000 Hidenori Takeshima
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef __WINE_IMMDDK_H
 #define __WINE_IMMDDK_H
diff --git a/dlls/imm32/main.c b/dlls/imm32/main.c
index 1a97a6bd3f2..0fa8f0a8273 100644
--- a/dlls/imm32/main.c
+++ b/dlls/imm32/main.c
@@ -2,6 +2,20 @@
  *	The entry point of IMM32.DLL.
  *
  *	Copyright 2000 Hidenori Takeshima
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -13,8 +27,8 @@
 #include "winerror.h"
 #include "immddk.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(imm);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(imm);
 
 #include "imm_private.h"
 
diff --git a/dlls/imm32/memory.c b/dlls/imm32/memory.c
index 5b5f3235874..375caae0e4a 100644
--- a/dlls/imm32/memory.c
+++ b/dlls/imm32/memory.c
@@ -2,6 +2,20 @@
  *	This file implements 'moveable' memory block.
  *
  *	Copyright 2000 Hidenori Takeshima
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -12,8 +26,8 @@
 #include "winuser.h"
 #include "winerror.h"
 #include "immddk.h"
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(imm);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(imm);
 
 #include "imm_private.h"
 
diff --git a/dlls/imm32/string.c b/dlls/imm32/string.c
index 8abc91a1b0b..a1ae2978bb3 100644
--- a/dlls/imm32/string.c
+++ b/dlls/imm32/string.c
@@ -2,6 +2,20 @@
  *	Helper functions for ANSI<->UNICODE string conversion
  *
  *	Copyright 2000 Hidenori Takeshima
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -13,8 +27,8 @@
 #include "winerror.h"
 #include "winnls.h"
 #include "immddk.h"
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(imm);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(imm);
 
 #include "imm_private.h"
 
diff --git a/dlls/kernel/comm.c b/dlls/kernel/comm.c
index 34e3afafd8d..65db7230ae6 100644
--- a/dlls/kernel/comm.c
+++ b/dlls/kernel/comm.c
@@ -3,6 +3,22 @@
  *
  * Copyright 1996 Marcus Meissner
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * History:
+ *
  * Apr 3, 1999.  Lawson Whitney <lawson_whitney@juno.com>
  * - Fixed the modem control part of EscapeCommFunction16.
  *
@@ -67,13 +83,13 @@
 #include "file.h"
 #include "heap.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #ifdef HAVE_LINUX_SERIAL_H
 #include <linux/serial.h>
 #endif
 
-DEFAULT_DEBUG_CHANNEL(comm);
+WINE_DEFAULT_DEBUG_CHANNEL(comm);
 
 #if !defined(TIOCINQ) && defined(FIONREAD)
 #define	TIOCINQ FIONREAD
diff --git a/dlls/kernel/console.c b/dlls/kernel/console.c
index 185e5fa9cba..085cd35ccb3 100644
--- a/dlls/kernel/console.c
+++ b/dlls/kernel/console.c
@@ -7,6 +7,20 @@
  * Copyright 1998 Marcus Meissner
  * Copyright 2001 Eric Pouech
  * Copyright 2001 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* Reference applications:
@@ -28,9 +42,9 @@
 #include "wine/server.h"
 #include "wine/exception.h"
 #include "wine/unicode.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(console);
+WINE_DEFAULT_DEBUG_CHANNEL(console);
 
 
 static UINT console_input_codepage;
diff --git a/dlls/kernel/debugger.c b/dlls/kernel/debugger.c
index a2d31218e77..1b834d7cb72 100644
--- a/dlls/kernel/debugger.c
+++ b/dlls/kernel/debugger.c
@@ -2,6 +2,20 @@
  * Win32 debugger functions
  *
  * Copyright (C) 1999 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
@@ -11,9 +25,9 @@
 #include "wine/winbase16.h"
 #include "wine/server.h"
 #include "stackframe.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(debugstr);
+WINE_DEFAULT_DEBUG_CHANNEL(debugstr);
 
 
 /******************************************************************************
diff --git a/dlls/kernel/flatthunk.h b/dlls/kernel/flatthunk.h
index 37036123626..e72e5d21a4c 100644
--- a/dlls/kernel/flatthunk.h
+++ b/dlls/kernel/flatthunk.h
@@ -2,6 +2,20 @@
  * Win95 Flat Thunk data structures
  *
  * Copyright 1998 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_FLATTHUNK_H
diff --git a/dlls/kernel/format_msg.c b/dlls/kernel/format_msg.c
index 59ba3104c7b..be7b58c60f7 100644
--- a/dlls/kernel/format_msg.c
+++ b/dlls/kernel/format_msg.c
@@ -2,6 +2,20 @@
  * FormatMessage implementation
  *
  * Copyright 1996 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -17,9 +31,9 @@
 #include "wine/unicode.h"
 
 #include "heap.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(resource);
+WINE_DEFAULT_DEBUG_CHANNEL(resource);
 
 
 /* Messages...used by FormatMessage32* (KERNEL32.something)
diff --git a/dlls/kernel/kernel.rc b/dlls/kernel/kernel.rc
index 0b0d955095e..e99b76fcd01 100644
--- a/dlls/kernel/kernel.rc
+++ b/dlls/kernel/kernel.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000 Dave Pickles
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include "locale_rc.rc"
 
 #include "messages/winerr_enu.mc.rc"
diff --git a/dlls/kernel/kernel_main.c b/dlls/kernel/kernel_main.c
index abd9dfe92ad..d04290a3a4d 100644
--- a/dlls/kernel/kernel_main.c
+++ b/dlls/kernel/kernel_main.c
@@ -1,5 +1,21 @@
 /*
  * Kernel initialization code
+ *
+ * Copyright 2000 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/dlls/kernel/locale_rc.rc b/dlls/kernel/locale_rc.rc
index f21dbb0d172..2706739e05e 100644
--- a/dlls/kernel/locale_rc.rc
+++ b/dlls/kernel/locale_rc.rc
@@ -1,3 +1,22 @@
+/*
+ * Copyright 1995 Martin von Loewis
+ * Copyright 1998 David Lee Lambert
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include "windef.h"
 #include "winnls.h"
 
diff --git a/dlls/kernel/messages/winerr_enu.mc b/dlls/kernel/messages/winerr_enu.mc
index f28d3ec2950..c85953ffee9 100644
--- a/dlls/kernel/messages/winerr_enu.mc
+++ b/dlls/kernel/messages/winerr_enu.mc
@@ -1,3 +1,21 @@
+;
+; Copyright 2000 Dave Pickles
+;
+; 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.
+;
+; This library is distributed in the hope that it will be useful,
+; 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+;
+
 LanguageNames=(ENU=0x409:winerr)
 
 MessageId=0
diff --git a/dlls/kernel/nls/afk.nls b/dlls/kernel/nls/afk.nls
index 41bd3b7e10e..7b380af48bb 100644
--- a/dlls/kernel/nls/afk.nls
+++ b/dlls/kernel/nls/afk.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Afrikaans (South Africa)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0436")
diff --git a/dlls/kernel/nls/ara.nls b/dlls/kernel/nls/ara.nls
index 54eea0fa3c9..19a13456e4e 100644
--- a/dlls/kernel/nls/ara.nls
+++ b/dlls/kernel/nls/ara.nls
@@ -3,6 +3,22 @@
  *      Arabic (Saudi Arabia)
  *
  *	(arabic strings in iso-8859-6)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0401")
diff --git a/dlls/kernel/nls/arb.nls b/dlls/kernel/nls/arb.nls
index 9bb29bfd069..8ed87c5e679 100644
--- a/dlls/kernel/nls/arb.nls
+++ b/dlls/kernel/nls/arb.nls
@@ -3,6 +3,22 @@
  *      Arabic (Lebanon)
  *
  *	(arabic strings in iso-8859-6)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"3001")
diff --git a/dlls/kernel/nls/are.nls b/dlls/kernel/nls/are.nls
index 82712bd1c84..e2f60eecf17 100644
--- a/dlls/kernel/nls/are.nls
+++ b/dlls/kernel/nls/are.nls
@@ -3,6 +3,22 @@
  *      Arabic (Egypt)
  *
  *	(arabic strings in iso-8859-6)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0c01")
diff --git a/dlls/kernel/nls/arg.nls b/dlls/kernel/nls/arg.nls
index 3b6d1c443a8..6133c7e8425 100644
--- a/dlls/kernel/nls/arg.nls
+++ b/dlls/kernel/nls/arg.nls
@@ -3,6 +3,22 @@
  *      Arabic (Algeria)
  *
  *	(arabic strings in iso-8859-6)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"1401")
diff --git a/dlls/kernel/nls/ari.nls b/dlls/kernel/nls/ari.nls
index 317f3bbc4cd..5d70d7bbddd 100644
--- a/dlls/kernel/nls/ari.nls
+++ b/dlls/kernel/nls/ari.nls
@@ -3,6 +3,22 @@
  *      Arabic (Iraq)
  *
  *	(arabic strings in iso-8859-6)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0801")
diff --git a/dlls/kernel/nls/ark.nls b/dlls/kernel/nls/ark.nls
index a188784b940..02fbdddf5ca 100644
--- a/dlls/kernel/nls/ark.nls
+++ b/dlls/kernel/nls/ark.nls
@@ -3,6 +3,22 @@
  *      Arabic (Kuwait)
  *
  *	(arabic strings in iso-8859-6)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"3401")
diff --git a/dlls/kernel/nls/arm.nls b/dlls/kernel/nls/arm.nls
index a79268ffd24..fa327548d28 100644
--- a/dlls/kernel/nls/arm.nls
+++ b/dlls/kernel/nls/arm.nls
@@ -3,6 +3,22 @@
  *      Arabic (Marocco)
  *
  *	(arabic strings in iso-8859-6)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"1801")
diff --git a/dlls/kernel/nls/aro.nls b/dlls/kernel/nls/aro.nls
index 61152839e6c..1fe6ace81f0 100644
--- a/dlls/kernel/nls/aro.nls
+++ b/dlls/kernel/nls/aro.nls
@@ -3,6 +3,22 @@
  *      Arabic (Oman)
  *
  *	(arabic strings in iso-8859-6)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"2001")
diff --git a/dlls/kernel/nls/arq.nls b/dlls/kernel/nls/arq.nls
index 8205feb6dd3..795d3344b9b 100644
--- a/dlls/kernel/nls/arq.nls
+++ b/dlls/kernel/nls/arq.nls
@@ -3,6 +3,22 @@
  *      Arabic (Quatar)
  *
  *	(arabic strings in iso-8859-6)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"4001")
diff --git a/dlls/kernel/nls/ars.nls b/dlls/kernel/nls/ars.nls
index d3e33f5fc72..9d9d738bd51 100644
--- a/dlls/kernel/nls/ars.nls
+++ b/dlls/kernel/nls/ars.nls
@@ -3,6 +3,22 @@
  *      Arabic (Syria)
  *
  *	(arabic strings in iso-8859-6)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"2801")
diff --git a/dlls/kernel/nls/art.nls b/dlls/kernel/nls/art.nls
index b1f8c16478b..736a11b8b5d 100644
--- a/dlls/kernel/nls/art.nls
+++ b/dlls/kernel/nls/art.nls
@@ -3,6 +3,22 @@
  *      Arabic (Tunisia)
  *
  *	(arabic strings in iso-8859-6)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"1c01")
diff --git a/dlls/kernel/nls/aru.nls b/dlls/kernel/nls/aru.nls
index 2a9373b1cb6..5dd0da83104 100644
--- a/dlls/kernel/nls/aru.nls
+++ b/dlls/kernel/nls/aru.nls
@@ -3,6 +3,22 @@
  *      Arabic (UAE)
  *
  *	(arabic strings in iso-8859-6)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"3801")
diff --git a/dlls/kernel/nls/bel.nls b/dlls/kernel/nls/bel.nls
index a7450d69937..53ec8d93695 100644
--- a/dlls/kernel/nls/bel.nls
+++ b/dlls/kernel/nls/bel.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Belarusian
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0423")
diff --git a/dlls/kernel/nls/bgr.nls b/dlls/kernel/nls/bgr.nls
index 770fa3b9a03..ee1555eca3b 100644
--- a/dlls/kernel/nls/bgr.nls
+++ b/dlls/kernel/nls/bgr.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Bulgaria
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0402")
diff --git a/dlls/kernel/nls/brf.nls b/dlls/kernel/nls/brf.nls
index f92d86d49f9..ab24849c189 100644
--- a/dlls/kernel/nls/brf.nls
+++ b/dlls/kernel/nls/brf.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Breton, France
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0493")
diff --git a/dlls/kernel/nls/cat.nls b/dlls/kernel/nls/cat.nls
index 329f2b37389..c5483aacf26 100644
--- a/dlls/kernel/nls/cat.nls
+++ b/dlls/kernel/nls/cat.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Catalan
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0403")
diff --git a/dlls/kernel/nls/cht.nls b/dlls/kernel/nls/cht.nls
index e74b583114e..aa4597af1d8 100644
--- a/dlls/kernel/nls/cht.nls
+++ b/dlls/kernel/nls/cht.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Chinese (Taiwan)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0404")
diff --git a/dlls/kernel/nls/cor.nls b/dlls/kernel/nls/cor.nls
index e8aa9b49f1a..7a0b307a38c 100644
--- a/dlls/kernel/nls/cor.nls
+++ b/dlls/kernel/nls/cor.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Cornish, United Kingdom
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE, "04891")
diff --git a/dlls/kernel/nls/cym.nls b/dlls/kernel/nls/cym.nls
index fdeb9f6ba6d..4578c001094 100644
--- a/dlls/kernel/nls/cym.nls
+++ b/dlls/kernel/nls/cym.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Welsh, United Kingdom
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE, "0492")
diff --git a/dlls/kernel/nls/cze.nls b/dlls/kernel/nls/cze.nls
index c6e39278237..3cbed891894 100644
--- a/dlls/kernel/nls/cze.nls
+++ b/dlls/kernel/nls/cze.nls
@@ -2,6 +2,22 @@
  *	OLE2NLS library
  *      Czech Republic
  *	(Czech strings in cp1250)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0405")
diff --git a/dlls/kernel/nls/dan.nls b/dlls/kernel/nls/dan.nls
index 9225a58bbca..b792fbed1dc 100644
--- a/dlls/kernel/nls/dan.nls
+++ b/dlls/kernel/nls/dan.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Denmark
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0406")
diff --git a/dlls/kernel/nls/dea.nls b/dlls/kernel/nls/dea.nls
index f741c1d7f9d..520f3f472e1 100644
--- a/dlls/kernel/nls/dea.nls
+++ b/dlls/kernel/nls/dea.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Austria
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
  
 LOCVAL(LOCALE_ILANGUAGE,"0c07")
diff --git a/dlls/kernel/nls/dec.nls b/dlls/kernel/nls/dec.nls
index 4063444b4ff..bcd8b037bef 100644
--- a/dlls/kernel/nls/dec.nls
+++ b/dlls/kernel/nls/dec.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Fuerstentum Liechtenstein
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
  
 LOCVAL(LOCALE_ILANGUAGE,"1407")
diff --git a/dlls/kernel/nls/del.nls b/dlls/kernel/nls/del.nls
index 5d0c12384aa..78cb27f55ca 100644
--- a/dlls/kernel/nls/del.nls
+++ b/dlls/kernel/nls/del.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Luxembourg (German)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"1007")
diff --git a/dlls/kernel/nls/des.nls b/dlls/kernel/nls/des.nls
index 41ae49104e1..32b2b02e628 100644
--- a/dlls/kernel/nls/des.nls
+++ b/dlls/kernel/nls/des.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Switzerland (German)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
  
 LOCVAL(LOCALE_ILANGUAGE,"0807")
diff --git a/dlls/kernel/nls/deu.nls b/dlls/kernel/nls/deu.nls
index 07cc469c87b..4737200afa4 100644
--- a/dlls/kernel/nls/deu.nls
+++ b/dlls/kernel/nls/deu.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Germany
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0407")
diff --git a/dlls/kernel/nls/ena.nls b/dlls/kernel/nls/ena.nls
index 10f357c7a98..7cacbbdc822 100644
--- a/dlls/kernel/nls/ena.nls
+++ b/dlls/kernel/nls/ena.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      English (Australian)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE, "0c09")
diff --git a/dlls/kernel/nls/enb.nls b/dlls/kernel/nls/enb.nls
index 25a95b26e43..5e7ec7caeff 100644
--- a/dlls/kernel/nls/enb.nls
+++ b/dlls/kernel/nls/enb.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Enlgish (Caribbean)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE, "2409")
diff --git a/dlls/kernel/nls/enc.nls b/dlls/kernel/nls/enc.nls
index 40bfaf952e5..e24dd93e0c3 100644
--- a/dlls/kernel/nls/enc.nls
+++ b/dlls/kernel/nls/enc.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      English (Canadian)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE, "1009")
diff --git a/dlls/kernel/nls/eng.nls b/dlls/kernel/nls/eng.nls
index a9793b33c61..5e57002ded7 100644
--- a/dlls/kernel/nls/eng.nls
+++ b/dlls/kernel/nls/eng.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      English (United Kingdom)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE, "0809")
diff --git a/dlls/kernel/nls/eni.nls b/dlls/kernel/nls/eni.nls
index 282ff98c3e5..6673b6eba25 100644
--- a/dlls/kernel/nls/eni.nls
+++ b/dlls/kernel/nls/eni.nls
@@ -1,6 +1,22 @@
 /* 
  * OLE2NLS library
  * 	English (Ireland)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */ 
 
 LOCVAL(LOCALE_ILANGUAGE, "1809")
diff --git a/dlls/kernel/nls/enj.nls b/dlls/kernel/nls/enj.nls
index 0724d00997d..d89789e449e 100644
--- a/dlls/kernel/nls/enj.nls
+++ b/dlls/kernel/nls/enj.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      English (Jamaica)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE, "2009")
diff --git a/dlls/kernel/nls/enl.nls b/dlls/kernel/nls/enl.nls
index c045362a5ed..a81426f84b6 100644
--- a/dlls/kernel/nls/enl.nls
+++ b/dlls/kernel/nls/enl.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      English (Belize)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE, "2809")
diff --git a/dlls/kernel/nls/ens.nls b/dlls/kernel/nls/ens.nls
index d4cb7db3af6..206728a0f5b 100644
--- a/dlls/kernel/nls/ens.nls
+++ b/dlls/kernel/nls/ens.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      English (South Africa)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE, "1c09")
diff --git a/dlls/kernel/nls/ent.nls b/dlls/kernel/nls/ent.nls
index 6115dabde32..1897aab4e3d 100644
--- a/dlls/kernel/nls/ent.nls
+++ b/dlls/kernel/nls/ent.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      English (Trinidad & Tobago)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE, "2c09")
diff --git a/dlls/kernel/nls/enu.nls b/dlls/kernel/nls/enu.nls
index aac5ffb4ef4..1eba76bc4c3 100644
--- a/dlls/kernel/nls/enu.nls
+++ b/dlls/kernel/nls/enu.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      English (United States)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE, "0409")
diff --git a/dlls/kernel/nls/enz.nls b/dlls/kernel/nls/enz.nls
index 41a9bcdb31f..7f60b0354bb 100644
--- a/dlls/kernel/nls/enz.nls
+++ b/dlls/kernel/nls/enz.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      English (New Zealand)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE, "1409")
diff --git a/dlls/kernel/nls/esa.nls b/dlls/kernel/nls/esa.nls
index 2d76b77c72c..44c40e639fd 100644
--- a/dlls/kernel/nls/esa.nls
+++ b/dlls/kernel/nls/esa.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Spanish (Panama)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"180a")
diff --git a/dlls/kernel/nls/esb.nls b/dlls/kernel/nls/esb.nls
index 6bf2eafb6cd..ceb6776c77b 100644
--- a/dlls/kernel/nls/esb.nls
+++ b/dlls/kernel/nls/esb.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Spanish (Bolivia)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"400a")
diff --git a/dlls/kernel/nls/esc.nls b/dlls/kernel/nls/esc.nls
index ccfa347b4b9..bb6e0bb5d29 100644
--- a/dlls/kernel/nls/esc.nls
+++ b/dlls/kernel/nls/esc.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Spanish (Costa Rica)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"140a")
diff --git a/dlls/kernel/nls/esd.nls b/dlls/kernel/nls/esd.nls
index 51c8d34b1b1..60aeae3576e 100644
--- a/dlls/kernel/nls/esd.nls
+++ b/dlls/kernel/nls/esd.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Spanish (Dominican Republic)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"1c0a")
diff --git a/dlls/kernel/nls/ese.nls b/dlls/kernel/nls/ese.nls
index 5cab2a98410..339164b4072 100644
--- a/dlls/kernel/nls/ese.nls
+++ b/dlls/kernel/nls/ese.nls
@@ -3,6 +3,22 @@
  *      Spanish (El Salvador)
  *
  *	(spanish strings in cp1252)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"440a")
diff --git a/dlls/kernel/nls/esf.nls b/dlls/kernel/nls/esf.nls
index 1687b80111c..43d115a3980 100644
--- a/dlls/kernel/nls/esf.nls
+++ b/dlls/kernel/nls/esf.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Spanish (Ecuador)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"300a")
diff --git a/dlls/kernel/nls/esg.nls b/dlls/kernel/nls/esg.nls
index fec2a69d95e..5ad50666900 100644
--- a/dlls/kernel/nls/esg.nls
+++ b/dlls/kernel/nls/esg.nls
@@ -2,6 +2,22 @@
  *	OLE2NLS library
  *      Spanish (Guatemala)
  *	(spanish strings in cp1252)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"100a")
diff --git a/dlls/kernel/nls/esh.nls b/dlls/kernel/nls/esh.nls
index 2754ce054a1..60a64307330 100644
--- a/dlls/kernel/nls/esh.nls
+++ b/dlls/kernel/nls/esh.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Spanish (Honduras)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"480a")
diff --git a/dlls/kernel/nls/esi.nls b/dlls/kernel/nls/esi.nls
index b4b3d44038c..079d0f605bd 100644
--- a/dlls/kernel/nls/esi.nls
+++ b/dlls/kernel/nls/esi.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Spanish (Nicaragua)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"4c0a")
diff --git a/dlls/kernel/nls/esl.nls b/dlls/kernel/nls/esl.nls
index 9c4a7f3d6ea..00fe84f7cb9 100644
--- a/dlls/kernel/nls/esl.nls
+++ b/dlls/kernel/nls/esl.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Spanish (Chile)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"340a")
diff --git a/dlls/kernel/nls/esm.nls b/dlls/kernel/nls/esm.nls
index 1e45e2bfe50..ae4a88ae6d1 100644
--- a/dlls/kernel/nls/esm.nls
+++ b/dlls/kernel/nls/esm.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Mexico
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"080a")
diff --git a/dlls/kernel/nls/esn.nls b/dlls/kernel/nls/esn.nls
index e404cb3a88d..3acd1a21680 100644
--- a/dlls/kernel/nls/esn.nls
+++ b/dlls/kernel/nls/esn.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Spanish (Modern Sort)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0c0a")
diff --git a/dlls/kernel/nls/eso.nls b/dlls/kernel/nls/eso.nls
index 7e8280f8dc3..8a96268599d 100644
--- a/dlls/kernel/nls/eso.nls
+++ b/dlls/kernel/nls/eso.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Spanish (Colombia)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"240a")
diff --git a/dlls/kernel/nls/esp.nls b/dlls/kernel/nls/esp.nls
index d8e7f05f148..cf03c4d39f3 100644
--- a/dlls/kernel/nls/esp.nls
+++ b/dlls/kernel/nls/esp.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Spanish (Traditional Sort)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"040a")
diff --git a/dlls/kernel/nls/esperanto.nls b/dlls/kernel/nls/esperanto.nls
index b4a572e4f75..fdaa57dbde5 100644
--- a/dlls/kernel/nls/esperanto.nls
+++ b/dlls/kernel/nls/esperanto.nls
@@ -17,6 +17,22 @@
  *	three letter codes I added an "x" to the end.	
  *
  *	(esperanto strings in iso-8859-3)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"048f")
diff --git a/dlls/kernel/nls/esr.nls b/dlls/kernel/nls/esr.nls
index 6aaddc6b300..e29c8b6c88d 100644
--- a/dlls/kernel/nls/esr.nls
+++ b/dlls/kernel/nls/esr.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Spanish (Peru)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"280a")
diff --git a/dlls/kernel/nls/ess.nls b/dlls/kernel/nls/ess.nls
index 5685cfbc5ca..3cfaa9fab56 100644
--- a/dlls/kernel/nls/ess.nls
+++ b/dlls/kernel/nls/ess.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Spanish (Argentina)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"2c0a")
diff --git a/dlls/kernel/nls/est.nls b/dlls/kernel/nls/est.nls
index 0fcb41906a3..6324d1b4659 100644
--- a/dlls/kernel/nls/est.nls
+++ b/dlls/kernel/nls/est.nls
@@ -3,6 +3,22 @@
  *      Estonia
  *
  *	(estonian strings in cp1252)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0425")
diff --git a/dlls/kernel/nls/esu.nls b/dlls/kernel/nls/esu.nls
index f4f36b461c9..a4c297346f5 100644
--- a/dlls/kernel/nls/esu.nls
+++ b/dlls/kernel/nls/esu.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Spanish (Puerto Rico)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"500a")
diff --git a/dlls/kernel/nls/esv.nls b/dlls/kernel/nls/esv.nls
index 41cd4977bbe..a4679e9c84b 100644
--- a/dlls/kernel/nls/esv.nls
+++ b/dlls/kernel/nls/esv.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Spanish (Venezuela)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"200a")
diff --git a/dlls/kernel/nls/esy.nls b/dlls/kernel/nls/esy.nls
index 63a721ac961..c02913d7ffd 100644
--- a/dlls/kernel/nls/esy.nls
+++ b/dlls/kernel/nls/esy.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Spanish (Uruguay)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"380a")
diff --git a/dlls/kernel/nls/esz.nls b/dlls/kernel/nls/esz.nls
index 954b44f1591..a49ae3d38f0 100644
--- a/dlls/kernel/nls/esz.nls
+++ b/dlls/kernel/nls/esz.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Spanish (Paraguay)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"3c0a")
diff --git a/dlls/kernel/nls/euq.nls b/dlls/kernel/nls/euq.nls
index 73a1f649c45..e80b6561049 100644
--- a/dlls/kernel/nls/euq.nls
+++ b/dlls/kernel/nls/euq.nls
@@ -3,6 +3,22 @@
  *      Basque
  *
  *	email: srtxg@chanae.alphanet.ch
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"042d")
diff --git a/dlls/kernel/nls/fin.nls b/dlls/kernel/nls/fin.nls
index cdac424b8e4..4fb6db3b6d9 100644
--- a/dlls/kernel/nls/fin.nls
+++ b/dlls/kernel/nls/fin.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Finland
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
  
 LOCVAL(LOCALE_ILANGUAGE,"040b")
diff --git a/dlls/kernel/nls/fos.nls b/dlls/kernel/nls/fos.nls
index 641509d7c31..ac4cc1ccc54 100644
--- a/dlls/kernel/nls/fos.nls
+++ b/dlls/kernel/nls/fos.nls
@@ -3,6 +3,22 @@
  *      Faroe Islands
  *
  *	(faroese strings in cp1252)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0438")
diff --git a/dlls/kernel/nls/fra.nls b/dlls/kernel/nls/fra.nls
index 3c89f395df6..e505d3af2f7 100644
--- a/dlls/kernel/nls/fra.nls
+++ b/dlls/kernel/nls/fra.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      France
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"040c")
diff --git a/dlls/kernel/nls/frb.nls b/dlls/kernel/nls/frb.nls
index 726e987a30c..9fe2a3165c9 100644
--- a/dlls/kernel/nls/frb.nls
+++ b/dlls/kernel/nls/frb.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Belgium
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"080c")
diff --git a/dlls/kernel/nls/frc.nls b/dlls/kernel/nls/frc.nls
index 6b300827382..d07a5c603cd 100644
--- a/dlls/kernel/nls/frc.nls
+++ b/dlls/kernel/nls/frc.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Canada (French)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0c0c")
diff --git a/dlls/kernel/nls/frl.nls b/dlls/kernel/nls/frl.nls
index c27ae82f787..55ea50a69f9 100644
--- a/dlls/kernel/nls/frl.nls
+++ b/dlls/kernel/nls/frl.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Luxemburg (French)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"140c")
diff --git a/dlls/kernel/nls/frs.nls b/dlls/kernel/nls/frs.nls
index b182871fece..e6d5851a19f 100644
--- a/dlls/kernel/nls/frs.nls
+++ b/dlls/kernel/nls/frs.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Switzerland (French)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"100c")
diff --git a/dlls/kernel/nls/gae.nls b/dlls/kernel/nls/gae.nls
index 1e8f7849000..14004f7ce11 100644
--- a/dlls/kernel/nls/gae.nls
+++ b/dlls/kernel/nls/gae.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Ireland (Gaeilge)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE, "043C") 
diff --git a/dlls/kernel/nls/gdh.nls b/dlls/kernel/nls/gdh.nls
index dbc8003a6d2..19aa1a506b9 100644
--- a/dlls/kernel/nls/gdh.nls
+++ b/dlls/kernel/nls/gdh.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Scots Gaelic, United Kingdom
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE, "0809")
diff --git a/dlls/kernel/nls/gdv.nls b/dlls/kernel/nls/gdv.nls
index 0b76012d3ca..ea867cc6ac9 100644
--- a/dlls/kernel/nls/gdv.nls
+++ b/dlls/kernel/nls/gdv.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Manx Gaelic, United Kingdom
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE, "0c3c")
diff --git a/dlls/kernel/nls/grc.nls b/dlls/kernel/nls/grc.nls
index d00d2f37fb4..16ae87e3d88 100644
--- a/dlls/kernel/nls/grc.nls
+++ b/dlls/kernel/nls/grc.nls
@@ -2,6 +2,22 @@
  *	OLE2NLS library
  *      Greek
  *	(Greek strings in cp1253)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0408")
diff --git a/dlls/kernel/nls/heb.nls b/dlls/kernel/nls/heb.nls
index 0b72b0c287e..f70f13de4c2 100644
--- a/dlls/kernel/nls/heb.nls
+++ b/dlls/kernel/nls/heb.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Hebrew (Israel)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"040d")
diff --git a/dlls/kernel/nls/hrv.nls b/dlls/kernel/nls/hrv.nls
index 5907d22decc..a616258c9ee 100644
--- a/dlls/kernel/nls/hrv.nls
+++ b/dlls/kernel/nls/hrv.nls
@@ -2,6 +2,22 @@
  *	OLE2NLS library
  *      Croatia
  *	(Croatian strings in cp1250)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"041a")
diff --git a/dlls/kernel/nls/hun.nls b/dlls/kernel/nls/hun.nls
index 01195283a65..f0c8c10696a 100644
--- a/dlls/kernel/nls/hun.nls
+++ b/dlls/kernel/nls/hun.nls
@@ -2,6 +2,22 @@
  *	OLE2NLS library
  *      Hungarian
  *	(Hungarian strings in cp1250)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"040e")
diff --git a/dlls/kernel/nls/ind.nls b/dlls/kernel/nls/ind.nls
index 9fb532d6f1c..e252559520d 100644
--- a/dlls/kernel/nls/ind.nls
+++ b/dlls/kernel/nls/ind.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Indonesia (Bahasa)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0421")
diff --git a/dlls/kernel/nls/isl.nls b/dlls/kernel/nls/isl.nls
index 24930eaadd0..73e4ccf6850 100644
--- a/dlls/kernel/nls/isl.nls
+++ b/dlls/kernel/nls/isl.nls
@@ -2,6 +2,22 @@
  *	OLE2NLS library
  *      Iceland
  *	(Icelandic strings in cp1252)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"040f")
diff --git a/dlls/kernel/nls/ita.nls b/dlls/kernel/nls/ita.nls
index 059806b483a..50d04712c08 100644
--- a/dlls/kernel/nls/ita.nls
+++ b/dlls/kernel/nls/ita.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Italy
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0410")
diff --git a/dlls/kernel/nls/its.nls b/dlls/kernel/nls/its.nls
index 95af3718ea5..4c6a112a1ee 100644
--- a/dlls/kernel/nls/its.nls
+++ b/dlls/kernel/nls/its.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Switzerland (Italiano)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0810")
diff --git a/dlls/kernel/nls/jpn.nls b/dlls/kernel/nls/jpn.nls
index 0ac854d3169..7ba2058ada0 100644
--- a/dlls/kernel/nls/jpn.nls
+++ b/dlls/kernel/nls/jpn.nls
@@ -3,6 +3,22 @@
  *      Japanese
  *	Japanese strings in codepage 932(Shift-JIS)
  *	modified by Hidenori Takeshima(hidenori@a2.ctktv.ne.jp)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0411")
diff --git a/dlls/kernel/nls/koj.nls b/dlls/kernel/nls/koj.nls
index 5529be00044..98586357afa 100644
--- a/dlls/kernel/nls/koj.nls
+++ b/dlls/kernel/nls/koj.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Korean (Johab)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0812")
diff --git a/dlls/kernel/nls/kor.nls b/dlls/kernel/nls/kor.nls
index af1921020be..a46b143484b 100644
--- a/dlls/kernel/nls/kor.nls
+++ b/dlls/kernel/nls/kor.nls
@@ -2,6 +2,22 @@
  *	OLE2NLS library
  *      Korean
  *      string using codepage 949
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
  
 LOCVAL(LOCALE_ILANGUAGE,"0412")
diff --git a/dlls/kernel/nls/lth.nls b/dlls/kernel/nls/lth.nls
index 3bb5fa0e21b..f6c718b43e9 100644
--- a/dlls/kernel/nls/lth.nls
+++ b/dlls/kernel/nls/lth.nls
@@ -2,6 +2,22 @@
  *	OLE2NLS library
  *      Lithuania
  *	(Lithuanian strings in BALTIC charset)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0427")
diff --git a/dlls/kernel/nls/lvi.nls b/dlls/kernel/nls/lvi.nls
index f498b369f8b..c2906b4a3a4 100644
--- a/dlls/kernel/nls/lvi.nls
+++ b/dlls/kernel/nls/lvi.nls
@@ -2,6 +2,22 @@
  *	OLE2NLS library
  *      Latvia
  *	(Latvian strings in BALTIC charset)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0426")
diff --git a/dlls/kernel/nls/msl.nls b/dlls/kernel/nls/msl.nls
index 15f02cfd6ca..6aaf6c90581 100644
--- a/dlls/kernel/nls/msl.nls
+++ b/dlls/kernel/nls/msl.nls
@@ -1,6 +1,22 @@
 /*
  *      Malay (Malaysia)
  *
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE, "043e")
diff --git a/dlls/kernel/nls/nlb.nls b/dlls/kernel/nls/nlb.nls
index 0c12aafc00b..28b78568adb 100644
--- a/dlls/kernel/nls/nlb.nls
+++ b/dlls/kernel/nls/nlb.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Dutch (Belgium)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0813")
diff --git a/dlls/kernel/nls/nld.nls b/dlls/kernel/nls/nld.nls
index dafc3a3c313..feecbe50c34 100644
--- a/dlls/kernel/nls/nld.nls
+++ b/dlls/kernel/nls/nld.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Dutch (Netherlands)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0413")
diff --git a/dlls/kernel/nls/nls.nls b/dlls/kernel/nls/nls.nls
index 648a25afd85..ba305d9fa2f 100644
--- a/dlls/kernel/nls/nls.nls
+++ b/dlls/kernel/nls/nls.nls
@@ -6,6 +6,22 @@
  *	It should be something + 0x13 as 0x13 is the Dutch language;
  *	Following the same logic as other multi-coutries languages
  *	I picked 0x0c13 for Surinam/Dutch.
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0c13")
diff --git a/dlls/kernel/nls/non.nls b/dlls/kernel/nls/non.nls
index 919dd84c11a..d744724cf8e 100644
--- a/dlls/kernel/nls/non.nls
+++ b/dlls/kernel/nls/non.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Norway (Nynorsk)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0814")
diff --git a/dlls/kernel/nls/nor.nls b/dlls/kernel/nls/nor.nls
index cfc5dfd7726..d90de65bb31 100644
--- a/dlls/kernel/nls/nor.nls
+++ b/dlls/kernel/nls/nor.nls
@@ -2,6 +2,22 @@
  *	OLE2NLS library
  *      Norway (Bokmaal)
  *	(Norwegian strings in cp1252)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0414")
diff --git a/dlls/kernel/nls/plk.nls b/dlls/kernel/nls/plk.nls
index b76603512bb..bb5e60d351b 100644
--- a/dlls/kernel/nls/plk.nls
+++ b/dlls/kernel/nls/plk.nls
@@ -2,6 +2,22 @@
  *	OLE2NLS library
  *      Poland
  *	(Polish strings in cp1250)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
         
 LOCVAL(LOCALE_ILANGUAGE,"0415")
diff --git a/dlls/kernel/nls/ptb.nls b/dlls/kernel/nls/ptb.nls
index c619bb7e13e..ccc1e04fd84 100644
--- a/dlls/kernel/nls/ptb.nls
+++ b/dlls/kernel/nls/ptb.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Brazil
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE, "0416")
diff --git a/dlls/kernel/nls/ptg.nls b/dlls/kernel/nls/ptg.nls
index 08fca5ab334..cce9ba2e2b1 100644
--- a/dlls/kernel/nls/ptg.nls
+++ b/dlls/kernel/nls/ptg.nls
@@ -3,6 +3,22 @@
  *      Portugal
  *
  *	(portuguese strings in cp1252)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE, "0816")
diff --git a/dlls/kernel/nls/rom.nls b/dlls/kernel/nls/rom.nls
index aaf8ffd9ca1..f8827dfaaff 100644
--- a/dlls/kernel/nls/rom.nls
+++ b/dlls/kernel/nls/rom.nls
@@ -2,6 +2,22 @@
  *	OLE2NLS library
  *      Romania
  *	(Romanian strings in cp1250)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0418")
diff --git a/dlls/kernel/nls/rus.nls b/dlls/kernel/nls/rus.nls
index f8ea0a7f4fd..76bb7188255 100644
--- a/dlls/kernel/nls/rus.nls
+++ b/dlls/kernel/nls/rus.nls
@@ -2,6 +2,22 @@
  *	OLE2NLS library
  *      Russia
  *	(russian strings in cp1251)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0419")
diff --git a/dlls/kernel/nls/sky.nls b/dlls/kernel/nls/sky.nls
index c436cbdb117..0e8453a2fa0 100644
--- a/dlls/kernel/nls/sky.nls
+++ b/dlls/kernel/nls/sky.nls
@@ -2,6 +2,22 @@
  *	OLE2NLS library
  *      Slovakia
  *	(Slovakian strings in cp1250)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"041b")
diff --git a/dlls/kernel/nls/slv.nls b/dlls/kernel/nls/slv.nls
index c8c7f20be6b..faef17d1306 100644
--- a/dlls/kernel/nls/slv.nls
+++ b/dlls/kernel/nls/slv.nls
@@ -2,6 +2,22 @@
  *	OLE2NLS library
  *      Slovenia
  *	(Slovenian strings in cp1250)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0424")
diff --git a/dlls/kernel/nls/sqi.nls b/dlls/kernel/nls/sqi.nls
index 415d67fa17b..574f7430f94 100644
--- a/dlls/kernel/nls/sqi.nls
+++ b/dlls/kernel/nls/sqi.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Albania
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"041c")
diff --git a/dlls/kernel/nls/srb.nls b/dlls/kernel/nls/srb.nls
index 6214622bc12..72bbafbdff2 100644
--- a/dlls/kernel/nls/srb.nls
+++ b/dlls/kernel/nls/srb.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Serbia
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0c1a")
diff --git a/dlls/kernel/nls/srl.nls b/dlls/kernel/nls/srl.nls
index d0ecdd7a03e..ce333eaabe7 100644
--- a/dlls/kernel/nls/srl.nls
+++ b/dlls/kernel/nls/srl.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Serbian (Latin)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"081a")
diff --git a/dlls/kernel/nls/sve.nls b/dlls/kernel/nls/sve.nls
index 0e111d6b898..93eef913651 100644
--- a/dlls/kernel/nls/sve.nls
+++ b/dlls/kernel/nls/sve.nls
@@ -3,6 +3,22 @@
  *      Sweden
  *
  *	(swedish strings in cp1252)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"041d")
diff --git a/dlls/kernel/nls/svf.nls b/dlls/kernel/nls/svf.nls
index e0b4a5e8c1d..429dd88d5cc 100644
--- a/dlls/kernel/nls/svf.nls
+++ b/dlls/kernel/nls/svf.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Finland (Swedish)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"081d")
diff --git a/dlls/kernel/nls/tha.nls b/dlls/kernel/nls/tha.nls
index f49cb98e460..04e2f7ceede 100644
--- a/dlls/kernel/nls/tha.nls
+++ b/dlls/kernel/nls/tha.nls
@@ -1,6 +1,22 @@
 /*
  *    OLE2NLS library
  *    Thai
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 LOCVAL(LOCALE_ILANGUAGE, "041e")
 LOCVAL(LOCALE_SLANGUAGE, "Thai")
diff --git a/dlls/kernel/nls/trk.nls b/dlls/kernel/nls/trk.nls
index d7858d2a361..3da8d40cd4e 100644
--- a/dlls/kernel/nls/trk.nls
+++ b/dlls/kernel/nls/trk.nls
@@ -2,6 +2,22 @@
  *	OLE2NLS library
  *      Turkey
  *	(Turkish strings in cp1254)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"041f")
diff --git a/dlls/kernel/nls/ukr.nls b/dlls/kernel/nls/ukr.nls
index c63a9e14f93..2f32566240f 100644
--- a/dlls/kernel/nls/ukr.nls
+++ b/dlls/kernel/nls/ukr.nls
@@ -2,6 +2,22 @@
  *	OLE2NLS library
  *      Ukraine
  *	(ukrainian strings in cp1251)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0422")
diff --git a/dlls/kernel/nls/vie.nls b/dlls/kernel/nls/vie.nls
index 17ab9067405..195a9c67852 100644
--- a/dlls/kernel/nls/vie.nls
+++ b/dlls/kernel/nls/vie.nls
@@ -3,6 +3,22 @@
  *      Vietnam
  *
  *	(vietnamese strings in VISCII)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"042a")
diff --git a/dlls/kernel/nls/wal.nls b/dlls/kernel/nls/wal.nls
index 0eab85fe3ab..5c3346c7290 100644
--- a/dlls/kernel/nls/wal.nls
+++ b/dlls/kernel/nls/wal.nls
@@ -7,6 +7,22 @@
  * Si vos voloz aider avou li ratoûrnaedje des libes programes è walon,
  * vos poloz scrîre a l' adresse emile <linux-wa@chanae.alphanet.ch>
  * 
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0490") /* not official */
diff --git a/dlls/kernel/nls/zhh.nls b/dlls/kernel/nls/zhh.nls
index 23f522e2cf5..5359b58c3b5 100644
--- a/dlls/kernel/nls/zhh.nls
+++ b/dlls/kernel/nls/zhh.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Chinese (Hong Kong)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0c04")
diff --git a/dlls/kernel/nls/zhi.nls b/dlls/kernel/nls/zhi.nls
index f1d6ce74b1f..8d431f1afdc 100644
--- a/dlls/kernel/nls/zhi.nls
+++ b/dlls/kernel/nls/zhi.nls
@@ -3,6 +3,22 @@
  *      People's republic of China
  *
  *	(chinese strings in 8bit GuoBiao)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0804")
diff --git a/dlls/kernel/nls/zhs.nls b/dlls/kernel/nls/zhs.nls
index b2f8e8bfac1..5e185de767d 100644
--- a/dlls/kernel/nls/zhs.nls
+++ b/dlls/kernel/nls/zhs.nls
@@ -1,6 +1,22 @@
 /*
  *	OLE2NLS library
  *      Chinese (Singapore)
+ *
+ * Copyright 1998 Marcel Baur
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"1004")
diff --git a/dlls/kernel/stress.c b/dlls/kernel/stress.c
index a2c92fcb193..b25cd39c2fa 100644
--- a/dlls/kernel/stress.c
+++ b/dlls/kernel/stress.c
@@ -1,9 +1,27 @@
+/*
+ * Copyright 1994 Erik Bos
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <limits.h>
 #include "windef.h"
 #include "wine/windef16.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(stress);
+WINE_DEFAULT_DEBUG_CHANNEL(stress);
 
 /***********************************************************************
  *		AllocDiskSpace (STRESS.10)
diff --git a/dlls/kernel/string.c b/dlls/kernel/string.c
index d3433ffe138..61367ef231c 100644
--- a/dlls/kernel/string.c
+++ b/dlls/kernel/string.c
@@ -1,5 +1,21 @@
 /*
  * Kernel string functions
+ *
+ * Copyright 2001 Dmitry Timoshkov for Codeweavers
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <ctype.h>
diff --git a/dlls/kernel/sync.c b/dlls/kernel/sync.c
index 4d746428572..54e07516f46 100644
--- a/dlls/kernel/sync.c
+++ b/dlls/kernel/sync.c
@@ -2,6 +2,20 @@
  * Kernel synchronization objects
  *
  * Copyright 1998 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -15,9 +29,9 @@
 #include "wine/server.h"
 #include "wine/unicode.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(win32);
+WINE_DEFAULT_DEBUG_CHANNEL(win32);
 
 /*
  * Events
diff --git a/dlls/kernel/tests/atom.pl b/dlls/kernel/tests/atom.pl
index 764f0ecf28d..fa8ed39dca5 100644
--- a/dlls/kernel/tests/atom.pl
+++ b/dlls/kernel/tests/atom.pl
@@ -1,5 +1,22 @@
 ################################################################
 # Tests for atom API calls
+#
+# Copyright 2001 Alexandre Julliard
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 
 use wine;
 use winerror;
diff --git a/dlls/kernel/thunk.c b/dlls/kernel/thunk.c
index ad6286c2e37..b4c623748ed 100644
--- a/dlls/kernel/thunk.c
+++ b/dlls/kernel/thunk.c
@@ -5,6 +5,19 @@
  * Copyright 1997, 1998 Marcus Meissner
  * Copyright 1998       Ulrich Weigand
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -16,7 +29,7 @@
 #include "winerror.h"
 #include "wine/winbase16.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "flatthunk.h"
 #include "heap.h"
 #include "module.h"
@@ -24,7 +37,7 @@
 #include "stackframe.h"
 #include "task.h"
 
-DEFAULT_DEBUG_CHANNEL(thunk);
+WINE_DEFAULT_DEBUG_CHANNEL(thunk);
 
 #ifdef __i386__
 extern void __wine_call_from_16_thunk();
diff --git a/dlls/kernel/time.c b/dlls/kernel/time.c
index 4ddace8fa04..a18060d91f3 100644
--- a/dlls/kernel/time.c
+++ b/dlls/kernel/time.c
@@ -2,6 +2,20 @@
  * Win32 kernel functions
  *
  * Copyright 1995 Martin von Loewis and Cameron Heide
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -14,9 +28,9 @@
 #include "winerror.h"
 #include "winnls.h"
 #include "wine/unicode.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(win32);
+WINE_DEFAULT_DEBUG_CHANNEL(win32);
 
 /* maximum time adjustment in seconds for SetLocalTime and SetSystemTime */
 #define SETTIME_MAX_ADJUST 120
diff --git a/dlls/kernel/toolhelp.c b/dlls/kernel/toolhelp.c
index 7c1dc712935..bef701fe6ec 100644
--- a/dlls/kernel/toolhelp.c
+++ b/dlls/kernel/toolhelp.c
@@ -2,6 +2,20 @@
  * Misc Toolhelp functions
  *
  * Copyright 1996 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -16,9 +30,9 @@
 #include "tlhelp32.h"
 #include "toolhelp.h"
 #include "wine/server.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(toolhelp);
+WINE_DEFAULT_DEBUG_CHANNEL(toolhelp);
 
 
 /* FIXME: to make this work, we have to call back all these registered 
diff --git a/dlls/kernel/utthunk.c b/dlls/kernel/utthunk.c
index e8b66bc4a18..82f92474a66 100644
--- a/dlls/kernel/utthunk.c
+++ b/dlls/kernel/utthunk.c
@@ -2,14 +2,28 @@
  * Win32s Universal Thunk API
  *
  * Copyright 1999 Ulrich Weigand 
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "wine/winbase16.h"
 #include "ntddk.h"
 #include "module.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(thunk);
+WINE_DEFAULT_DEBUG_CHANNEL(thunk);
 
 #include "pshpack1.h"
 
diff --git a/dlls/kernel/version.rc b/dlls/kernel/version.rc
index 092b8d37884..14abf6d2349 100644
--- a/dlls/kernel/version.rc
+++ b/dlls/kernel/version.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2001 Dmitry Timoshkov
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #define WINE_FILEVERSION_STR "1.0"
 #define WINE_FILEDESCRIPTION_STR "Wine core dll"
 #define WINE_FILENAME_STR "kernel32.dll"
diff --git a/dlls/kernel/version16.rc b/dlls/kernel/version16.rc
index 7ed894c6270..6d7c7ccd5b8 100644
--- a/dlls/kernel/version16.rc
+++ b/dlls/kernel/version16.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2001 Dmitry Timoshkov
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #define WINE_FILEVERSION_STR "1.0"
 #define WINE_FILEDESCRIPTION_STR "Wine core dll"
 #define WINE_FILENAME_STR "krnl386.exe"
diff --git a/dlls/kernel/win87em.c b/dlls/kernel/win87em.c
index 28673ea48a6..394b7d66901 100644
--- a/dlls/kernel/win87em.c
+++ b/dlls/kernel/win87em.c
@@ -1,8 +1,26 @@
+/*
+ * Copyright 1993 Bob Amstadt
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <stdlib.h>
 #include "miscemu.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(int);
+WINE_DEFAULT_DEBUG_CHANNEL(int);
 
 struct Win87EmInfoStruct
 {
diff --git a/dlls/kernel/windebug.c b/dlls/kernel/windebug.c
index cd0784bf84e..19c00891a13 100644
--- a/dlls/kernel/windebug.c
+++ b/dlls/kernel/windebug.c
@@ -2,15 +2,29 @@
  * WINDEBUG.DLL
  *
  * Copyright (c) 1997 Andreas Mohr
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
 #include <stdlib.h>
 #include "windef.h"
 #include "module.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(dll);
+WINE_DEFAULT_DEBUG_CHANNEL(dll);
 
 /***********************************************************************
  *           WinNotify       (WINDEBUG.3)
diff --git a/dlls/kernel/wowthunk.c b/dlls/kernel/wowthunk.c
index 517c037703d..a9c2155292f 100644
--- a/dlls/kernel/wowthunk.c
+++ b/dlls/kernel/wowthunk.c
@@ -2,6 +2,20 @@
  * Win32 WOW Generic Thunk API
  *
  * Copyright 1999 Ulrich Weigand 
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "wine/winbase16.h"
@@ -10,9 +24,9 @@
 #include "file.h"
 #include "miscemu.h"
 #include "stackframe.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(thunk);
+WINE_DEFAULT_DEBUG_CHANNEL(thunk);
 
 /*
  * These are the 16-bit side WOW routines.  They reside in wownt16.h 
diff --git a/dlls/lzexpand/lzexpand_main.c b/dlls/lzexpand/lzexpand_main.c
index d7400ddb042..e0d11a2a633 100644
--- a/dlls/lzexpand/lzexpand_main.c
+++ b/dlls/lzexpand/lzexpand_main.c
@@ -2,6 +2,20 @@
  * LZ Decompression functions 
  *
  * Copyright 1996 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 /* 
  * FIXME: return values might be wrong
@@ -20,9 +34,9 @@
 #include "wine/unicode.h"
 #include "wine/winbase16.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(file);
+WINE_DEFAULT_DEBUG_CHANNEL(file);
 
 /* The readahead length of the decompressor. Reading single bytes
  * using _lread() would be SLOW.
diff --git a/dlls/make_dlls b/dlls/make_dlls
index c5e8f44ec62..d0979914b67 100755
--- a/dlls/make_dlls
+++ b/dlls/make_dlls
@@ -5,6 +5,20 @@
 #
 # Copyright 2001 Alexandre Julliard
 #
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 
 $makefiles = `find . -name Makefile.in -print`;
 
diff --git a/dlls/mapi32/mapi32_main.c b/dlls/mapi32/mapi32_main.c
index 3c4132c57ae..1d1c4eb3180 100644
--- a/dlls/mapi32/mapi32_main.c
+++ b/dlls/mapi32/mapi32_main.c
@@ -1,16 +1,30 @@
 /*
  *             MAPI basics
  *
- *  2001 Codeweavers Inc.
+ * Copyright 2001 Codeweavers Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
 #include "winerror.h"
 #include "mapi.h"
 #include "mapicode.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(mapi);
+WINE_DEFAULT_DEBUG_CHANNEL(mapi);
 
 HRESULT WINAPI MAPIInitialize ( LPVOID lpMapiInit )
 {
diff --git a/dlls/mpr/auth.c b/dlls/mpr/auth.c
index e9ff0747d60..53980ecefa5 100644
--- a/dlls/mpr/auth.c
+++ b/dlls/mpr/auth.c
@@ -1,12 +1,28 @@
 /*
  * MPR Authentication and Logon functions
+ *
+ * Copyright 1999 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "winbase.h"
 #include "winnetwk.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(mpr);
+WINE_DEFAULT_DEBUG_CHANNEL(mpr);
 
 
 /*****************************************************************
diff --git a/dlls/mpr/mpr_main.c b/dlls/mpr/mpr_main.c
index ff2a86d57f1..f81f684b597 100644
--- a/dlls/mpr/mpr_main.c
+++ b/dlls/mpr/mpr_main.c
@@ -1,12 +1,28 @@
 /*
  * MPR undocumented functions
+ *
+ * Copyright 1999 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "winbase.h"
 #include "winnetwk.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(mpr);
+WINE_DEFAULT_DEBUG_CHANNEL(mpr);
 
  /* 
   * FIXME: The following routines should use a private heap ...
diff --git a/dlls/mpr/multinet.c b/dlls/mpr/multinet.c
index 05e6c01bd70..575eb55fc6e 100644
--- a/dlls/mpr/multinet.c
+++ b/dlls/mpr/multinet.c
@@ -1,12 +1,28 @@
 /*
  * MPR Multinet functions
+ *
+ * Copyright 1999 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "winbase.h"
 #include "winnetwk.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(mpr);
+WINE_DEFAULT_DEBUG_CHANNEL(mpr);
 
 
 /*****************************************************************
diff --git a/dlls/mpr/nps.c b/dlls/mpr/nps.c
index 06234559b12..ad7bf375bc3 100644
--- a/dlls/mpr/nps.c
+++ b/dlls/mpr/nps.c
@@ -1,13 +1,29 @@
 /*
  * MPR Network Provider Services functions
+ *
+ * Copyright 1999 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "winbase.h"
 #include "winnetwk.h"
 #include "netspi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(mpr);
+WINE_DEFAULT_DEBUG_CHANNEL(mpr);
 
 
 /*****************************************************************
diff --git a/dlls/mpr/pwcache.c b/dlls/mpr/pwcache.c
index 0bf8ea1d52f..a483700e93b 100644
--- a/dlls/mpr/pwcache.c
+++ b/dlls/mpr/pwcache.c
@@ -1,12 +1,28 @@
 /*
  * MPR Password Cache functions
+ *
+ * Copyright 1999 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "winbase.h"
 #include "winnetwk.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(mpr);
+WINE_DEFAULT_DEBUG_CHANNEL(mpr);
 
 /**************************************************************************
  * WNetCachePassword [MPR.@]  Saves password in cache
diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c
index 3b7e799fe6f..39651e53ef3 100644
--- a/dlls/mpr/wnet.c
+++ b/dlls/mpr/wnet.c
@@ -1,5 +1,21 @@
 /*
  * MPR WNet functions
+ *
+ * Copyright 1999 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <ctype.h>
@@ -11,9 +27,9 @@
 #include "winbase.h"
 #include "winnls.h"
 #include "winnetwk.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(mpr);
+WINE_DEFAULT_DEBUG_CHANNEL(mpr);
 
 
 /*
diff --git a/dlls/msacm/driver.c b/dlls/msacm/driver.c
index 8c9c0768f4b..24f69159046 100644
--- a/dlls/msacm/driver.c
+++ b/dlls/msacm/driver.c
@@ -5,6 +5,20 @@
  *
  *      Copyright 1998  Patrik Stridvall
  *		  1999	Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
@@ -20,9 +34,9 @@
 #include "msacmdrv.h"
 #include "wineacm.h"
 #include "winreg.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(msacm);
+WINE_DEFAULT_DEBUG_CHANNEL(msacm);
 	
 /***********************************************************************
  *           acmDriverAddA (MSACM32.@)
diff --git a/dlls/msacm/filter.c b/dlls/msacm/filter.c
index 6e7ee45576c..012bc991cf2 100644
--- a/dlls/msacm/filter.c
+++ b/dlls/msacm/filter.c
@@ -4,6 +4,20 @@
  *      MSACM32 library
  *
  *      Copyright 1998  Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -14,9 +28,9 @@
 #include "msacm.h"
 #include "msacmdrv.h"
 #include "wineacm.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(msacm);
+WINE_DEFAULT_DEBUG_CHANNEL(msacm);
 
 /***********************************************************************
  *           acmFilterChooseA (MSACM32.@)
diff --git a/dlls/msacm/format.c b/dlls/msacm/format.c
index 863fd62477b..3635d574185 100644
--- a/dlls/msacm/format.c
+++ b/dlls/msacm/format.c
@@ -5,6 +5,20 @@
  *
  *      Copyright 1998  Patrik Stridvall
  *		  2000	Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -15,13 +29,13 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "wine/unicode.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "mmsystem.h"
 #include "msacm.h"
 #include "msacmdrv.h"
 #include "wineacm.h"
 
-DEFAULT_DEBUG_CHANNEL(msacm);
+WINE_DEFAULT_DEBUG_CHANNEL(msacm);
 
 static	PACMFORMATCHOOSEA	afc;
 
diff --git a/dlls/msacm/internal.c b/dlls/msacm/internal.c
index d23930b5c1e..417f3e0f294 100644
--- a/dlls/msacm/internal.c
+++ b/dlls/msacm/internal.c
@@ -5,6 +5,20 @@
  *
  *      Copyright 1998  Patrik Stridvall
  *		  1999	Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -19,9 +33,9 @@
 #include "msacm.h"
 #include "msacmdrv.h"
 #include "wineacm.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(msacm);
+WINE_DEFAULT_DEBUG_CHANNEL(msacm);
 
 /**********************************************************************/
 
diff --git a/dlls/msacm/msacm.rc b/dlls/msacm/msacm.rc
index 8288809a88c..1c34bfae31c 100644
--- a/dlls/msacm/msacm.rc
+++ b/dlls/msacm/msacm.rc
@@ -1,6 +1,21 @@
 /*
  * Top level resource file for MS ACM
  *
+ * Copyright 2000 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
diff --git a/dlls/msacm/msacm32_main.c b/dlls/msacm/msacm32_main.c
index cf55b6bda4e..80f92f75dbc 100644
--- a/dlls/msacm/msacm32_main.c
+++ b/dlls/msacm/msacm32_main.c
@@ -5,17 +5,31 @@
  *
  *      Copyright 1998  Patrik Stridvall
  *		  1999	Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "winbase.h"
 #include "winerror.h"
 #include "windef.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "msacm.h"
 #include "msacmdrv.h"
 #include "wineacm.h"
 
-DEFAULT_DEBUG_CHANNEL(msacm);
+WINE_DEFAULT_DEBUG_CHANNEL(msacm);
 	
 /**********************************************************************/
 	
diff --git a/dlls/msacm/msacm_main.c b/dlls/msacm/msacm_main.c
index dc4fb6094ce..9303b200d9f 100644
--- a/dlls/msacm/msacm_main.c
+++ b/dlls/msacm/msacm_main.c
@@ -2,6 +2,20 @@
  *      MSACM library
  *
  *      Copyright 1998  Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "winbase.h"
@@ -10,9 +24,9 @@
 #include "msacm.h"
 #include "msacmdrv.h"
 #include "wineacm.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(msacm);
+WINE_DEFAULT_DEBUG_CHANNEL(msacm);
 
 /**************************************************************************
  *		DllEntryPoint (MSACM.255)
diff --git a/dlls/msacm/msacmdrv.h b/dlls/msacm/msacmdrv.h
index 95ba50dc233..abf36d57c0b 100644
--- a/dlls/msacm/msacmdrv.h
+++ b/dlls/msacm/msacmdrv.h
@@ -1,5 +1,21 @@
 /*
- *      msacmdrv.h   -       Declarations for MSACM driver
+ * Declarations for MSACM driver
+ *
+ * Copyright 1998 Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_MSACMDRV_H
diff --git a/dlls/msacm/pcmconverter.c b/dlls/msacm/pcmconverter.c
index f895a84afc8..f368538f8b2 100644
--- a/dlls/msacm/pcmconverter.c
+++ b/dlls/msacm/pcmconverter.c
@@ -5,6 +5,20 @@
  *
  *      Copyright 2000		Eric Pouech
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  *	FIXME / TODO list
  *	+ most of the computation should be done in fixed point arithmetic 
  *	  instead of floating point (16 bits for integral part, and 16 bits
@@ -29,9 +43,9 @@
 #include "msacmdrv.h"
 #include "wineacm.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(msacm);
+WINE_DEFAULT_DEBUG_CHANNEL(msacm);
 
 /***********************************************************************
  *           PCM_drvOpen
diff --git a/dlls/msacm/stream.c b/dlls/msacm/stream.c
index 34465907527..62d4d2c7b27 100644
--- a/dlls/msacm/stream.c
+++ b/dlls/msacm/stream.c
@@ -5,6 +5,20 @@
  *
  *      Copyright 1998  Patrik Stridvall
  *		  1999	Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* TODO
@@ -18,13 +32,13 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "windef.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "mmsystem.h"
 #include "msacm.h"
 #include "msacmdrv.h"
 #include "wineacm.h"
 
-DEFAULT_DEBUG_CHANNEL(msacm);
+WINE_DEFAULT_DEBUG_CHANNEL(msacm);
     
 static PWINE_ACMSTREAM	ACM_GetStream(HACMSTREAM has)
 {
diff --git a/dlls/msacm/wineacm.h b/dlls/msacm/wineacm.h
index 13929b281e7..6b584348cc6 100644
--- a/dlls/msacm/wineacm.h
+++ b/dlls/msacm/wineacm.h
@@ -1,4 +1,22 @@
 /* -*- tab-width: 8; c-basic-offset: 4 -*- */
+/*
+ * Copyright 2000 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_WINEACM_H
 #define __WINE_WINEACM_H
 
diff --git a/dlls/msimg32/msimg32_main.c b/dlls/msimg32/msimg32_main.c
index 1661ac529f1..9d0e09c5113 100644
--- a/dlls/msimg32/msimg32_main.c
+++ b/dlls/msimg32/msimg32_main.c
@@ -1,8 +1,26 @@
+/*
+ * Copyright 2002 Uwe Bonnes
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include "winbase.h"
 #include "winerror.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(msimg32);
+WINE_DEFAULT_DEBUG_CHANNEL(msimg32);
 
 BOOL WINAPI GradientFill(HDC hdc, void * vert_array, ULONG nvert, 
 		    void * grad_array, ULONG ngrad, ULONG mode)
diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c
index 482bb0f2057..6e34fff0616 100644
--- a/dlls/msrle32/msrle32.c
+++ b/dlls/msrle32/msrle32.c
@@ -3,6 +3,20 @@
  *
  *	Copyright 2001 TAKESHIMA Hidenori <hidenori@a2.ctktv.ne.jp>
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  *	FIXME - encoding
  *	FIXME - RLE4
  *
@@ -17,8 +31,8 @@
 #include "mmsystem.h"
 #include "vfw.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(msrle32);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(msrle32);
 
 
 
diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c
index 0bf8117f207..e7e2461e95f 100644
--- a/dlls/msvcrt/console.c
+++ b/dlls/msvcrt/console.c
@@ -3,6 +3,20 @@
  *
  * Copyright 2000 Jon Griffiths
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * Note: init and free don't need MT locking since they are called at DLL
  * (de)attachment time, which is syncronised for us
  */
diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c
index 185215ed312..e64a6925ae7 100644
--- a/dlls/msvcrt/cpp.c
+++ b/dlls/msvcrt/cpp.c
@@ -2,6 +2,20 @@
  * msvcrt.dll C++ objects
  *
  * Copyright 2000 Jon Griffiths
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "msvcrt.h"
diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c
index d201acf3166..11b58a3d7b5 100644
--- a/dlls/msvcrt/ctype.c
+++ b/dlls/msvcrt/ctype.c
@@ -2,6 +2,20 @@
  * msvcrt.dll ctype functions
  *
  * Copyright 2000 Jon Griffiths
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "msvcrt.h"
 
diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c
index 62061936863..1a4200870a1 100644
--- a/dlls/msvcrt/data.c
+++ b/dlls/msvcrt/data.c
@@ -2,6 +2,20 @@
  * msvcrt.dll dll data items
  *
  * Copyright 2000 Jon Griffiths
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <math.h>
 #include "msvcrt.h"
diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c
index 8982f8940e6..e8fa8d4a808 100644
--- a/dlls/msvcrt/dir.c
+++ b/dlls/msvcrt/dir.c
@@ -5,6 +5,20 @@
  * Copyright 1996 Jukka Iivonen
  * Copyright 1997,2000 Uwe Bonnes
  * Copyright 2000 Jon Griffiths
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <time.h>
diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c
index 33053837d06..c213f1ea886 100644
--- a/dlls/msvcrt/environ.c
+++ b/dlls/msvcrt/environ.c
@@ -5,6 +5,20 @@
  * Copyright 1996 Jukka Iivonen
  * Copyright 1997,2000 Uwe Bonnes
  * Copyright 2000 Jon Griffiths
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "wine/unicode.h"
 #include "msvcrt.h"
diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c
index 20061ceea54..d5601afa013 100644
--- a/dlls/msvcrt/errno.c
+++ b/dlls/msvcrt/errno.c
@@ -2,6 +2,20 @@
  * msvcrt.dll errno functions
  *
  * Copyright 2000 Jon Griffiths
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "msvcrt.h"
diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c
index b4757d46766..5cf36fcba7b 100644
--- a/dlls/msvcrt/except.c
+++ b/dlls/msvcrt/except.c
@@ -3,6 +3,22 @@
  *
  * Copyright 2000 Jon Griffiths
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * NOTES:
+ *
  * See http://www.microsoft.com/msj/0197/exception/exception.htm,
  * but don't believe all of it.
  *
diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c
index a0dc17c0300..1c39ea14067 100644
--- a/dlls/msvcrt/exit.c
+++ b/dlls/msvcrt/exit.c
@@ -2,6 +2,20 @@
  * msvcrt.dll exit functions
  *
  * Copyright 2000 Jon Griffiths
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "msvcrt.h"
 
diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c
index 80c673e2d2d..19373af018e 100644
--- a/dlls/msvcrt/file.c
+++ b/dlls/msvcrt/file.c
@@ -5,6 +5,20 @@
  * Copyright 1996 Jukka Iivonen
  * Copyright 1997,2000 Uwe Bonnes
  * Copyright 2000 Jon Griffiths
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <time.h>
 #include <stdio.h>
diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c
index 6fc3c2217d6..0c6d36d7750 100644
--- a/dlls/msvcrt/heap.c
+++ b/dlls/msvcrt/heap.c
@@ -3,6 +3,20 @@
  *
  * Copyright 2000 Jon Griffiths
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * Note: Win32 heap operations are MT safe. We only lock the new
  *       handler and non atomic heap operations
  */
diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c
index d3d0bc27f97..0495183313d 100644
--- a/dlls/msvcrt/locale.c
+++ b/dlls/msvcrt/locale.c
@@ -2,6 +2,20 @@
  * msvcrt.dll locale functions
  *
  * Copyright 2000 Jon Griffiths
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "winnt.h"
 #include "winbase.h"
diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c
index d93352d8989..dd6683f8147 100644
--- a/dlls/msvcrt/lock.c
+++ b/dlls/msvcrt/lock.c
@@ -1,13 +1,27 @@
 /*
  * Copyright (c) 2002, TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "mtdll.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winbase.h"
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 typedef struct
 {
diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c
index 79488af829e..adc7214f9e5 100644
--- a/dlls/msvcrt/main.c
+++ b/dlls/msvcrt/main.c
@@ -2,6 +2,20 @@
  * msvcrt.dll initialisation functions
  *
  * Copyright 2000 Jon Griffiths
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "msvcrt.h"
 
diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c
index fa7196c1733..8bd91222607 100644
--- a/dlls/msvcrt/math.c
+++ b/dlls/msvcrt/math.c
@@ -2,6 +2,20 @@
  * msvcrt.dll math functions
  *
  * Copyright 2000 Jon Griffiths
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "config.h"
 #include "msvcrt.h"
diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c
index 1d2abd4dedf..37572310c86 100644
--- a/dlls/msvcrt/mbcs.c
+++ b/dlls/msvcrt/mbcs.c
@@ -4,6 +4,20 @@
  * Copyright 1999 Alexandre Julliard
  * Copyright 2000 Jon Griffths
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * FIXME
  * Not currently binary compatible with win32. MSVCRT_mbctype must be
  * populated correctly and the ismb* functions should reference it.
diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c
index 71a4762cfde..dd746e3860f 100644
--- a/dlls/msvcrt/misc.c
+++ b/dlls/msvcrt/misc.c
@@ -2,6 +2,20 @@
  * msvcrt.dll misc functions
  *
  * Copyright 2000 Jon Griffiths
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
diff --git a/dlls/msvcrt/ms_errno.h b/dlls/msvcrt/ms_errno.h
index 7b2fa3dea0e..99dbdb29034 100644
--- a/dlls/msvcrt/ms_errno.h
+++ b/dlls/msvcrt/ms_errno.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2001 Jon Griffiths
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_MSVCRT_ERRNO_H
 #define __WINE_MSVCRT_ERRNO_H
 
diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h
index c2e39aa9ba2..ba03a3df126 100644
--- a/dlls/msvcrt/msvcrt.h
+++ b/dlls/msvcrt/msvcrt.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2001 Jon Griffiths
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_MSVCRT_H
 #define __WINE_MSVCRT_H
 
diff --git a/dlls/msvcrt/mtdll.h b/dlls/msvcrt/mtdll.h
index ed4606742fb..d1ab2e978fa 100644
--- a/dlls/msvcrt/mtdll.h
+++ b/dlls/msvcrt/mtdll.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2002, TransGaming Technologies Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef WINE_MTDLL_H
 #define WINE_MTDLL_H
 
diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c
index 3d0e4d21bbe..e9b66fee546 100644
--- a/dlls/msvcrt/process.c
+++ b/dlls/msvcrt/process.c
@@ -6,6 +6,20 @@
  * Copyright 1997,2000 Uwe Bonnes
  * Copyright 2000 Jon Griffiths
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * FIXME:
  * -File handles need some special handling. Sometimes children get
  *  open file handles, sometimes not. The docs are confusing
diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c
index 11d6737be1e..4f8809a2f3c 100644
--- a/dlls/msvcrt/string.c
+++ b/dlls/msvcrt/string.c
@@ -5,6 +5,20 @@
  * Copyright 1996 Jukka Iivonen
  * Copyright 1997,2000 Uwe Bonnes
  * Copyright 2000 Jon Griffiths
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "msvcrt.h"
diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c
index a2351c09471..586561c11c2 100644
--- a/dlls/msvcrt/thread.c
+++ b/dlls/msvcrt/thread.c
@@ -2,6 +2,20 @@
  * msvcrt.dll thread functions
  *
  * Copyright 2000 Jon Griffiths
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "msvcrt.h"
 
diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c
index 580d9119334..38d2ec26c48 100644
--- a/dlls/msvcrt/time.c
+++ b/dlls/msvcrt/time.c
@@ -5,6 +5,20 @@
  * Copyright 1996 Jukka Iivonen
  * Copyright 1997,2000 Uwe Bonnes
  * Copyright 2000 Jon Griffiths
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <time.h>
diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c
index 523571e7b74..aeb71c07c4d 100644
--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1999 Alexandre Julliard
  * Copyright 2000 Jon Griffiths
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <limits.h>
 #include <stdio.h>
diff --git a/dlls/msvideo/drawdib.c b/dlls/msvideo/drawdib.c
index 93ad93fbaab..abf20bd650b 100644
--- a/dlls/msvideo/drawdib.c
+++ b/dlls/msvideo/drawdib.c
@@ -1,6 +1,20 @@
 /* 
  * Copyright 2000 Bradley Baetz
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * FIXME: Some flags are ignored
  *
  * Handle palettes
@@ -12,12 +26,12 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "wine/winbase16.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "vfw.h"
 #include "vfw16.h"
 #include "windef.h"
 
-DEFAULT_DEBUG_CHANNEL(msvideo);
+WINE_DEFAULT_DEBUG_CHANNEL(msvideo);
 
 typedef struct {
 	HDC hdc;
diff --git a/dlls/msvideo/mciwnd.c b/dlls/msvideo/mciwnd.c
index af32b2ce593..5483a456535 100644
--- a/dlls/msvideo/mciwnd.c
+++ b/dlls/msvideo/mciwnd.c
@@ -1,6 +1,20 @@
 /*
  * Copyright 2000 Eric Pouech 
  *
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
@@ -15,9 +29,9 @@
 #include "wine/mmsystem16.h"
 #include "digitalv.h"
 #include "commctrl.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(mci);
+WINE_DEFAULT_DEBUG_CHANNEL(mci);
 
 typedef struct {
    DWORD	dwStyle;
diff --git a/dlls/msvideo/msvideo_main.c b/dlls/msvideo/msvideo_main.c
index 82045ebf503..15eff37c607 100644
--- a/dlls/msvideo/msvideo_main.c
+++ b/dlls/msvideo/msvideo_main.c
@@ -2,6 +2,20 @@
  * Copyright 1998 Marcus Meissner
  * Copyright 2000 Bradley Baetz 
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * FIXME: This all assumes 32 bit codecs
  *		Win95 appears to prefer 32 bit codecs, even from 16 bit code.
  *		There is the ICOpenFunction16 to worry about still, though.
@@ -19,10 +33,10 @@
 #include "vfw.h"
 #include "vfw16.h"
 #include "wine/winbase16.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "stackframe.h"
 
-DEFAULT_DEBUG_CHANNEL(msvideo);
+WINE_DEFAULT_DEBUG_CHANNEL(msvideo);
 
 /* ### start build ### */
 extern LONG CALLBACK MSVIDEO_CallTo16_long_lwwll(FARPROC16,LONG,WORD,WORD,LONG,LONG);
diff --git a/dlls/msvideo/vfw16.h b/dlls/msvideo/vfw16.h
index ca4ca18831e..4266104d947 100644
--- a/dlls/msvideo/vfw16.h
+++ b/dlls/msvideo/vfw16.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1999 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_VFW16_H
 #define __WINE_VFW16_H
 
diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c
index 3357cda6666..a3bffe3b720 100644
--- a/dlls/netapi32/netapi32.c
+++ b/dlls/netapi32/netapi32.c
@@ -1,5 +1,19 @@
 /*		
  * Copyright 2001 Mike McCormack
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -13,7 +27,7 @@
 #include "winreg.h"
 #include "wingdi.h"
 #include "winuser.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winerror.h"
 #include "nb30.h"
 
@@ -44,7 +58,7 @@ sizeof((i).ifr_name)+(i).ifr_addr.sa_len)
 #  define ifreq_size(i) sizeof(struct ifreq)
 # endif /* defined(HAVE_SOCKADDR_SA_LEN) */
 
-DEFAULT_DEBUG_CHANNEL(netbios);
+WINE_DEFAULT_DEBUG_CHANNEL(netbios);
 
 HMODULE NETAPI32_hModule = 0;
 
diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c
index ebd6606c233..e6fb3bb7171 100644
--- a/dlls/ntdll/cdrom.c
+++ b/dlls/ntdll/cdrom.c
@@ -4,6 +4,20 @@
  * Copyright 1994 Martin Ayotte
  * Copyright 1999, 2001 Eric Pouech
  * Copyright 2000 Andreas Mohr
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -19,7 +33,7 @@
 #include "ntddcdrm.h"
 #include "drive.h"
 #include "file.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #ifdef HAVE_LINUX_CDROM_H
 # include <linux/cdrom.h>
@@ -31,7 +45,7 @@
 # include <sys/cdio.h>
 #endif
 
-DEFAULT_DEBUG_CHANNEL(cdrom);
+WINE_DEFAULT_DEBUG_CHANNEL(cdrom);
 
 /* FIXME: this is needed because we can't open simultaneously several times /dev/cdrom 
  * this should be removed when a proper device interface is implemented
diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c
index 64ef389f8cb..0233ef370de 100644
--- a/dlls/ntdll/critsection.c
+++ b/dlls/ntdll/critsection.c
@@ -2,6 +2,20 @@
  * Win32 critical sections
  *
  * Copyright 1998 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
@@ -10,10 +24,10 @@
 #include <sys/types.h>
 #include "winerror.h"
 #include "ntddk.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ntdll);
-DECLARE_DEBUG_CHANNEL(relay);
+WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
+WINE_DECLARE_DEBUG_CHANNEL(relay);
 
 /* Define the atomic exchange/inc/dec functions.
  * These are available in kernel32.dll already,
diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c
index 2df66593d50..35a5f737ca3 100644
--- a/dlls/ntdll/debugtools.c
+++ b/dlls/ntdll/debugtools.c
@@ -1,5 +1,21 @@
 /*
  * Debugging functions
+ *
+ * Copyright 2000 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
@@ -9,7 +25,7 @@
 #include <unistd.h>
 #include <ctype.h>
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "wine/exception.h"
 #include "thread.h"
 #include "winbase.h"
@@ -18,7 +34,7 @@
 #include "wtypes.h"
 #include "msvcrt/excpt.h"
 
-DECLARE_DEBUG_CHANNEL(tid);
+WINE_DECLARE_DEBUG_CHANNEL(tid);
 
 /* ---------------------------------------------------------------------- */
 
diff --git a/dlls/ntdll/error.c b/dlls/ntdll/error.c
index 3dc453cbb12..711337c929c 100644
--- a/dlls/ntdll/error.c
+++ b/dlls/ntdll/error.c
@@ -2,14 +2,28 @@
  * NTDLL error handling
  * 
  * Copyright 2000 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
 #include "ntddk.h"
 #include "winerror.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ntdll);
+WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
 
 struct error_table
 {
diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c
index 68596db031b..9e0b45587a0 100644
--- a/dlls/ntdll/exception.c
+++ b/dlls/ntdll/exception.c
@@ -3,6 +3,20 @@
  * 
  * Copyright 1999 Turchanov Sergey
  * Copyright 1999 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -17,10 +31,10 @@
 #include "stackframe.h"
 #include "miscemu.h"
 #include "wine/server.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "msvcrt/excpt.h"
 
-DEFAULT_DEBUG_CHANNEL(seh);
+WINE_DEFAULT_DEBUG_CHANNEL(seh);
 
 /* Exception record for handling exceptions happening inside exception handlers */
 typedef struct
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index fc4dbf4cc2b..d80c706470d 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -1,11 +1,29 @@
+/*
+ * Copyright 1999, 2000 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <stdlib.h>
 #include <string.h>
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "ntdll_misc.h"
 
 #include "ntddk.h"
 
-DEFAULT_DEBUG_CHANNEL(ntdll);
+WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
 
 /**************************************************************************
  *                 NtOpenFile				[NTDLL.@]
diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
index ac177e21a32..be2b00ff1c5 100644
--- a/dlls/ntdll/heap.c
+++ b/dlls/ntdll/heap.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1996 Alexandre Julliard
  * Copyright 1998 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -19,9 +33,9 @@
 #include "winnt.h"
 #include "heap.h"
 #include "thread.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(heap);
+WINE_DEFAULT_DEBUG_CHANNEL(heap);
 
 /* Note: the heap data structures are based on what Pietrek describes in his
  * book 'Windows 95 System Programming Secrets'. The layout is not exactly
diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c
index d6c3b6271e2..d6086fbce89 100644
--- a/dlls/ntdll/large_int.c
+++ b/dlls/ntdll/large_int.c
@@ -2,6 +2,20 @@
  * Large integer functions
  *
  * Copyright 2000 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "winnt.h"
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index d609d3ad601..56c942e77df 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2002 Dmitry Timoshkov for Codeweavers
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include "winbase.h"
 #include "ntdef.h"
 #include "winnt.h"
diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
index a11228970d0..0e4460bdb8c 100644
--- a/dlls/ntdll/misc.c
+++ b/dlls/ntdll/misc.c
@@ -1,5 +1,21 @@
 /*
  * Helper functions for ntdll
+ *
+ * Copyright 2000 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -7,10 +23,10 @@
 #include <time.h>
 #include <math.h>
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "ntdll_misc.h"
 
-DEFAULT_DEBUG_CHANNEL(ntdll);
+WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
 
 #if defined(__GNUC__) && defined(__i386__)
 #define DO_FPU(x,y) __asm__ __volatile__( x " %0;fwait" : "=m" (y) : )
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index 73a4abe8b2f..4a58d474bcc 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -5,19 +5,33 @@
  * In the original ntdll.dll they all seem to just call int 0x2e (down to the NTOSKRNL)
  *
  * Copyright 1996-1998 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "ntddk.h"
 #include "ntdll_misc.h"
 #include "wine/server.h"
 
-DEFAULT_DEBUG_CHANNEL(ntdll);
+WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
 
 /*
  *	Timer object
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index 9e2835b7ae9..2bf275cae48 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_NTDLL_MISC_H
 #define __WINE_NTDLL_MISC_H
 
diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c
index 437d2b6be10..217d41ed6ef 100644
--- a/dlls/ntdll/om.c
+++ b/dlls/ntdll/om.c
@@ -1,17 +1,33 @@
 /*
  *	Object management functions
+ *
+ * Copyright 1999, 2000 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "ntddk.h"
 #include "ntdll_misc.h"
 #include "wine/server.h"
 
-DEFAULT_DEBUG_CHANNEL(ntdll);
+WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
 
 /* move to somewhere */
 typedef void * POBJDIR_INFORMATION;
diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c
index f271c0f71a7..a6e82ae6d61 100644
--- a/dlls/ntdll/reg.c
+++ b/dlls/ntdll/reg.c
@@ -4,6 +4,20 @@
  * Copyright (C) 1999 Juergen Schmied
  * Copyright (C) 2000 Alexandre Julliard
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * NOTES:
  * 	HKEY_LOCAL_MACHINE	\\REGISTRY\\MACHINE
  *	HKEY_USERS		\\REGISTRY\\USER
@@ -12,7 +26,7 @@
  */
 
 #include <string.h>
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winreg.h"
 #include "winerror.h"
 #include "wine/unicode.h"
@@ -20,7 +34,7 @@
 #include "ntddk.h"
 #include "ntdll_misc.h"
 
-DEFAULT_DEBUG_CHANNEL(reg);
+WINE_DEFAULT_DEBUG_CHANNEL(reg);
 
 /* maximum length of a key/value name in bytes (without terminating null) */
 #define MAX_NAME_LENGTH ((MAX_PATH-1) * sizeof(WCHAR))
diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c
index a6cf39da67f..23431cbab0d 100644
--- a/dlls/ntdll/rtl.c
+++ b/dlls/ntdll/rtl.c
@@ -5,12 +5,26 @@
  * 
  * Copyright 1996-1998 Marcus Meissner
  *		  1999 Alex Korobka
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "windef.h"
 #include "winerror.h"
 #include "stackframe.h"
@@ -18,7 +32,7 @@
 #include "ntddk.h"
 #include "winreg.h"
 
-DEFAULT_DEBUG_CHANNEL(ntdll);
+WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
 
 
 static RTL_CRITICAL_SECTION peb_lock = CRITICAL_SECTION_INIT("peb_lock");
diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c
index 13164b98451..7a8b16a7f1c 100644
--- a/dlls/ntdll/rtlstr.c
+++ b/dlls/ntdll/rtlstr.c
@@ -3,6 +3,20 @@
  *
  * Copyright (C) 1996-1998 Marcus Meissner
  * Copyright (C) 2000      Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -14,9 +28,9 @@
 
 #include "ntddk.h"
 #include "wine/unicode.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ntdll);
+WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
 
 UINT NlsAnsiCodePage = 1252;
 BYTE NlsMbCodePageTag = 0;
diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c
index f8c0df8c7d7..37c79a15f61 100644
--- a/dlls/ntdll/sec.c
+++ b/dlls/ntdll/sec.c
@@ -2,6 +2,20 @@
  *	Security functions
  *
  *	Copyright 1996-1998 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -14,7 +28,7 @@
 #include "wine/exception.h"
 #include "file.h"
 #include "winnls.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winerror.h"
 #include "stackframe.h"
 
@@ -23,7 +37,7 @@
 #include "ntdll_misc.h"
 #include "msvcrt/excpt.h"
 
-DEFAULT_DEBUG_CHANNEL(ntdll);
+WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
 
 #define NT_SUCCESS(status) (status == STATUS_SUCCESS)
 
diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
index 5bf5ad2028a..dd9bc68620a 100644
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -2,6 +2,20 @@
  * i386 signal handling routines
  * 
  * Copyright 1999 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifdef __i386__
@@ -360,9 +374,9 @@ typedef struct
 #include "miscemu.h"
 #include "ntddk.h"
 #include "syslevel.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(seh);
+WINE_DEFAULT_DEBUG_CHANNEL(seh);
 
 static sigset_t all_sigs;
 
diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c
index e66ba500e3f..d50e16d79dd 100644
--- a/dlls/ntdll/signal_sparc.c
+++ b/dlls/ntdll/signal_sparc.c
@@ -2,6 +2,20 @@
  * Sparc signal handling routines
  * 
  * Copyright 1999 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifdef __sparc__
@@ -22,9 +36,9 @@
 #include "global.h"
 #include "stackframe.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(seh);
+WINE_DEFAULT_DEBUG_CHANNEL(seh);
 
 static sigset_t all_sigs;
 
diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c
index f2085fd0c32..c05aeaebd73 100644
--- a/dlls/ntdll/string.c
+++ b/dlls/ntdll/string.c
@@ -3,6 +3,20 @@
  *
  * Copyright 2000 Alexandre Julliard
  * Copyright 2000 Jon Griffiths
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c
index 37d8b629c09..ad6e4142c68 100644
--- a/dlls/ntdll/sync.c
+++ b/dlls/ntdll/sync.c
@@ -1,12 +1,28 @@
 /*
  *	Process synchronisation
+ *
+ * Copyright 1999, 2000 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "winerror.h"
 #include "wine/unicode.h"
@@ -14,7 +30,7 @@
 #include "ntddk.h"
 #include "ntdll_misc.h"
 
-DEFAULT_DEBUG_CHANNEL(ntdll);
+WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
 
 
 /*
diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c
index 111305c50c9..ce34d61f9dd 100644
--- a/dlls/ntdll/time.c
+++ b/dlls/ntdll/time.c
@@ -5,7 +5,21 @@
  * adapted to wine with special permissions of the author  
  * Rex Jolliff (rex@lvcablemodem.com)
  * 
- * 
+ * Copyright 1999 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -13,9 +27,9 @@
 #include <sys/time.h>
 #include <unistd.h>
 #include "ntddk.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ntdll);
+WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
 
 #define TICKSPERSEC        10000000
 #define TICKSPERMSEC       10000
diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c
index 4d5d55e7a09..13a7751f98b 100644
--- a/dlls/ntdll/wcstring.c
+++ b/dlls/ntdll/wcstring.c
@@ -3,6 +3,20 @@
  *
  * Copyright 2000 Alexandre Julliard
  * Copyright 2000 Jon Griffiths
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -15,9 +29,9 @@
 
 #include "ntddk.h"
 #include "wine/unicode.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ntdll);
+WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
 
 
 /*********************************************************************
diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index 93166d64e6e..34380c95477 100644
--- a/dlls/odbc32/proxyodbc.c
+++ b/dlls/odbc32/proxyodbc.c
@@ -5,8 +5,21 @@
  *  	1) its name is defined in the environment variable LIB_ODBC_DRIVER_MANAGER
  *	2) if LIB_ODBC_DRIVER_MANAGER is not defined, a default library libodbc.so will be used.
  *
- * Xiang Li, Corel Corporation, Nov. 12, 1999
+ * Copyright 1999 Xiang Li, Corel Corporation
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -18,7 +31,7 @@
 #include <assert.h>
 
 #include "winbase.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "sql.h"
 #include "sqltypes.h"
@@ -29,7 +42,7 @@
 static BOOL ODBC_LoadDriverManager(void);
 static BOOL ODBC_LoadDMFunctions(void);
 
-DEFAULT_DEBUG_CHANNEL(odbc);
+WINE_DEFAULT_DEBUG_CHANNEL(odbc);
 
 static const DM_FUNC template_func[] =
 {
diff --git a/dlls/odbc32/proxyodbc.h b/dlls/odbc32/proxyodbc.h
index 3017492421f..7d9e54afce3 100644
--- a/dlls/odbc32/proxyodbc.h
+++ b/dlls/odbc32/proxyodbc.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1999 Xiang Li, Corel Corporation
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef _PROXYMANAGER_H
 #define _PROXYMANAGER_H
 
diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c
index 333978444f3..45738b173aa 100644
--- a/dlls/ole32/antimoniker.c
+++ b/dlls/ole32/antimoniker.c
@@ -2,6 +2,20 @@
  *	                      AntiMonikers implementation
  *
  *               Copyright 1999  Noomen Hamza
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  ***************************************************************************************/
 
 #include <assert.h>
@@ -13,9 +27,9 @@
 #include "wine/obj_misc.h"
 #include "wine/obj_storage.h"
 #include "wine/obj_moniker.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 /* AntiMoniker data structure */
 typedef struct AntiMonikerImpl{
diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c
index 9807b4cb313..8dda0991392 100644
--- a/dlls/ole32/bindctx.c
+++ b/dlls/ole32/bindctx.c
@@ -2,6 +2,20 @@
  *	                      BindCtx implementation
  *
  *  Copyright 1999  Noomen Hamza
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  ***************************************************************************************/
 
 #include <string.h>
@@ -13,9 +27,9 @@
 #include "wine/obj_misc.h"
 #include "wine/obj_storage.h"
 #include "wine/obj_moniker.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 /* represent the first size table and it's increment block size */
 #define  BLOCK_TAB_SIZE 10 
diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c
index 93be042e493..02e08ca542a 100644
--- a/dlls/ole32/clipboard.c
+++ b/dlls/ole32/clipboard.c
@@ -4,6 +4,20 @@
  *      Copyright 1999  Noel Borthwick <noel@macadamian.com>
  *      Copyright 2000  Abey George <abey@macadamian.com>
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * NOTES:
  *    This file contains the implementation for the OLE Clipboard and its
  *    internal interfaces. The OLE clipboard interacts with an IDataObject
@@ -54,7 +68,7 @@
 #include "winerror.h"
 #include "winnls.h"
 #include "ole2.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "olestd.h"
 
 #include "storage32.h"
@@ -66,7 +80,7 @@
   #define MEMCTX_TASK -1
 #endif
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 /****************************************************************************
  * OLEClipbrd
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index 3cb7905a2eb..e58b00a3a2b 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -6,6 +6,20 @@
  *      Copyright 1999  Francis Beaudet
  *  Copyright 1999  Sylvain St-Germain
  *  Copyright 2002  Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -35,9 +49,9 @@
 #include "compobj_private.h"
 #include "ifs.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 /****************************************************************************
  *  COM External Lock structures and methods declaration
diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h
index 6f6d9bf58db..310854af17a 100644
--- a/dlls/ole32/compobj_private.h
+++ b/dlls/ole32/compobj_private.h
@@ -1,3 +1,25 @@
+/*
+ * Copyright 1995 Martin von Loewis
+ * Copyright 1998 Justin Bradford
+ * Copyright 1999 Francis Beaudet
+ * Copyright 1999 Sylvain St-Germain
+ * Copyright 2002 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_OLE_COMPOBJ_H
 #define __WINE_OLE_COMPOBJ_H
 
diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c
index dffc0ef2734..90aa77f4aaa 100644
--- a/dlls/ole32/compositemoniker.c
+++ b/dlls/ole32/compositemoniker.c
@@ -2,12 +2,26 @@
  *	                      CompositeMonikers implementation
  *
  *               Copyright 1999  Noomen Hamza
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  ***************************************************************************************/
 #include <assert.h>
 #include <string.h>
 #include "winbase.h"
 #include "winerror.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "wine/obj_base.h"
 #include "wine/obj_misc.h"
 #include "wine/obj_storage.h"
@@ -16,7 +30,7 @@
 #include "wine/unicode.h"
 #include "ole2.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 #define  BLOCK_TAB_SIZE 5 /* represent the first size table and it's increment block size */
 
diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c
index 9bda1e795bc..9a44559dead 100644
--- a/dlls/ole32/datacache.c
+++ b/dlls/ole32/datacache.c
@@ -4,6 +4,20 @@
  *      Copyright 1999  Francis Beaudet
  *      Copyright 2000  Abey George
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * NOTES:
  *    The OLE2 data cache supports a whole whack of
  *    interfaces including:
@@ -45,9 +59,9 @@
 #include "wine/obj_cache.h"
 #include "wine/unicode.h"
 #include "ole2.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 /****************************************************************************
  * PresentationDataHeader
diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c
index 39b852b1f6a..14adf2a0051 100644
--- a/dlls/ole32/defaulthandler.c
+++ b/dlls/ole32/defaulthandler.c
@@ -4,6 +4,20 @@
  *      Copyright 1999  Francis Beaudet
  *      Copyright 2000  Abey George
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * NOTES:
  *    The OLE2 default object handler supports a whole whack of
  *    interfaces including:
@@ -39,9 +53,9 @@
 #include "wine/unicode.h"
 #include "ole2.h"
 #include "wine/obj_oleview.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 /****************************************************************************
  * DefaultHandler
diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c
index b5a63d58cbd..268762647b5 100644
--- a/dlls/ole32/errorinfo.c
+++ b/dlls/ole32/errorinfo.c
@@ -3,6 +3,21 @@
  *
  * Copyright 2000 Patrik Stridvall, Juergen Schmied
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * NOTES:
  *
  * The errorinfo is a per-thread object. The reference is stored in the 
  * TEB at offset 0xf80
@@ -21,9 +36,9 @@
 #include "wine/unicode.h"
 #include "thread.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 /* this code is from SysAllocStringLen (ole2disp.c in oleaut32) */
 static BSTR WINAPI ERRORINFO_SysAllocString(const OLECHAR* in)
diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c
index 19de404dcf4..a7d023542ee 100644
--- a/dlls/ole32/filemoniker.c
+++ b/dlls/ole32/filemoniker.c
@@ -2,6 +2,20 @@
  *	                      FileMonikers implementation
  *
  *               Copyright 1999  Noomen Hamza
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  ***************************************************************************************/
 
 #include <assert.h>
@@ -10,7 +24,7 @@
 #include "winerror.h"
 #include "winnls.h"
 #include "wine/unicode.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "objbase.h"
 #include "wine/obj_storage.h"
 #include "wine/obj_moniker.h"
@@ -18,7 +32,7 @@
 
 #include "compobj_private.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 /* filemoniker data structure */
 typedef struct FileMonikerImpl{
diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c
index e3617f76340..6fa7750ec7e 100644
--- a/dlls/ole32/hglobalstream.c
+++ b/dlls/ole32/hglobalstream.c
@@ -5,6 +5,20 @@
  * for streams contained supported by an HGLOBAL pointer.
  *
  * Copyright 1999 Francis Beaudet
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -20,9 +34,9 @@
 #include "winbase.h"
 #include "winerror.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(storage);
+WINE_DEFAULT_DEBUG_CHANNEL(storage);
 
 /****************************************************************************
  * HGLOBALStreamImpl definition.
diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c
index d5a39aeef22..b88abc0ef46 100644
--- a/dlls/ole32/ifs.c
+++ b/dlls/ole32/ifs.c
@@ -2,6 +2,20 @@
  *	basic interfaces
  *
  *	Copyright 1997	Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -19,9 +33,9 @@
 #include "wine/winbase16.h"
 #include "ifs.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(relay);
+WINE_DEFAULT_DEBUG_CHANNEL(relay);
 
 /* --- IUnknown implementation */
 
diff --git a/dlls/ole32/ifs.h b/dlls/ole32/ifs.h
index 9ba9ab0fe3d..abf2c26b885 100644
--- a/dlls/ole32/ifs.h
+++ b/dlls/ole32/ifs.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1997 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_OLE_IFS_H
 #define __WINE_OLE_IFS_H
 
diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c
index ec6d5a3d203..4a74cf9bcf7 100644
--- a/dlls/ole32/itemmoniker.c
+++ b/dlls/ole32/itemmoniker.c
@@ -2,6 +2,20 @@
  *	                      ItemMonikers implementation
  *
  *           Copyright 1999  Noomen Hamza
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  ***************************************************************************************/
 
 #include <assert.h>
@@ -9,7 +23,7 @@
 #include "winerror.h"
 #include "winbase.h"
 #include "winnls.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "wine/obj_base.h"
 #include "wine/obj_misc.h"
 #include "wine/obj_storage.h"
@@ -17,7 +31,7 @@
 #include "wine/obj_inplace.h"
 #include "wine/unicode.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 /* ItemMoniker data structure */
 typedef struct ItemMonikerImpl{
diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c
index 65100afbfef..405796c6763 100644
--- a/dlls/ole32/marshal.c
+++ b/dlls/ole32/marshal.c
@@ -2,6 +2,20 @@
  *	Marshaling library
  *
  *  Copyright 2002  Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -31,9 +45,9 @@
 #include "compobj_private.h"
 #include "ifs.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 /* Marshaling just passes a unique identifier to the remote client,
  * that makes it possible to find the passed interface again.
diff --git a/dlls/ole32/memlockbytes.c b/dlls/ole32/memlockbytes.c
index 0d28dbceefd..8ad655b7047 100644
--- a/dlls/ole32/memlockbytes.c
+++ b/dlls/ole32/memlockbytes.c
@@ -4,6 +4,19 @@
  *
  * Copyright 1999 Thuy Nguyen
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -16,9 +29,9 @@
 #include "winbase.h"
 #include "winerror.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 /******************************************************************************
  * HGLOBALLockBytesImpl definition.
diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c
index 9853a65ead2..ce28586e6d4 100644
--- a/dlls/ole32/moniker.c
+++ b/dlls/ole32/moniker.c
@@ -3,6 +3,20 @@
  *
  *	Copyright 1998	Marcus Meissner
  *      Copyright 1999  Noomen Hamza
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
@@ -15,12 +29,12 @@
 #include "wine/obj_storage.h"
 #include "wine/obj_misc.h"
 #include "wine/obj_moniker.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "ole2.h"
 
 #include "compobj_private.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 #define  BLOCK_TAB_SIZE 20 /* represent the first size table and it's increment block size */
 
diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c
index 589d0c61e3b..a4f3aa62253 100644
--- a/dlls/ole32/ole2.c
+++ b/dlls/ole32/ole2.c
@@ -5,6 +5,20 @@
  *	Copyright 1995	Martin von Loewis
  *      Copyright 1999  Francis Beaudet
  *      Copyright 1999  Noel Borthwick 
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -29,10 +43,10 @@
 #include "wine/winuser16.h"
 #include "ole32_main.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
-DECLARE_DEBUG_CHANNEL(accel);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DECLARE_DEBUG_CHANNEL(accel);
 
 /******************************************************************************
  * These are static/global variables and internal data structures that the 
diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c
index c90ad0d3db5..3e2c22b8b67 100644
--- a/dlls/ole32/ole2impl.c
+++ b/dlls/ole32/ole2impl.c
@@ -2,18 +2,32 @@
  * Ole 2 Create functions implementation
  *
  * Copyright (C) 1999-2000 Abey George
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "ole2.h"
 #include "olestd.h"
 #include "winreg.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 #define MAX_CLIPFORMAT_NAME   80
 
diff --git a/dlls/ole32/ole2nls.c b/dlls/ole32/ole2nls.c
index 38953ea28ea..a18682ba13a 100644
--- a/dlls/ole32/ole2nls.c
+++ b/dlls/ole32/ole2nls.c
@@ -4,6 +4,20 @@
  *	Copyright 1995	Martin von Loewis
  *      Copyright 1998  David Lee Lambert
  *      Copyright 2000  Julio César Gázquez
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -24,9 +38,9 @@
 
 #include "wine/winbase16.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 static LPVOID lpNLSInfo = NULL;
 
diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c
index 26c21e4ece5..7cd95ae4357 100644
--- a/dlls/ole32/ole2stubs.c
+++ b/dlls/ole32/ole2stubs.c
@@ -3,15 +3,29 @@
  *
  * Copyright (C) 1999 Corel Corporation
  * Move these functions to dlls/ole32/ole2impl.c when you implement them.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 /******************************************************************************
  *               OleCreateLinkToFile        [OLE32.96]
diff --git a/dlls/ole32/ole32_main.c b/dlls/ole32/ole32_main.c
index 388a0aa06ad..7ebe5497782 100644
--- a/dlls/ole32/ole32_main.c
+++ b/dlls/ole32/ole32_main.c
@@ -1,13 +1,29 @@
 /*
  *  OLE32 Initialization
  *
+ * Copyright 2000 Huw D M Davies for Codeweavers
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 #include "windef.h"
 #include "winerror.h"
 #include "ole32_main.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 HINSTANCE OLE32_hInstance = 0;
 
diff --git a/dlls/ole32/ole32_main.h b/dlls/ole32/ole32_main.h
index 1428b4df1eb..bb1fef222cb 100644
--- a/dlls/ole32/ole32_main.h
+++ b/dlls/ole32/ole32_main.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000 Huw D M Davies for Codeweavers
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_OLE32_MAIN_H
 #define __WINE_OLE32_MAIN_H
 
diff --git a/dlls/ole32/ole32res.rc b/dlls/ole32/ole32res.rc
index 474bda96228..31578a5587a 100644
--- a/dlls/ole32/ole32res.rc
+++ b/dlls/ole32/ole32res.rc
@@ -1,6 +1,21 @@
 /*
  * Top level resource file for OLE32
  *
+ * Copyright 2000 Huw D M Davies for Codeweavers
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c
index da02cf67956..d5af7b93acb 100644
--- a/dlls/ole32/oleobj.c
+++ b/dlls/ole32/oleobj.c
@@ -3,16 +3,30 @@
  *
  *	Copyright 1998 Eric Kohl
  *      Copyright 1999 Francis Beaudet
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 
 #include <string.h>
 #include "winbase.h"
 #include "winerror.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "oleidl.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 #define INITIAL_SINKS 10
 
diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c
index f10838bacc3..8ca812f6793 100644
--- a/dlls/ole32/oleproxy.c
+++ b/dlls/ole32/oleproxy.c
@@ -2,6 +2,20 @@
  *	OLE32 proxy/stub handler
  *
  *  Copyright 2002  Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* Documentation on MSDN:
@@ -36,9 +50,9 @@
 
 #include "compobj_private.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 /* From: http://msdn.microsoft.com/library/en-us/com/cmi_m_4lda.asp
  *
diff --git a/dlls/ole32/olestd.h b/dlls/ole32/olestd.h
index e250b21cbdc..b5814fad4a4 100644
--- a/dlls/ole32/olestd.h
+++ b/dlls/ole32/olestd.h
@@ -1,8 +1,20 @@
-/*************************************************************************
-**
-**    olestd.h
-**
-*************************************************************************/
+/*
+ * Copyright 2000 Abey George
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #if !defined( __WINE_OLESTD_H_ )
 #define __WINE_OLESTD_H_
diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c
index 34a6aa14d60..5411e6c93de 100644
--- a/dlls/ole32/rpc.c
+++ b/dlls/ole32/rpc.c
@@ -2,6 +2,20 @@
  *	(Local) RPC Stuff
  *
  *  Copyright 2002  Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -33,9 +47,9 @@
 
 #include "compobj_private.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 typedef struct _wine_rpc_request {
     int				state;
diff --git a/dlls/ole32/stg_bigblockfile.c b/dlls/ole32/stg_bigblockfile.c
index 8c7caaea81f..e5957d19dc2 100644
--- a/dlls/ole32/stg_bigblockfile.c
+++ b/dlls/ole32/stg_bigblockfile.c
@@ -16,6 +16,19 @@
  *
  * Copyright 1999 Thuy Nguyen
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
@@ -32,9 +45,9 @@
 
 #include "storage32.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(storage);
+WINE_DEFAULT_DEBUG_CHANNEL(storage);
 
 /***********************************************************
  * Data structures used internally by the BigBlockFile
diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c
index f2da2fc34fe..0c1f3a38c6f 100644
--- a/dlls/ole32/stg_stream.c
+++ b/dlls/ole32/stg_stream.c
@@ -7,6 +7,20 @@
  *
  * Copyright 1999 Francis Beaudet
  * Copyright 1999 Thuy Nguyen
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <assert.h>
 #include <stdlib.h>
@@ -16,11 +30,11 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "ntddk.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "storage32.h"
 
-DEFAULT_DEBUG_CHANNEL(storage);
+WINE_DEFAULT_DEBUG_CHANNEL(storage);
 
 
 /*
diff --git a/dlls/ole32/storage.c b/dlls/ole32/storage.c
index 7acf9f4f06b..d861fff2933 100644
--- a/dlls/ole32/storage.c
+++ b/dlls/ole32/storage.c
@@ -5,6 +5,20 @@
  * (Thanks to Martin Schwartz <schwartz@cs.tu-berlin.de>)
  *
  * Copyright 1998 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
@@ -20,10 +34,10 @@
 #include "wtypes.h"
 #include "wine/obj_base.h"
 #include "wine/obj_storage.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
-DECLARE_DEBUG_CHANNEL(relay);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DECLARE_DEBUG_CHANNEL(relay);
 
 struct storage_header {
 	BYTE	magic[8];	/* 00: magic */
diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index b8100677fc4..c73e407165b 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -8,6 +8,20 @@
  * Copyright 1999 Francis Beaudet
  * Copyright 1999 Sylvain St-Germain
  * Copyright 1999 Thuy Nguyen
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
@@ -18,7 +32,7 @@
 #include "winbase.h" /* for lstrlenW() and the likes */
 #include "winnls.h"
 #include "wine/unicode.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "storage32.h"
 #include "ole2.h"      /* For Write/ReadClassStm */
@@ -26,7 +40,7 @@
 #include "winreg.h"
 #include "wine/wingdi16.h"
 
-DEFAULT_DEBUG_CHANNEL(storage);
+WINE_DEFAULT_DEBUG_CHANNEL(storage);
 
 #define FILE_BEGIN 0
 
diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h
index a4103bb8629..c1d16f21e9d 100644
--- a/dlls/ole32/storage32.h
+++ b/dlls/ole32/storage32.h
@@ -11,6 +11,20 @@
  *
  * Copyright 1998,1999 Francis Beaudet
  * Copyright 1998,1999 Thuy Nguyen
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #ifndef __STORAGE32_H__
 #define __STORAGE32_H__
diff --git a/dlls/oleaut32/connpt.c b/dlls/oleaut32/connpt.c
index 8026c83a733..516d1e380eb 100644
--- a/dlls/oleaut32/connpt.c
+++ b/dlls/oleaut32/connpt.c
@@ -3,6 +3,21 @@
  *
  * Copyright 2000 Huw D M Davies for CodeWeavers
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * NOTES:
  * See one exported function here is CreateConnectionPoint, see
  * comments just above that function for information.
  */
@@ -19,9 +34,9 @@
 #include "wine/obj_connection.h"
 #include "connpt.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 #define MAXSINKS 10
 
diff --git a/dlls/oleaut32/connpt.h b/dlls/oleaut32/connpt.h
index a65069c5e4b..b8fbb3a46d9 100644
--- a/dlls/oleaut32/connpt.h
+++ b/dlls/oleaut32/connpt.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000 Huw D M Davies for CodeWeavers
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef _CONNPT_H
 #define _CONNPT_H
 
diff --git a/dlls/oleaut32/dispatch.c b/dlls/oleaut32/dispatch.c
index e18459b9a0d..c29f955d32e 100644
--- a/dlls/oleaut32/dispatch.c
+++ b/dlls/oleaut32/dispatch.c
@@ -3,7 +3,19 @@
  *
  * Copyright 2000  Francois Jacques, Macadamian Technologies Inc.
  *
- * ---
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * TODO: Type coercion is implemented in variant.c but not called yet.
  */
@@ -24,10 +36,10 @@
 
 #include "wine/obj_oleaut.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
-DECLARE_DEBUG_CHANNEL(typelib);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DECLARE_DEBUG_CHANNEL(typelib);
 
 
 /******************************************************************************
diff --git a/dlls/oleaut32/hash.c b/dlls/oleaut32/hash.c
index 949aea818b8..af115bedbfc 100644
--- a/dlls/oleaut32/hash.c
+++ b/dlls/oleaut32/hash.c
@@ -4,6 +4,20 @@
  * Copyright 1999 Corel Corporation
  *           2001 Jon Griffiths
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * FIXME: Not all locales are supported yet.
  */
 #include "windef.h"
@@ -13,9 +27,9 @@
 #include "winnls.h"
 #include "ole2.h"
 #include "olectl.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 static const unsigned char Lookup405[128 * 3] = {
  /* Common */
diff --git a/dlls/oleaut32/ole2disp.c b/dlls/oleaut32/ole2disp.c
index fdec876ef3e..ff70b151e44 100644
--- a/dlls/oleaut32/ole2disp.c
+++ b/dlls/oleaut32/ole2disp.c
@@ -2,6 +2,20 @@
  *	OLE2DISP library
  *
  *	Copyright 1995	Martin von Loewis
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -20,9 +34,9 @@
 #include "ole2disp.h"
 #include "olectl.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 /* This implementation of the BSTR API is 16-bit only. It
    represents BSTR as a 16:16 far pointer, and the strings
diff --git a/dlls/oleaut32/ole2disp.h b/dlls/oleaut32/ole2disp.h
index 7b13b23cc29..8e12317dfa3 100644
--- a/dlls/oleaut32/ole2disp.h
+++ b/dlls/oleaut32/ole2disp.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1995 Martin von Loewis
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_OLEAUT32_OLE2DISP_H
 #define __WINE_OLEAUT32_OLE2DISP_H
 
diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c
index fb04c438381..30b74551ed6 100644
--- a/dlls/oleaut32/oleaut.c
+++ b/dlls/oleaut32/oleaut.c
@@ -1,7 +1,23 @@
 /*
  *	OLEAUT32
  *
+ * Copyright 1999, 2000 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 #include <string.h>
 
 #include "windef.h"
@@ -17,9 +33,9 @@
 
 #include "tmarshal.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 static WCHAR	_delimiter[2] = {'!',0}; /* default delimiter apparently */
 static WCHAR	*pdelimiter = &_delimiter[0];
diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c
index c8dba64de13..164f8df9a20 100644
--- a/dlls/oleaut32/olefont.c
+++ b/dlls/oleaut32/olefont.c
@@ -5,6 +5,20 @@
  * interface and the OleCreateFontIndirect API call.
  *
  * Copyright 1999 Francis Beaudet
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <assert.h>
 #include <string.h>
@@ -19,10 +33,10 @@
 #include "wine/obj_storage.h"
 #include "ole2.h"
 #include "olectl.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "connpt.h" /* for CreateConnectionPoint */
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 /***********************************************************************
  * Declaration of constants used when serializing the font object.
diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c
index 9bd4bd5b474..c7bea43d012 100644
--- a/dlls/oleaut32/olepicture.c
+++ b/dlls/oleaut32/olepicture.c
@@ -6,6 +6,19 @@
  * Copyright 2000 Huw D M Davies for CodeWeavers.
  * Copyright 2001 Marcus Meissner
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * BUGS
  *
@@ -37,7 +50,7 @@
 #include "wine/obj_picture.h"
 #include "wine/obj_connection.h"
 #include "connpt.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "wine/wingdi16.h"
 #include "cursoricon.h"
@@ -52,7 +65,7 @@
 #undef UINT16
 #endif
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 /*************************************************************************
  *  Declaration of implementation class
diff --git a/dlls/oleaut32/parsedt.h b/dlls/oleaut32/parsedt.h
index f28e54219e6..cc2ecda048d 100644
--- a/dlls/oleaut32/parsedt.h
+++ b/dlls/oleaut32/parsedt.h
@@ -31,8 +31,6 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id$
- *
  *-------------------------------------------------------------------------
  */
 #ifndef DT_H
diff --git a/dlls/oleaut32/propertyframe.c b/dlls/oleaut32/propertyframe.c
index 1f3fb7dd378..1ad7b50ced7 100644
--- a/dlls/oleaut32/propertyframe.c
+++ b/dlls/oleaut32/propertyframe.c
@@ -1,6 +1,20 @@
 /*
  * Copyright 2001 TAKESHIMA Hidenori <hidenori@a2.ctktv.ne.jp>
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * FIXME - use PropertySheetW.
  * FIXME - not tested.
  */
@@ -11,13 +25,13 @@
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "ole2.h"
 #include "olectl.h"
 #include "oleauto.h"
 #include "commctrl.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 typedef struct CPropertyPageContainerImpl CPropertyPageContainerImpl;
 
diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c
index d5c87559ab3..257c13608a9 100644
--- a/dlls/oleaut32/safearray.c
+++ b/dlls/oleaut32/safearray.c
@@ -5,6 +5,20 @@
  * This file contains the implementation of the SafeArray interface.
  *
  * Copyright 1999 Sylvain St-Germain
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
@@ -14,9 +28,9 @@
 #include "winbase.h"
 #include "oleauto.h"
 #include "wine/obj_base.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 #define SYSDUPSTRING(str) SysAllocStringLen((str), SysStringLen(str))
 
diff --git a/dlls/oleaut32/stubs.c b/dlls/oleaut32/stubs.c
index 4bc036f2916..cc3142c4f1d 100644
--- a/dlls/oleaut32/stubs.c
+++ b/dlls/oleaut32/stubs.c
@@ -4,17 +4,31 @@
  * Copyright 1999 Corel Corporation
  *
  * Sean Langley
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "ole2.h"
 #include "olectl.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 /***********************************************************************
  * OleIconToCursor (OLEAUT32.415)
diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c
index 47057ed4d22..84ff563a8ff 100644
--- a/dlls/oleaut32/tmarshal.c
+++ b/dlls/oleaut32/tmarshal.c
@@ -2,6 +2,20 @@
  *	TYPELIB Marshaler
  *
  *	Copyright 2002	Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -25,13 +39,13 @@
 #include "heap.h"
 #include "ole2disp.h"
 #include "typelib.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "ntddk.h"
 
 static const WCHAR riidW[5] = {'r','i','i','d',0};
 
-DEFAULT_DEBUG_CHANNEL(ole);
-DECLARE_DEBUG_CHANNEL(olerelay);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DECLARE_DEBUG_CHANNEL(olerelay);
 
 typedef struct _marshal_state {
     LPBYTE	base;
diff --git a/dlls/oleaut32/tmarshal.h b/dlls/oleaut32/tmarshal.h
index 976d66105ac..20dc32bd17f 100644
--- a/dlls/oleaut32/tmarshal.h
+++ b/dlls/oleaut32/tmarshal.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2002 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef TMARSHAL_H
 #define TMARSHAL_H
 HRESULT WINAPI
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 460db2a373b..2c3fb6f7301 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -5,6 +5,20 @@
  *		      1999  Rein Klazes
  *		      2000  Francois Jacques
  *		      2001  Huw D M Davies for CodeWeavers
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *                    
  * --------------------------------------------------------------------------------------
  * Known problems (2000, Francois Jacques)
@@ -55,11 +69,11 @@
 #include "heap.h"
 #include "ole2disp.h"
 #include "typelib.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "ntddk.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
-DECLARE_DEBUG_CHANNEL(typelib);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DECLARE_DEBUG_CHANNEL(typelib);
 
 /****************************************************************************
  *		QueryPathOfRegTypeLib	[TYPELIB.14]
diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h
index c8a651ada93..c5c2cc31eb8 100644
--- a/dlls/oleaut32/typelib.h
+++ b/dlls/oleaut32/typelib.h
@@ -3,7 +3,20 @@
  * used to decode typelib's
  *
  * Copyright 1999 Rein KLazes
- *  
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #ifndef _WINE_TYPELIB_H
 #define _WINE_TYPELIB_H
diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c
index a5fb880b304..d7429069788 100644
--- a/dlls/oleaut32/variant.c
+++ b/dlls/oleaut32/variant.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1998 Jean-Claude Cote
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * NOTES
  *   This implements the low-level and hi-level APIs for manipulating VARIANTs.
  *   The low-level APIs are used to do data coercion between different data types.
@@ -35,11 +49,11 @@
 #include "windef.h"
 #include "oleauto.h"
 #include "heap.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winerror.h"
 #include "parsedt.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 #define SYSDUPSTRING(str) SysAllocStringLen((str), SysStringLen(str))
 
diff --git a/dlls/oleaut32/version.rc b/dlls/oleaut32/version.rc
index 5bd36e30354..712b9c1a25b 100644
--- a/dlls/oleaut32/version.rc
+++ b/dlls/oleaut32/version.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2001 Dmitry Timoshkov
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #define WINE_FILEDESCRIPTION_STR "Wine OLE dll"
 #define WINE_FILENAME_STR "oleaut32.dll"
 
diff --git a/dlls/olecli/olecli_main.c b/dlls/olecli/olecli_main.c
index 575edb5c00f..04e7d6ae550 100644
--- a/dlls/olecli/olecli_main.c
+++ b/dlls/olecli/olecli_main.c
@@ -2,6 +2,20 @@
  *	OLECLI library
  *
  *	Copyright 1995	Martin von Loewis
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /*	At the moment, these are only empty stubs.
@@ -13,9 +27,9 @@
 #include "winbase.h"
 #include "wingdi.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 
 static LONG OLE_current_handle;
diff --git a/dlls/oledlg/oledlg_main.c b/dlls/oledlg/oledlg_main.c
index 00b052380ed..059592aaf61 100644
--- a/dlls/oledlg/oledlg_main.c
+++ b/dlls/oledlg/oledlg_main.c
@@ -2,16 +2,30 @@
  *	OLEDLG library
  *
  *	Copyright 1998	Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
 #include "oledlg.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "ole2.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 /***********************************************************************
  *           OleUIAddVerbMenuA (OLEDLG.1)
diff --git a/dlls/olepro32/olepro32stubs.c b/dlls/olepro32/olepro32stubs.c
index 6b7018dbb4e..c6c08ac869c 100644
--- a/dlls/olepro32/olepro32stubs.c
+++ b/dlls/olepro32/olepro32stubs.c
@@ -4,14 +4,28 @@
  * Copyright 1999 Corel Corporation
  *
  * Sean Langley
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winbase.h"
 #include "ole2.h"
 #include "windef.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 /***********************************************************************
  *		DllUnregisterServer (OLEPRO32.258)
diff --git a/dlls/olesvr/olesvr_main.c b/dlls/olesvr/olesvr_main.c
index db1ef43ac8c..b81e353d985 100644
--- a/dlls/olesvr/olesvr_main.c
+++ b/dlls/olesvr/olesvr_main.c
@@ -2,6 +2,20 @@
  *	OLESVR library
  *
  *	Copyright 1995	Martin von Loewis
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /*	At the moment, these are only empty stubs.
@@ -11,9 +25,9 @@
 
 #include "ole.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 static LONG OLE_current_handle;
 
diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl
index 97a6f471f62..439ab0b2c01 100755
--- a/dlls/opengl32/make_opengl
+++ b/dlls/opengl32/make_opengl
@@ -34,6 +34,22 @@
 #       OpenGL work (as they are resolved at run-time using
 #       glXGetProcAddressARB).
 #
+# Copyright 2000 Lionel Ulmer
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 
 #
 # Files to generate
diff --git a/dlls/opengl32/opengl_ext.c b/dlls/opengl32/opengl_ext.c
index 98f136ff424..e945834310e 100644
--- a/dlls/opengl32/opengl_ext.c
+++ b/dlls/opengl32/opengl_ext.c
@@ -3,13 +3,13 @@
 
 #include "config.h"
 #include "wine_gl.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 typedef const GLubyte * GLstring;
 
 #include "opengl_ext.h"
 
-DEFAULT_DEBUG_CHANNEL(opengl);
+WINE_DEFAULT_DEBUG_CHANNEL(opengl);
 
 void (*func_glApplyTextureEXT)( GLenum ) = (void *) 0xdeadbeef;
 GLboolean (*func_glAreProgramsResidentNV)( GLsizei, GLuint*, GLboolean* ) = (void *) 0xdeadbeef;
diff --git a/dlls/opengl32/opengl_ext.h b/dlls/opengl32/opengl_ext.h
index 8a9cb74b2df..e0f3d4d4e9d 100644
--- a/dlls/opengl32/opengl_ext.h
+++ b/dlls/opengl32/opengl_ext.h
@@ -1,6 +1,20 @@
 /* Typedefs for extensions loading
 
      Copyright (c) 2000 Lionel Ulmer
+*
+* 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.
+*
+* This library is distributed in the hope that it will be useful,
+* 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 #ifndef __DLLS_OPENGL32_OPENGL_EXT_H
 #define __DLLS_OPENGL32_OPENGL_EXT_H
diff --git a/dlls/opengl32/opengl_norm.c b/dlls/opengl32/opengl_norm.c
index ba0ac44a43f..92e9cadb881 100644
--- a/dlls/opengl32/opengl_norm.c
+++ b/dlls/opengl32/opengl_norm.c
@@ -3,11 +3,11 @@
 
 #include "config.h"
 #include "wine_gl.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 typedef const GLubyte * GLstring;
 
-DEFAULT_DEBUG_CHANNEL(opengl);
+WINE_DEFAULT_DEBUG_CHANNEL(opengl);
 
 /***********************************************************************
  *              glAccum (OPENGL32.@)
diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index 81e18bd3484..f19f28e9dd2 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -1,7 +1,21 @@
 /* Window-specific OpenGL functions implementation.
-
-     Copyright (c) 1999 Lionel Ulmer
-*/
+ *
+ * Copyright (c) 1999 Lionel Ulmer
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include "config.h"
 
@@ -10,7 +24,7 @@
 
 #include "wine/exception.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "gdi.h"
 #include "windef.h"
 #include "winerror.h"
@@ -22,7 +36,7 @@
 #include "wgl.h"
 #include "opengl_ext.h"
 
-DEFAULT_DEBUG_CHANNEL(opengl);
+WINE_DEFAULT_DEBUG_CHANNEL(opengl);
 
 static GLXContext default_cx = NULL;
 
diff --git a/dlls/opengl32/wgl.h b/dlls/opengl32/wgl.h
index aa7ae303a39..adff60d9ef0 100644
--- a/dlls/opengl32/wgl.h
+++ b/dlls/opengl32/wgl.h
@@ -1,7 +1,21 @@
 /* Window-specific OpenGL functions implementation.
-
-     Copyright (c) 2000 Lionel Ulmer
-*/
+ *
+ * Copyright (c) 2000 Lionel Ulmer
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef __DLLS_OPENGL32_WGL_H
 #define __DLLS_OPENGL32_WGL_H
diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c
index 98626c4ac54..11359ddc50a 100644
--- a/dlls/psapi/psapi_main.c
+++ b/dlls/psapi/psapi_main.c
@@ -2,15 +2,29 @@
  *      PSAPI library
  *
  *      Copyright 1998  Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "winbase.h"
 #include "windef.h"
 #include "winerror.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "psapi.h"
 
-DEFAULT_DEBUG_CHANNEL(psapi);
+WINE_DEFAULT_DEBUG_CHANNEL(psapi);
 
 #include <string.h>
 
diff --git a/dlls/quartz/amundoc.c b/dlls/quartz/amundoc.c
index bf00ad17fd8..521187f6db1 100644
--- a/dlls/quartz/amundoc.c
+++ b/dlls/quartz/amundoc.c
@@ -1,10 +1,28 @@
+/*
+ * Copyright (C) Hidenori TAKESHIMA
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include "config.h"
 
 #include <math.h>
 #include "windef.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 /***********************************************************************
  *		AmpFactorToDB (QUARTZ.@)
diff --git a/dlls/quartz/asyncsrc.c b/dlls/quartz/asyncsrc.c
index bf860483a76..bb3246b8f1d 100644
--- a/dlls/quartz/asyncsrc.c
+++ b/dlls/quartz/asyncsrc.c
@@ -3,7 +3,21 @@
  *
  * FIXME - URL source is not implemented yet.
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -17,8 +31,8 @@
 #include "vfwmsgs.h"
 #include "uuids.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "asyncsrc.h"
diff --git a/dlls/quartz/asyncsrc.h b/dlls/quartz/asyncsrc.h
index 3f727575ac6..cbb52346ccc 100644
--- a/dlls/quartz/asyncsrc.h
+++ b/dlls/quartz/asyncsrc.h
@@ -1,7 +1,21 @@
 /*
  * Implements Asynchronous File/URL Source.
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef	WINE_DSHOW_ASYNCSRC_H
diff --git a/dlls/quartz/audioutl.c b/dlls/quartz/audioutl.c
index a9ef997b9f9..c68a3789c7b 100644
--- a/dlls/quartz/audioutl.c
+++ b/dlls/quartz/audioutl.c
@@ -1,13 +1,27 @@
 /*
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
 
 #include "windef.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "audioutl.h"
 
diff --git a/dlls/quartz/audioutl.h b/dlls/quartz/audioutl.h
index fcb8beb3607..1a5fb61e60d 100644
--- a/dlls/quartz/audioutl.h
+++ b/dlls/quartz/audioutl.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) Hidenori TAKESHIMA
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef QUARTZ_AUDIOUTL_H
 #define QUARTZ_AUDIOUTL_H
 
diff --git a/dlls/quartz/audren.c b/dlls/quartz/audren.c
index 7c09ff536f4..ff4148ea096 100644
--- a/dlls/quartz/audren.c
+++ b/dlls/quartz/audren.c
@@ -5,7 +5,21 @@
  *  - implement IReferenceClock.
  *  - implement seeking.
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -22,8 +36,8 @@
 #include "uuids.h"
 #include "evcode.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "audren.h"
diff --git a/dlls/quartz/audren.h b/dlls/quartz/audren.h
index 25a976fa6dc..567aa8f1f37 100644
--- a/dlls/quartz/audren.h
+++ b/dlls/quartz/audren.h
@@ -4,7 +4,21 @@
  * FIXME
  *  - implements IRefereneceClock.
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef	WINE_DSHOW_AUDREN_H
diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c
index e1eda2ce4d1..591fd2fe6eb 100644
--- a/dlls/quartz/avidec.c
+++ b/dlls/quartz/avidec.c
@@ -1,7 +1,21 @@
 /*
  * Implements AVI Decompressor(CLSID_AVIDec).
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 
@@ -19,8 +33,8 @@
 #include "vfwmsgs.h"
 #include "uuids.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "xform.h"
diff --git a/dlls/quartz/aviparse.c b/dlls/quartz/aviparse.c
index 6113880eaa7..2ba63d5026b 100644
--- a/dlls/quartz/aviparse.c
+++ b/dlls/quartz/aviparse.c
@@ -1,7 +1,21 @@
 /*
  * Implements AVI Parser(Splitter).
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -19,8 +33,8 @@
 #include "amvideo.h"
 #include "uuids.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "parser.h"
diff --git a/dlls/quartz/basefilt.c b/dlls/quartz/basefilt.c
index f77793ade40..5a73976fd97 100644
--- a/dlls/quartz/basefilt.c
+++ b/dlls/quartz/basefilt.c
@@ -1,7 +1,21 @@
 /*
  * Implements IBaseFilter. (internal)
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -14,8 +28,8 @@
 #include "strmif.h"
 #include "vfwmsgs.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "basefilt.h"
diff --git a/dlls/quartz/basefilt.h b/dlls/quartz/basefilt.h
index 742370f264b..32c1b2d5cd2 100644
--- a/dlls/quartz/basefilt.h
+++ b/dlls/quartz/basefilt.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) Hidenori TAKESHIMA
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef	WINE_DSHOW_BASEFILT_H
 #define	WINE_DSHOW_BASEFILT_H
 
diff --git a/dlls/quartz/basepin.c b/dlls/quartz/basepin.c
index 06ba426e573..53dc8aa0056 100644
--- a/dlls/quartz/basepin.c
+++ b/dlls/quartz/basepin.c
@@ -1,7 +1,21 @@
 /*
  * Implements IPin and IMemInputPin. (internal)
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -14,8 +28,8 @@
 #include "strmif.h"
 #include "vfwmsgs.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "basefilt.h"
diff --git a/dlls/quartz/complist.c b/dlls/quartz/complist.c
index efe97b425ab..dad0970b5c1 100644
--- a/dlls/quartz/complist.c
+++ b/dlls/quartz/complist.c
@@ -1,7 +1,21 @@
 /*
  * List of components. (for internal use)
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -11,8 +25,8 @@
 #include "winerror.h"
 #include "wine/obj_base.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "complist.h"
diff --git a/dlls/quartz/complist.h b/dlls/quartz/complist.h
index c0d7f0a9751..ee53e38facd 100644
--- a/dlls/quartz/complist.h
+++ b/dlls/quartz/complist.h
@@ -1,7 +1,21 @@
 /*
  * List of components. (for internal use)
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef	QUARTZ_COMPLIST_H
diff --git a/dlls/quartz/csconv.c b/dlls/quartz/csconv.c
index 515ec3b3c39..a0dca9e6f24 100644
--- a/dlls/quartz/csconv.c
+++ b/dlls/quartz/csconv.c
@@ -1,7 +1,21 @@
 /*
  * Implements Color Space Converter(CLSID_Colour).
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 
@@ -19,8 +33,8 @@
 #include "vfwmsgs.h"
 #include "uuids.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "xform.h"
diff --git a/dlls/quartz/devenum.c b/dlls/quartz/devenum.c
index 925f9733abb..e71622c45fb 100644
--- a/dlls/quartz/devenum.c
+++ b/dlls/quartz/devenum.c
@@ -3,7 +3,21 @@
  * Implements IMoniker for CLSID_CDeviceMoniker.
  * Implements IPropertyBag. (internal)
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -21,8 +35,8 @@
 #include "strmif.h"
 #include "uuids.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "devenum.h"
diff --git a/dlls/quartz/devenum.h b/dlls/quartz/devenum.h
index 7fc710b80c7..e18a85479c7 100644
--- a/dlls/quartz/devenum.h
+++ b/dlls/quartz/devenum.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) Hidenori TAKESHIMA
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef	WINE_DSHOW_DEVENUM_H
 #define	WINE_DSHOW_DEVENUM_H
 
diff --git a/dlls/quartz/enumunk.c b/dlls/quartz/enumunk.c
index e344b8e1b50..3853c453d6f 100644
--- a/dlls/quartz/enumunk.c
+++ b/dlls/quartz/enumunk.c
@@ -1,7 +1,21 @@
 /*
  * Implementation of IEnumUnknown (for internal use).
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -12,8 +26,8 @@
 #include "wine/obj_base.h"
 #include "wine/obj_misc.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "enumunk.h"
diff --git a/dlls/quartz/enumunk.h b/dlls/quartz/enumunk.h
index ca7dbf10b32..eb59f7d0ce0 100644
--- a/dlls/quartz/enumunk.h
+++ b/dlls/quartz/enumunk.h
@@ -1,7 +1,21 @@
 /*
  * Implementation of IEnumUnknown (for internal use).
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef	QUARTZ_ENUMUNK_H
diff --git a/dlls/quartz/fgevent.c b/dlls/quartz/fgevent.c
index a07938ed06c..35579cdf314 100644
--- a/dlls/quartz/fgevent.c
+++ b/dlls/quartz/fgevent.c
@@ -1,7 +1,21 @@
 /*
  * CLSID_FilterGraph event handling.
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -17,8 +31,8 @@
 #include "uuids.h"
 #include "vfwmsgs.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "fgraph.h"
diff --git a/dlls/quartz/fgpass.c b/dlls/quartz/fgpass.c
index eca6b6bef55..2dafea1c06b 100644
--- a/dlls/quartz/fgpass.c
+++ b/dlls/quartz/fgpass.c
@@ -1,7 +1,21 @@
 /*
  * Implementation of IBasicAudio, IBasicVideo2, IVideoWindow for FilterGraph.
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -15,8 +29,8 @@
 #include "control.h"
 #include "uuids.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "fgraph.h"
diff --git a/dlls/quartz/fgraph.c b/dlls/quartz/fgraph.c
index e545fb54361..5916c89dba8 100644
--- a/dlls/quartz/fgraph.c
+++ b/dlls/quartz/fgraph.c
@@ -1,7 +1,21 @@
 /*
  * Implementation of CLSID_FilterGraph.
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -15,8 +29,8 @@
 #include "control.h"
 #include "uuids.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "fgraph.h"
diff --git a/dlls/quartz/fgraph.h b/dlls/quartz/fgraph.h
index 34a30f098eb..ce64292f2dc 100644
--- a/dlls/quartz/fgraph.h
+++ b/dlls/quartz/fgraph.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) Hidenori TAKESHIMA
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef	WINE_DSHOW_FGRAPH_H
 #define	WINE_DSHOW_FGRAPH_H
 
diff --git a/dlls/quartz/fmap.c b/dlls/quartz/fmap.c
index ac754922988..54be0354785 100644
--- a/dlls/quartz/fmap.c
+++ b/dlls/quartz/fmap.c
@@ -3,7 +3,21 @@
  *
  * FIXME - stub.
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -17,8 +31,8 @@
 #include "strmif.h"
 #include "uuids.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "fmap.h"
diff --git a/dlls/quartz/fmap.h b/dlls/quartz/fmap.h
index 61d249f055f..17e93ac8985 100644
--- a/dlls/quartz/fmap.h
+++ b/dlls/quartz/fmap.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) Hidenori TAKESHIMA
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef	WINE_DSHOW_FMAP_H
 #define	WINE_DSHOW_FMAP_H
 
diff --git a/dlls/quartz/ifgraph.c b/dlls/quartz/ifgraph.c
index f054162d37c..ddccc1628d6 100644
--- a/dlls/quartz/ifgraph.c
+++ b/dlls/quartz/ifgraph.c
@@ -8,7 +8,21 @@
  * FIXME - process Pause/Stop asynchronously and notify when completed.
  *
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -25,8 +39,8 @@
 #include "vfwmsgs.h"
 #include "evcode.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "fgraph.h"
diff --git a/dlls/quartz/imcntl.c b/dlls/quartz/imcntl.c
index 467210cdacc..001e3b06bb2 100644
--- a/dlls/quartz/imcntl.c
+++ b/dlls/quartz/imcntl.c
@@ -3,7 +3,21 @@
  *
  * FIXME - stub.
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -18,8 +32,8 @@
 #include "control.h"
 #include "uuids.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "fgraph.h"
diff --git a/dlls/quartz/imfilter.c b/dlls/quartz/imfilter.c
index 5e802fa5391..aae4fcb1c9e 100644
--- a/dlls/quartz/imfilter.c
+++ b/dlls/quartz/imfilter.c
@@ -3,7 +3,21 @@
  *
  * FIXME - stub.
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -19,8 +33,8 @@
 #include "vfwmsgs.h"
 #include "evcode.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "fgraph.h"
diff --git a/dlls/quartz/impos.c b/dlls/quartz/impos.c
index 24bf13e74d8..cf174e47e10 100644
--- a/dlls/quartz/impos.c
+++ b/dlls/quartz/impos.c
@@ -3,7 +3,21 @@
  *
  * FIXME - stub.
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -17,8 +31,8 @@
 #include "control.h"
 #include "uuids.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "fgraph.h"
diff --git a/dlls/quartz/imseek.c b/dlls/quartz/imseek.c
index 3489329ab3d..663a3af60b3 100644
--- a/dlls/quartz/imseek.c
+++ b/dlls/quartz/imseek.c
@@ -4,7 +4,21 @@
  * FIXME - stub.
  * FIXME - this interface should be allocated as a plug-in(?)
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -18,8 +32,8 @@
 #include "control.h"
 #include "uuids.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "fgraph.h"
diff --git a/dlls/quartz/iunk.c b/dlls/quartz/iunk.c
index 4f0133e28c8..9b07e7a5df2 100644
--- a/dlls/quartz/iunk.c
+++ b/dlls/quartz/iunk.c
@@ -1,7 +1,21 @@
 /*
  * An implementation of IUnknown.
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -11,8 +25,8 @@
 #include "winbase.h"
 #include "wine/obj_base.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "iunk.h"
diff --git a/dlls/quartz/iunk.h b/dlls/quartz/iunk.h
index 7ef0fe8db21..bf35709e86e 100644
--- a/dlls/quartz/iunk.h
+++ b/dlls/quartz/iunk.h
@@ -1,7 +1,21 @@
 /*
  * An implementation of IUnknown.
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef	WINE_DSHOW_IUNK_H
diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c
index 6376fa273e5..04cb7bd9433 100644
--- a/dlls/quartz/main.c
+++ b/dlls/quartz/main.c
@@ -1,7 +1,21 @@
 /*
  * Exported APIs.
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -19,8 +33,8 @@
 #include "uuids.h"
 #include "errors.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "initguid.h"
 
diff --git a/dlls/quartz/memalloc.c b/dlls/quartz/memalloc.c
index 3f6ecf410d7..e1cc88d1489 100644
--- a/dlls/quartz/memalloc.c
+++ b/dlls/quartz/memalloc.c
@@ -1,7 +1,21 @@
 /*
  * Implementation of CLSID_MemoryAllocator.
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -15,8 +29,8 @@
 #include "uuids.h"
 #include "vfwmsgs.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "memalloc.h"
diff --git a/dlls/quartz/memalloc.h b/dlls/quartz/memalloc.h
index eeeb4f43fe9..6cecfd1f30b 100644
--- a/dlls/quartz/memalloc.h
+++ b/dlls/quartz/memalloc.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) Hidenori TAKESHIMA
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef WINE_DSHOW_MEMALLOC_H
 #define WINE_DSHOW_MEMALLOC_H
 
diff --git a/dlls/quartz/mtype.c b/dlls/quartz/mtype.c
index d31bcac5109..f2942751af3 100644
--- a/dlls/quartz/mtype.c
+++ b/dlls/quartz/mtype.c
@@ -1,7 +1,21 @@
 /*
  * Implements IEnumMediaTypes and helper functions. (internal)
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -16,8 +30,8 @@
 #include "vfwmsgs.h"
 #include "uuids.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "mtype.h"
diff --git a/dlls/quartz/mtype.h b/dlls/quartz/mtype.h
index f9e2da5f4b1..f421eb194e4 100644
--- a/dlls/quartz/mtype.h
+++ b/dlls/quartz/mtype.h
@@ -1,7 +1,21 @@
 /*
  * Implements IEnumMediaTypes and helper functions. (internal)
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef WINE_DSHOW_MTYPE_H
diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c
index 55d91f5121f..596a8d8f6cd 100644
--- a/dlls/quartz/parser.c
+++ b/dlls/quartz/parser.c
@@ -1,7 +1,21 @@
 /*
  * Implements IBaseFilter for parsers. (internal)
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * FIXME - handle errors/flushing correctly.
  * FIXME - handle seeking.
@@ -21,8 +35,8 @@
 #include "evcode.h"
 #include "uuids.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "parser.h"
diff --git a/dlls/quartz/parser.h b/dlls/quartz/parser.h
index 5160931abc2..c05ddf800af 100644
--- a/dlls/quartz/parser.h
+++ b/dlls/quartz/parser.h
@@ -1,7 +1,21 @@
 /*
  * Implements Parser.
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef	WINE_DSHOW_PARSER_H
diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h
index 14a58c79126..1489db3c5e7 100644
--- a/dlls/quartz/quartz_private.h
+++ b/dlls/quartz/quartz_private.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) Hidenori TAKESHIMA
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef	QUARTZ_PRIVATE_H
 #define	QUARTZ_PRIVATE_H
 
diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c
index 21990c1b205..a24ceb3b8bf 100644
--- a/dlls/quartz/regsvr.c
+++ b/dlls/quartz/regsvr.c
@@ -1,7 +1,21 @@
 /*
  * Regster/Unregister servers. (for internal use)
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -14,8 +28,8 @@
 #include "winreg.h"
 #include "uuids.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "regsvr.h"
 
diff --git a/dlls/quartz/regsvr.h b/dlls/quartz/regsvr.h
index 2b5d771d3cc..54045245831 100644
--- a/dlls/quartz/regsvr.h
+++ b/dlls/quartz/regsvr.h
@@ -1,7 +1,21 @@
 /*
  * Regster/Unregister servers. (for internal use)
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef	QUARTZ_REGSVR_H
diff --git a/dlls/quartz/sample.c b/dlls/quartz/sample.c
index 68943787fa7..c46daa8b4bc 100644
--- a/dlls/quartz/sample.c
+++ b/dlls/quartz/sample.c
@@ -1,7 +1,21 @@
 /*
  * Implements IMediaSample2 for CMemMediaSample.
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -14,8 +28,8 @@
 #include "strmif.h"
 #include "vfwmsgs.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "sample.h"
diff --git a/dlls/quartz/sample.h b/dlls/quartz/sample.h
index bf0c9d543f3..9d95cced739 100644
--- a/dlls/quartz/sample.h
+++ b/dlls/quartz/sample.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) Hidenori TAKESHIMA
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef	WINE_DSHOW_SAMPLE_H
 #define	WINE_DSHOW_SAMPLE_H
 
diff --git a/dlls/quartz/seekpass.c b/dlls/quartz/seekpass.c
index 98824c2667d..2dd58d3a05c 100644
--- a/dlls/quartz/seekpass.c
+++ b/dlls/quartz/seekpass.c
@@ -3,7 +3,21 @@
  *
  *	FIXME - not tested yet.
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -17,8 +31,8 @@
 #include "control.h"
 #include "uuids.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "seekpass.h"
diff --git a/dlls/quartz/seekpass.h b/dlls/quartz/seekpass.h
index 5af7faa0538..af7fc3391bb 100644
--- a/dlls/quartz/seekpass.h
+++ b/dlls/quartz/seekpass.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) Hidenori TAKESHIMA
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef WINE_DSHOW_SEEKPASS_H
 #define WINE_DSHOW_SEEKPASS_H
 
diff --git a/dlls/quartz/sysclock.c b/dlls/quartz/sysclock.c
index bef024a14cf..e12b9277217 100644
--- a/dlls/quartz/sysclock.c
+++ b/dlls/quartz/sysclock.c
@@ -1,7 +1,21 @@
 /*
  * Implementation of CLSID_SystemClock.
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -14,8 +28,8 @@
 #include "strmif.h"
 #include "uuids.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "sysclock.h"
diff --git a/dlls/quartz/sysclock.h b/dlls/quartz/sysclock.h
index ce7c89745b3..bfaa556971a 100644
--- a/dlls/quartz/sysclock.h
+++ b/dlls/quartz/sysclock.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) Hidenori TAKESHIMA
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef WINE_DSHOW_SYSCLOCK_H
 #define WINE_DSHOW_SYSCLOCK_H
 
diff --git a/dlls/quartz/videoblt.c b/dlls/quartz/videoblt.c
index 33f9416d769..07a01d3e1ea 100644
--- a/dlls/quartz/videoblt.c
+++ b/dlls/quartz/videoblt.c
@@ -1,10 +1,28 @@
+/*
+ * Copyright (C) Hidenori TAKESHIMA
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include "config.h"
 
 #include "windef.h"
 #include "wingdi.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "videoblt.h"
 
diff --git a/dlls/quartz/videoblt.h b/dlls/quartz/videoblt.h
index d2d2b3261cb..9d4e9a42611 100644
--- a/dlls/quartz/videoblt.h
+++ b/dlls/quartz/videoblt.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) Hidenori TAKESHIMA
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef QUARTZ_VIDEOBLT_H
 #define QUARTZ_VIDEOBLT_H
 
diff --git a/dlls/quartz/vidren.c b/dlls/quartz/vidren.c
index 7de3cc8c45d..21228a1b726 100644
--- a/dlls/quartz/vidren.c
+++ b/dlls/quartz/vidren.c
@@ -1,7 +1,21 @@
 /*
  * Implements CLSID_VideoRenderer.
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * FIXME - use clock
  */
@@ -22,8 +36,8 @@
 #include "amvideo.h"
 #include "evcode.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "vidren.h"
diff --git a/dlls/quartz/vidren.h b/dlls/quartz/vidren.h
index ddd88466390..588ee7cfbcb 100644
--- a/dlls/quartz/vidren.h
+++ b/dlls/quartz/vidren.h
@@ -1,7 +1,21 @@
 /*
  * Implements CLSID_VideoRenderer.
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef	WINE_DSHOW_VIDREN_H
diff --git a/dlls/quartz/wavparse.c b/dlls/quartz/wavparse.c
index a7706bbfe26..ba6b395376b 100644
--- a/dlls/quartz/wavparse.c
+++ b/dlls/quartz/wavparse.c
@@ -1,7 +1,21 @@
 /*
  * Implements WAVE/AU/AIFF Parser.
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -18,8 +32,8 @@
 #include "vfwmsgs.h"
 #include "uuids.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "audioutl.h"
diff --git a/dlls/quartz/xform.c b/dlls/quartz/xform.c
index 6fa31ebc99d..437b22b821f 100644
--- a/dlls/quartz/xform.c
+++ b/dlls/quartz/xform.c
@@ -1,7 +1,21 @@
 /*
  * Implements IBaseFilter for transform filters. (internal)
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 
@@ -17,8 +31,8 @@
 #include "vfwmsgs.h"
 #include "uuids.h"
 
-#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(quartz);
+#include "wine/debug.h"
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 #include "quartz_private.h"
 #include "xform.h"
diff --git a/dlls/quartz/xform.h b/dlls/quartz/xform.h
index 0d0c1636ae5..fedf2572126 100644
--- a/dlls/quartz/xform.h
+++ b/dlls/quartz/xform.h
@@ -1,7 +1,21 @@
 /*
  * Implements IBaseFilter for transform filters. (internal)
  *
- * hidenori@a2.ctktv.ne.jp
+ * Copyright (C) Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef	WINE_DSHOW_XFORM_H
diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c
index 2860bb61cc3..79d3db9cca5 100644
--- a/dlls/rasapi32/rasapi.c
+++ b/dlls/rasapi32/rasapi.c
@@ -2,13 +2,27 @@
  * RASAPI32
  * 
  * Copyright 1998 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
 #include "ras.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ras);
+WINE_DEFAULT_DEBUG_CHANNEL(ras);
 
 /**************************************************************************
  *                 RasEnumConnectionsA			[RASAPI32.544]
diff --git a/dlls/richedit/charlist.c b/dlls/richedit/charlist.c
index decf3310e16..e6229129449 100644
--- a/dlls/richedit/charlist.c
+++ b/dlls/richedit/charlist.c
@@ -4,6 +4,19 @@
  * 
  *  Copyright (c) 2000 by Jean-Claude Batista
  *  
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
@@ -15,9 +28,9 @@
 #include "charlist.h"
 #include "windef.h"
 #include "winbase.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(richedit);
+WINE_DEFAULT_DEBUG_CHANNEL(richedit);
 
 extern HANDLE RICHED32_hHeap;
 
diff --git a/dlls/richedit/charlist.h b/dlls/richedit/charlist.h
index 2855f9ee599..708920f0f84 100644
--- a/dlls/richedit/charlist.h
+++ b/dlls/richedit/charlist.h
@@ -1,3 +1,23 @@
+/*
+ * Character List
+ * 
+ * Copyright (c) 2000 by Jean-Claude Batista
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef _CHARLIST
 #define _CHARLIST
 
diff --git a/dlls/richedit/reader.c b/dlls/richedit/reader.c
index cee5bfcb4d5..992aba46be5 100644
--- a/dlls/richedit/reader.c
+++ b/dlls/richedit/reader.c
@@ -76,9 +76,9 @@
 #include "charlist.h"
 #include "windef.h"
 #include "winbase.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(richedit);
+WINE_DEFAULT_DEBUG_CHANNEL(richedit);
 
 extern HANDLE RICHED32_hHeap;
 
diff --git a/dlls/richedit/riched32.h b/dlls/richedit/riched32.h
index 971acff6d98..236bdaa05ae 100644
--- a/dlls/richedit/riched32.h
+++ b/dlls/richedit/riched32.h
@@ -3,6 +3,20 @@
  *
  * Copyright 2000 Jean-Clauyde Batista
  *
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_RICHED32_H
diff --git a/dlls/richedit/richedit.c b/dlls/richedit/richedit.c
index 1bfac7fcf71..d8b442349fa 100644
--- a/dlls/richedit/richedit.c
+++ b/dlls/richedit/richedit.c
@@ -6,7 +6,20 @@
  * control to display RTF text.
  *
  * Copyright 2000 by Jean-Claude Batista
- * 
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
  
 #include <string.h>
@@ -23,11 +36,11 @@
 
 #include "rtf.h"
 #include "rtf2text.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #define ID_EDIT      1
 
-DEFAULT_DEBUG_CHANNEL(richedit);
+WINE_DEFAULT_DEBUG_CHANNEL(richedit);
 
 HANDLE RICHED32_hHeap = (HANDLE)NULL;
 /* LPSTR  RICHED32_aSubclass = (LPSTR)NULL; */
diff --git a/dlls/richedit/text-writer.c b/dlls/richedit/text-writer.c
index 3255bbb3df0..9a952186769 100644
--- a/dlls/richedit/text-writer.c
+++ b/dlls/richedit/text-writer.c
@@ -36,14 +36,14 @@
  * - Updated for 1.10 distribution.
  */
 
-# include	<stdio.h>
+#include <stdio.h>
 
-# include	"rtf.h"
-# include	"rtf2text.h"
-# include       "charlist.h"
-# include	"debugtools.h"
+#include "rtf.h"
+#include "rtf2text.h"
+#include "charlist.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(richedit);
+WINE_DEFAULT_DEBUG_CHANNEL(richedit);
 
 static void	TextClass ();
 static void	ControlClass ();
diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c
index 2391537116c..f974cd9b94b 100644
--- a/dlls/rpcrt4/rpcrt4_main.c
+++ b/dlls/rpcrt4/rpcrt4_main.c
@@ -1,6 +1,21 @@
 /*
  *  RPCRT4
  *
+ * Copyright 2000 Huw D M Davies for Codeweavers
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -39,9 +54,9 @@
 # include <netinet/in.h>
 #endif
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 /***********************************************************************
  * RPCRT4_LibMain
diff --git a/dlls/serialui/confdlg.c b/dlls/serialui/confdlg.c
index 5c502c4cc7f..3932a2bc960 100644
--- a/dlls/serialui/confdlg.c
+++ b/dlls/serialui/confdlg.c
@@ -12,6 +12,20 @@
  * Basic structure copied from COMCTL32 code.
  *
  * Copyright 2000 Mike McCormack
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -21,11 +35,11 @@
 #include "winreg.h"
 #include "wingdi.h"
 #include "winuser.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "serialui.h"
 #include "winerror.h"
 
-DEFAULT_DEBUG_CHANNEL(comm);
+WINE_DEFAULT_DEBUG_CHANNEL(comm);
 
 HMODULE SERIALUI_hModule = 0;
 
diff --git a/dlls/serialui/serialui.h b/dlls/serialui/serialui.h
index 71805bc6dbe..e0e54ccc4cb 100644
--- a/dlls/serialui/serialui.h
+++ b/dlls/serialui/serialui.h
@@ -1,3 +1,24 @@
+/*
+ * Copyright 2000 Mike McCormack
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __WINE_SERIALUI_H
+#define __WINE_SERIALUI_H
+
 #define IDD_SERIALUICONFIG 0x401
 #define IDC_BAUD 0x402
 #define IDC_PARITY 0x0403
@@ -7,3 +28,5 @@
 
 #define ID_GETDEFAULT 0x410
 #define ID_SETDEFAULT 0x411
+
+#endif /* __WINE_SERIALUI_H */
diff --git a/dlls/serialui/serialui_rc.rc b/dlls/serialui/serialui_rc.rc
index f4d8503d5cc..f5d350f41be 100644
--- a/dlls/serialui/serialui_rc.rc
+++ b/dlls/serialui/serialui_rc.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000 Mike McCormack
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include "windef.h"
 #include "winuser.h"
 #include "serialui.h"
diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index cb6af4991cb..36261036bd1 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -1,14 +1,29 @@
 /*
  * SetupAPI device installer
  *
+ * Copyright 2000 Andreas Mohr for Codeweavers
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
 #include "winbase.h"
 #include "setupx16.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(setupapi);
+WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
 
 /***********************************************************************
  *		DiGetClassDevs (SETUPX.304)
diff --git a/dlls/setupapi/infparse.c b/dlls/setupapi/infparse.c
index 25e2f184be9..79abff4c162 100644
--- a/dlls/setupapi/infparse.c
+++ b/dlls/setupapi/infparse.c
@@ -1,6 +1,22 @@
 /*
  * SetupX .inf file parsing functions
  *
+ * Copyright 2000 Andreas Mohr for Codeweavers
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * FIXME:
  * - return values ???
  * - this should be reimplemented at some point to have its own
@@ -10,14 +26,14 @@
  */
 
 #include <string.h>
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "windef.h"
 #include "winbase.h"
 #include "wine/winbase16.h"
 #include "setupx16.h"
 #include "setupapi_private.h"
 
-DEFAULT_DEBUG_CHANNEL(setupapi);
+WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
 
 WORD InfNumEntries = 0;
 INF_FILE *InfList = NULL;
diff --git a/dlls/setupapi/setupapi.rc b/dlls/setupapi/setupapi.rc
index 5bc79e28205..4e588d2071d 100644
--- a/dlls/setupapi/setupapi.rc
+++ b/dlls/setupapi/setupapi.rc
@@ -1,6 +1,21 @@
 /*
  * Top level resource file for SETUPX
  *
+ * Copyright 2001 Andreas Mohr
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
diff --git a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h
index e2400ce0277..8a9b709f441 100644
--- a/dlls/setupapi/setupapi_private.h
+++ b/dlls/setupapi/setupapi_private.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2001 Andreas Mohr
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __SETUPAPI_PRIVATE_H
 #define __SETUPAPI_PRIVATE_H
 
diff --git a/dlls/setupapi/setupx16.h b/dlls/setupapi/setupx16.h
index 39a97c6434a..e1946a43fc0 100644
--- a/dlls/setupapi/setupx16.h
+++ b/dlls/setupapi/setupx16.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000 Andreas Mohr for Codeweavers
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __SETUPX16_H
 #define __SETUPX16_H
 
diff --git a/dlls/setupapi/setupx_main.c b/dlls/setupapi/setupx_main.c
index ddc0db8d01c..f74f824cf52 100644
--- a/dlls/setupapi/setupx_main.c
+++ b/dlls/setupapi/setupx_main.c
@@ -3,6 +3,20 @@
  *
  *      Copyright 1998,2000  Andreas Mohr
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * FIXME: Rather non-functional functions for now.
  *
  * See:
@@ -49,9 +63,9 @@
 #include "setupx16.h"
 #include "setupapi_private.h"
 #include "winerror.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(setupapi);
+WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
 
 /***********************************************************************
  *		SURegOpenKey (SETUPX.47)
diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c
index 2d7131ad41b..d4b78343305 100644
--- a/dlls/setupapi/stubs.c
+++ b/dlls/setupapi/stubs.c
@@ -2,13 +2,28 @@
 /*
  * SetupAPI stubs
  *
+ * Copyright 2000 James Hatheway
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "windef.h"
 #include "setupapi.h"
 
-DEFAULT_DEBUG_CHANNEL(setupapi);
+WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
 
 
 /***********************************************************************
diff --git a/dlls/setupapi/virtcopy.c b/dlls/setupapi/virtcopy.c
index 2501315fcdb..a32927e70c3 100644
--- a/dlls/setupapi/virtcopy.c
+++ b/dlls/setupapi/virtcopy.c
@@ -1,6 +1,22 @@
 /*
  * SetupAPI virtual copy operations
  *
+ * Copyright 2001 Andreas Mohr
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * FIXME: we now rely on builtin setupapi.dll for dialog resources.
  *        This is bad ! We ought to have 16bit resource handling working.
  */
@@ -11,9 +27,9 @@
 #include "setupx16.h"
 #include "winreg.h"
 #include "setupapi_private.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(setupapi);
+WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
 
 /* ### start build ### */
 extern WORD CALLBACK VCP_CallTo16_word_lwwll(FARPROC16,LPVOID,UINT16,WPARAM,LPARAM,LPARAM);
diff --git a/dlls/shdocvw/classinfo.c b/dlls/shdocvw/classinfo.c
index 251c0416e17..68b53b8b3c5 100644
--- a/dlls/shdocvw/classinfo.c
+++ b/dlls/shdocvw/classinfo.c
@@ -1,14 +1,28 @@
 /*
  * Implementation of IProvideClassInfo interfaces for IE Web Browser control
  *
- * 2001 John R. Sheets (for CodeWeavers)
+ * Copyright 2001 John R. Sheets (for CodeWeavers)
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "shdocvw.h"
 
-DEFAULT_DEBUG_CHANNEL(shdocvw);
+WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
 
 /**********************************************************************
  * Implement the IProvideClassInfo interface
diff --git a/dlls/shdocvw/events.c b/dlls/shdocvw/events.c
index c2259d97b48..965c50e797f 100644
--- a/dlls/shdocvw/events.c
+++ b/dlls/shdocvw/events.c
@@ -4,14 +4,28 @@
  *  - IConnectionPointContainer
  *  - IConnectionPoint
  *
- * 2001 John R. Sheets (for CodeWeavers)
+ * Copyright 2001 John R. Sheets (for CodeWeavers)
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "shdocvw.h"
 
-DEFAULT_DEBUG_CHANNEL(shdocvw);
+WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
 
 
 /**********************************************************************
diff --git a/dlls/shdocvw/factory.c b/dlls/shdocvw/factory.c
index 8e12c2dfdee..233f6b94616 100644
--- a/dlls/shdocvw/factory.c
+++ b/dlls/shdocvw/factory.c
@@ -1,14 +1,28 @@
 /*
  * Implementation of class factory for IE Web Browser
  *
- * 2001 John R. Sheets (for CodeWeavers)
+ * Copyright 2001 John R. Sheets (for CodeWeavers)
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "shdocvw.h"
 
-DEFAULT_DEBUG_CHANNEL(shdocvw);
+WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
 
 /**********************************************************************
  * Implement the IWebBrowser class factory
diff --git a/dlls/shdocvw/misc.c b/dlls/shdocvw/misc.c
index 707f2a048d3..6f374173f64 100644
--- a/dlls/shdocvw/misc.c
+++ b/dlls/shdocvw/misc.c
@@ -3,13 +3,27 @@
  *
  *  - IQuickActivate
  *
- * 2001 John R. Sheets (for CodeWeavers)
+ * Copyright 2001 John R. Sheets (for CodeWeavers)
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "shdocvw.h"
 
-DEFAULT_DEBUG_CHANNEL(shdocvw);
+WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
 
 /**********************************************************************
  * Implement the IQuickActivate interface
diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c
index 862fcb87f2a..482dd0b82e9 100644
--- a/dlls/shdocvw/oleobject.c
+++ b/dlls/shdocvw/oleobject.c
@@ -5,15 +5,29 @@
  * - IOleInPlaceObject
  * - IOleControl
  *
- * 2001 John R. Sheets (for CodeWeavers)
+ * Copyright 2001 John R. Sheets (for CodeWeavers)
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "shdocvw.h"
 #include "ole2.h"
 
-DEFAULT_DEBUG_CHANNEL(shdocvw);
+WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
 
 /**********************************************************************
  * Implement the IOleObject interface for the web browser component
diff --git a/dlls/shdocvw/persist.c b/dlls/shdocvw/persist.c
index cc0df76b0de..5c1879102f5 100644
--- a/dlls/shdocvw/persist.c
+++ b/dlls/shdocvw/persist.c
@@ -1,13 +1,27 @@
 /*
  * Implementation of IPersist interfaces for IE Web Browser control
  *
- * 2001 John R. Sheets (for CodeWeavers)
+ * Copyright 2001 John R. Sheets (for CodeWeavers)
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "shdocvw.h"
 
-DEFAULT_DEBUG_CHANNEL(shdocvw);
+WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
 
 /**********************************************************************
  * Implement the IPersistStorage interface
diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h
index 0d72c76e9e0..c561dd719d8 100644
--- a/dlls/shdocvw/shdocvw.h
+++ b/dlls/shdocvw/shdocvw.h
@@ -1,7 +1,21 @@
 /*
  * Header includes for shdocvw.dll
  *
- * 2001 John R. Sheets (for CodeWeavers)
+ * Copyright 2001 John R. Sheets (for CodeWeavers)
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_SHDOCVW_H
diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c
index 3779b5e9b30..614d6937fcf 100644
--- a/dlls/shdocvw/shdocvw_main.c
+++ b/dlls/shdocvw/shdocvw_main.c
@@ -1,7 +1,21 @@
 /*
  * SHDOCVW - Internet Explorer Web Control
  *
- * 2001 John R. Sheets (for CodeWeavers)
+ * Copyright 2001 John R. Sheets (for CodeWeavers)
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -11,9 +25,9 @@
 #include "shlwapi.h"
 
 #include "shdocvw.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(shdocvw);
+WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
 
 /***********************************************************************
  *              DllCanUnloadNow (SHDOCVW.109) */
diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c
index 544a587cde9..919c7489606 100644
--- a/dlls/shdocvw/webbrowser.c
+++ b/dlls/shdocvw/webbrowser.c
@@ -1,13 +1,27 @@
 /*
  * Implementation of IWebBrowser interface for IE Web Browser control
  *
- * 2001 John R. Sheets (for CodeWeavers)
+ * Copyright 2001 John R. Sheets (for CodeWeavers)
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "shdocvw.h"
 
-DEFAULT_DEBUG_CHANNEL(shdocvw);
+WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
 
 /**********************************************************************
  * Implement the IWebBrowser interface
diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c
index 7379ae15df8..c4204f8f352 100644
--- a/dlls/shell32/brsfolder.c
+++ b/dlls/shell32/brsfolder.c
@@ -1,7 +1,25 @@
+/*
+ * Copyright 1999 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <stdlib.h>
 #include <string.h>
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "undocshell.h"
 #include "shlguid.h"
 #include "pidl.h"
@@ -9,7 +27,7 @@
 #include "shellapi.h"
 #include "shresdef.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 static HWND		hwndTreeView;
 static LPBROWSEINFOA	lpBrowseInfo;
diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c
index 109d20c809c..bd5809a70a1 100644
--- a/dlls/shell32/changenotify.c
+++ b/dlls/shell32/changenotify.c
@@ -1,18 +1,31 @@
 /*
  *	shell change notification
  *
- *	Juergen Schmied <juergen.schmied@debitel.de>
+ * Copyright 2000 Juergen Schmied
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "pidl.h"
 #include "shell32_main.h"
 #include "undocshell.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 static CRITICAL_SECTION SHELL32_ChangenotifyCS = CRITICAL_SECTION_INIT("SHELL32_ChangenotifyCS");
 
diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c
index 480fab03df0..8438be744df 100644
--- a/dlls/shell32/classes.c
+++ b/dlls/shell32/classes.c
@@ -2,12 +2,27 @@
  *	file type mapping 
  *	(HKEY_CLASSES_ROOT - Stuff)
  *
+ * Copyright 1998, 1999, 2000 Juergen Schmied
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winerror.h"
 #include "winreg.h"
 
@@ -17,7 +32,7 @@
 #include "shresdef.h"
 #include "wine/obj_queryassociations.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 #define MAX_EXTENSION_LENGTH 20
 
diff --git a/dlls/shell32/clipboard.c b/dlls/shell32/clipboard.c
index d58f12aae2e..0f93089a649 100644
--- a/dlls/shell32/clipboard.c
+++ b/dlls/shell32/clipboard.c
@@ -3,6 +3,22 @@
  *
  *	Copyright 2000	Juergen Schmied <juergen.schmied@debitel.de>
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * NOTES:
+ *
  * For copy & paste functions within contextmenus does the shell use
  * the OLE clipboard functions in combination with dataobjects.
  * The OLE32.DLL gets loaded with LoadLibrary
@@ -27,9 +43,9 @@
 #include "shell32_main.h"
 #include "shlwapi.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 static int refClipCount = 0;
 static HINSTANCE hShellOle32 = 0;
diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c
index 20da30d7ab0..841c0de8c48 100644
--- a/dlls/shell32/control.c
+++ b/dlls/shell32/control.c
@@ -1,5 +1,21 @@
-/* Control Panel management */
-/* Eric Pouech 2001 */
+/* Control Panel management
+ *
+ * Copyright 2001 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include <assert.h>
 #include <stdio.h>
@@ -9,10 +25,10 @@
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "cpl.h"
 
-DEFAULT_DEBUG_CHANNEL(shlctrl);
+WINE_DEFAULT_DEBUG_CHANNEL(shlctrl);
 
 typedef struct CPlApplet {
     struct CPlApplet*   next;		/* linked list */
diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c
index cf18242cd20..a8071d9b0ba 100644
--- a/dlls/shell32/dataobject.c
+++ b/dlls/shell32/dataobject.c
@@ -4,17 +4,31 @@
  * selecting and droping objects within the shell and/or common dialogs
  *
  *	Copyright 1998, 1999	<juergen.schmied@metronet.de>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <string.h>
 
 #include "pidl.h"
 #include "winerror.h"
 #include "shell32_main.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "undocshell.h"
 #include "wine/obj_dataobject.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 /***********************************************************************
 *   IEnumFORMATETC implementation
diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c
index 1baf6d641ee..11b225f54b6 100644
--- a/dlls/shell32/dialogs.c
+++ b/dlls/shell32/dialogs.c
@@ -1,17 +1,34 @@
 /*
  *	common shell dialogs
+ *
+ * Copyright 2000 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 #include <string.h>
 #include <stdio.h>
 #include "winerror.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "shellapi.h"
 #include "shlobj.h"
 #include "shell32_main.h"
 #include "undocshell.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 
 /*************************************************************************
diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c
index 4a16d893e54..77b81170717 100644
--- a/dlls/shell32/enumidlist.c
+++ b/dlls/shell32/enumidlist.c
@@ -2,11 +2,25 @@
  *	IEnumIDList
  *
  *	Copyright 1998	Juergen Schmied <juergen.schmied@metronet.de>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
 #include <string.h>
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winreg.h"
 #include "undocshell.h"
 #include "shlwapi.h"
@@ -18,7 +32,7 @@
 #include "shlguid.h"
 #include "shell32_main.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 typedef struct tagENUMLIST
 {
diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c
index 94280fdbc6c..2a1352e036c 100644
--- a/dlls/shell32/folders.c
+++ b/dlls/shell32/folders.c
@@ -2,6 +2,19 @@
  *	Copyright 1997	Marcus Meissner
  *	Copyright 1998	Juergen Schmied
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -14,13 +27,13 @@
 #include "undocshell.h"
 #include "shlguid.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winerror.h"
 
 #include "pidl.h"
 #include "shell32_main.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 
 /***********************************************************************
diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c
index ac70554f747..c12841978ec 100644
--- a/dlls/shell32/iconcache.c
+++ b/dlls/shell32/iconcache.c
@@ -1,7 +1,23 @@
 /*
  *	shell icon cache (SIC)
  *
+ * Copyright 1998, 1999 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 #include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -13,7 +29,7 @@
 #include "wine/winuser16.h"
 #include "wine/winbase16.h"
 #include "heap.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "shellapi.h"
 #include "shlguid.h"
@@ -22,7 +38,7 @@
 #include "undocshell.h"
 #include "shlwapi.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 /********************** THE ICON CACHE ********************************/
 
diff --git a/dlls/shell32/memorystream.c b/dlls/shell32/memorystream.c
index a36a8d4f07c..e3326febe21 100644
--- a/dlls/shell32/memorystream.c
+++ b/dlls/shell32/memorystream.c
@@ -7,6 +7,22 @@
  *	needs to be able to load lnk's from a IStream
  *	interface so it was obvious to capsule the file
  *	access in a IStream to.
+ *
+ * Copyright 1999 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -14,10 +30,10 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "shlobj.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "shell32_main.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 static HRESULT WINAPI IStream_fnQueryInterface(IStream *iface, REFIID riid, LPVOID *ppvObj);
 static ULONG WINAPI IStream_fnAddRef(IStream *iface);
diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c
index babc15035e7..358be225fe2 100644
--- a/dlls/shell32/pidl.c
+++ b/dlls/shell32/pidl.c
@@ -3,6 +3,20 @@
  *
  *	Copyright 1998	Juergen Schmied
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * NOTES
  *  a pidl == NULL means desktop and is legal
  *
@@ -22,10 +36,10 @@
 #include "shlwapi.h"
 
 #include "pidl.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(pidl);
-DECLARE_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(pidl);
+WINE_DECLARE_DEBUG_CHANNEL(shell);
 
 void pdump (LPCITEMIDLIST pidl)
 {
diff --git a/dlls/shell32/pidl.h b/dlls/shell32/pidl.h
index f5a8f3076f7..0d5f6c450f8 100644
--- a/dlls/shell32/pidl.h
+++ b/dlls/shell32/pidl.h
@@ -1,6 +1,23 @@
 /*
  * internal pidl functions
- * 1998 <juergen.schmied@metronet.de>
+ *
+ * Copyright 1998 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * NOTES:
  *
  * DO NOT use this definitions outside the shell32.dll !
  *
diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c
index 2a141a2726f..f55a62490d4 100644
--- a/dlls/shell32/shell.c
+++ b/dlls/shell32/shell.c
@@ -1,8 +1,22 @@
 /*
  * 				Shell Library Functions
  *
- *  1998 Marcus Meissner
- *  2002 Eric Pouech
+ * Copyright 1998 Marcus Meissner
+ * Copyright 2002 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -25,10 +39,10 @@
 #include "wine/winuser16.h"
 #include "shell32_main.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
-DECLARE_DEBUG_CHANNEL(exec);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DECLARE_DEBUG_CHANNEL(exec);
 
 
 typedef struct {     /* structure for dropped files */
diff --git a/dlls/shell32/shell32_Ca.rc b/dlls/shell32/shell32_Ca.rc
index 18da145f2d9..d3ad956abd9 100644
--- a/dlls/shell32/shell32_Ca.rc
+++ b/dlls/shell32/shell32_Ca.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
 
 SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
diff --git a/dlls/shell32/shell32_Cs.rc b/dlls/shell32/shell32_Cs.rc
index 3de92125163..9a027f35a5d 100644
--- a/dlls/shell32/shell32_Cs.rc
+++ b/dlls/shell32/shell32_Cs.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
diff --git a/dlls/shell32/shell32_Da.rc b/dlls/shell32/shell32_Da.rc
index 51955231252..c07e6f56baf 100644
--- a/dlls/shell32/shell32_Da.rc
+++ b/dlls/shell32/shell32_Da.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
diff --git a/dlls/shell32/shell32_De.rc b/dlls/shell32/shell32_De.rc
index 4b6d374501a..d5d0151f5f7 100644
--- a/dlls/shell32/shell32_De.rc
+++ b/dlls/shell32/shell32_De.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
 
 SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
diff --git a/dlls/shell32/shell32_En.rc b/dlls/shell32/shell32_En.rc
index 7a7a05b8902..e2996ce8c47 100644
--- a/dlls/shell32/shell32_En.rc
+++ b/dlls/shell32/shell32_En.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
diff --git a/dlls/shell32/shell32_Eo.rc b/dlls/shell32/shell32_Eo.rc
index b8549bf1c5d..7efe990196a 100644
--- a/dlls/shell32/shell32_Eo.rc
+++ b/dlls/shell32/shell32_Eo.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
 
 SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
diff --git a/dlls/shell32/shell32_Es.rc b/dlls/shell32/shell32_Es.rc
index 65dbca152de..05e1acf5490 100644
--- a/dlls/shell32/shell32_Es.rc
+++ b/dlls/shell32/shell32_Es.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
 
 SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
diff --git a/dlls/shell32/shell32_Fi.rc b/dlls/shell32/shell32_Fi.rc
index bb6a2653228..0cee3855a3b 100644
--- a/dlls/shell32/shell32_Fi.rc
+++ b/dlls/shell32/shell32_Fi.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
 
 SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
diff --git a/dlls/shell32/shell32_Fr.rc b/dlls/shell32/shell32_Fr.rc
index 611039f8cfb..57e21db7f2a 100644
--- a/dlls/shell32/shell32_Fr.rc
+++ b/dlls/shell32/shell32_Fr.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
 
 SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
diff --git a/dlls/shell32/shell32_Hu.rc b/dlls/shell32/shell32_Hu.rc
index 67efc3d20e9..dee748566a2 100644
--- a/dlls/shell32/shell32_Hu.rc
+++ b/dlls/shell32/shell32_Hu.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
diff --git a/dlls/shell32/shell32_It.rc b/dlls/shell32/shell32_It.rc
index c62ede7a802..d5500dfdc4b 100644
--- a/dlls/shell32/shell32_It.rc
+++ b/dlls/shell32/shell32_It.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
 
 SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
diff --git a/dlls/shell32/shell32_Ja.rc b/dlls/shell32/shell32_Ja.rc
index 81825193cec..1427e688e27 100644
--- a/dlls/shell32/shell32_Ja.rc
+++ b/dlls/shell32/shell32_Ja.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
 MENU_001 MENU DISCARDABLE
diff --git a/dlls/shell32/shell32_Ko.rc b/dlls/shell32/shell32_Ko.rc
index 90832b998f1..d5ff1fba685 100644
--- a/dlls/shell32/shell32_Ko.rc
+++ b/dlls/shell32/shell32_Ko.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
diff --git a/dlls/shell32/shell32_Nl.rc b/dlls/shell32/shell32_Nl.rc
index 00ae9a4105f..861af2b7150 100644
--- a/dlls/shell32/shell32_Nl.rc
+++ b/dlls/shell32/shell32_Nl.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
 
 SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
diff --git a/dlls/shell32/shell32_No.rc b/dlls/shell32/shell32_No.rc
index 4b4288b1e65..782fdbce1b7 100644
--- a/dlls/shell32/shell32_No.rc
+++ b/dlls/shell32/shell32_No.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT
 
 SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
diff --git a/dlls/shell32/shell32_Pl.rc b/dlls/shell32/shell32_Pl.rc
index 11770eb7fd2..05a1e1c7ecb 100644
--- a/dlls/shell32/shell32_Pl.rc
+++ b/dlls/shell32/shell32_Pl.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
diff --git a/dlls/shell32/shell32_Pt.rc b/dlls/shell32/shell32_Pt.rc
index ddf5ebe7a34..795a7e0e249 100644
--- a/dlls/shell32/shell32_Pt.rc
+++ b/dlls/shell32/shell32_Pt.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
 
 SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
diff --git a/dlls/shell32/shell32_Ru.rc b/dlls/shell32/shell32_Ru.rc
index df0197e98d2..30f59965b3a 100644
--- a/dlls/shell32/shell32_Ru.rc
+++ b/dlls/shell32/shell32_Ru.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
diff --git a/dlls/shell32/shell32_Sk.rc b/dlls/shell32/shell32_Sk.rc
index 8f51481128a..7a7b4c20bdb 100644
--- a/dlls/shell32/shell32_Sk.rc
+++ b/dlls/shell32/shell32_Sk.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 
 SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
diff --git a/dlls/shell32/shell32_Sv.rc b/dlls/shell32/shell32_Sv.rc
index 773edccb023..eef5732cd04 100644
--- a/dlls/shell32/shell32_Sv.rc
+++ b/dlls/shell32/shell32_Sv.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
 
 SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
diff --git a/dlls/shell32/shell32_Wa.rc b/dlls/shell32/shell32_Wa.rc
index dd6297f2bc9..e0eb2c5bb4d 100644
--- a/dlls/shell32/shell32_Wa.rc
+++ b/dlls/shell32/shell32_Wa.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_WALON, SUBLANG_DEFAULT
 
 /*
diff --git a/dlls/shell32/shell32_Zh.rc b/dlls/shell32/shell32_Zh.rc
index 0f8b26aeea9..a4c474c1701 100644
--- a/dlls/shell32/shell32_Zh.rc
+++ b/dlls/shell32/shell32_Zh.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
 SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c
index 7557040c6bd..b10acd1cd22 100644
--- a/dlls/shell32/shell32_main.c
+++ b/dlls/shell32/shell32_main.c
@@ -1,8 +1,22 @@
 /*
  * 				Shell basics
  *
- *  1998 Marcus Meissner
- *  1998 Juergen Schmied (jsch)  *  <juergen.schmied@metronet.de>
+ * Copyright 1998 Marcus Meissner
+ * Copyright 1998 Juergen Schmied (jsch)  *  <juergen.schmied@metronet.de>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -27,9 +41,9 @@
 #include "pidl.h"
 #include "shell32_main.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 #define MORE_DEBUG 1
 /*************************************************************************
diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h
index e3bce53a165..ad859d2ef31 100644
--- a/dlls/shell32/shell32_main.h
+++ b/dlls/shell32/shell32_main.h
@@ -1,5 +1,22 @@
 /*
  * 	internal Shell32 Library definitions
+ *
+ * Copyright 1998 Marcus Meissner
+ * Copyright 1998 Juergen Schmied (jsch)  *  <juergen.schmied@metronet.de>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_SHELL_MAIN_H
diff --git a/dlls/shell32/shell32_xx.rc b/dlls/shell32/shell32_xx.rc
index 8d6d8cf9ad2..9a40d049d51 100644
--- a/dlls/shell32/shell32_xx.rc
+++ b/dlls/shell32/shell32_xx.rc
@@ -1,4 +1,20 @@
 /* Language neutral resources.
  * Icons and bitmaps should go in here.
+ *
+ * Copyright 1998 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
diff --git a/dlls/shell32/shellfolder.h b/dlls/shell32/shellfolder.h
index 54f39931931..af8817b0cad 100644
--- a/dlls/shell32/shellfolder.h
+++ b/dlls/shell32/shellfolder.h
@@ -1,6 +1,21 @@
 /*
  * defines helperfunctions to manipulate the contents of a IShellFolder
  *
+ * Copyright 2000 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_SHELLFOLDER_HELP_H
diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c
index ba0c96b6d6d..318d2e663ac 100644
--- a/dlls/shell32/shelllink.c
+++ b/dlls/shell32/shelllink.c
@@ -3,6 +3,19 @@
  *	Copyright 1997	Marcus Meissner
  *	Copyright 1998	Juergen Schmied
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -14,7 +27,7 @@
 #ifdef HAVE_SYS_WAIT_H
 # include <sys/wait.h>
 #endif
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winerror.h"
 #include "winbase.h"
 #include "winnls.h"
@@ -29,7 +42,7 @@
 #include "shell32_main.h"
 #include "shlguid.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 /* link file formats */
 
diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c
index d85b38234a7..383fd1b813f 100644
--- a/dlls/shell32/shellole.c
+++ b/dlls/shell32/shellole.c
@@ -4,6 +4,19 @@
  *	Copyright 1997	Marcus Meissner
  *	Copyright 1998	Juergen Schmied  <juergen.schmied@metronet.de>
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -21,9 +34,9 @@
 #include "wine/unicode.h"
 #include "shell32_main.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 DWORD WINAPI SHCLSIDFromStringA (LPCSTR clsid, CLSID *id);
 extern IShellFolder * IShellFolder_Constructor(
diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c
index cd929c2535b..2703d62c70f 100644
--- a/dlls/shell32/shellord.c
+++ b/dlls/shell32/shellord.c
@@ -4,12 +4,26 @@
  * 
  * Copyright 1997 Marcus Meissner
  *           1998 Jürgen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <string.h>
 #include <stdio.h>
 #include "winerror.h"
 #include "winreg.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winnls.h"
 #include "heap.h"
 
@@ -23,8 +37,8 @@
 #include "shlwapi.h"
 #include "commdlg.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
-DECLARE_DEBUG_CHANNEL(pidl);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DECLARE_DEBUG_CHANNEL(pidl);
 
 /*************************************************************************
  * ParseFieldA					[internal]
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index a671a0a714b..d97bc0a0f54 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -1,12 +1,30 @@
 /*
  * Path Functions
  *
- * Many of this functions are in SHLWAPI.DLL also
+ * Copyright 1998, 1999, 2000 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * NOTES:
+ *
+ * Many of these functions are in SHLWAPI.DLL also
  *
  */
 #include <string.h>
 #include <ctype.h>
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "windef.h"
 #include "winnls.h"
 #include "winreg.h"
@@ -17,7 +35,7 @@
 #include "wine/unicode.h"
 #include "shlwapi.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 /*
 	########## Combining and Constructing paths ##########
diff --git a/dlls/shell32/shellreg.c b/dlls/shell32/shellreg.c
index 832473b229e..fddd9bc7f57 100644
--- a/dlls/shell32/shellreg.c
+++ b/dlls/shell32/shellreg.c
@@ -1,6 +1,22 @@
 /*
-	Shell Registry Access
-*/
+ * Shell Registry Access
+ *
+ * Copyright 2000 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include "config.h"
 
@@ -17,9 +33,9 @@
 #include "wine/winbase16.h"
 #include "shell32_main.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 /*************************************************************************
  * SHRegOpenKeyA				[SHELL32.506]
diff --git a/dlls/shell32/shellstring.c b/dlls/shell32/shellstring.c
index 1fa9d20d830..a1da15f0238 100644
--- a/dlls/shell32/shellstring.c
+++ b/dlls/shell32/shellstring.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <string.h>
 #include <stdio.h>
 #include <ctype.h>
@@ -12,9 +30,9 @@
 #include "shell32_main.h"
 #include "undocshell.h"
 #include "wine/unicode.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 /************************* STRRET functions ****************************/
 
diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c
index 8002ee733d3..079649d9e9e 100644
--- a/dlls/shell32/shlexec.c
+++ b/dlls/shell32/shlexec.c
@@ -1,8 +1,22 @@
 /*
  * 				Shell Library Functions
  *
- *  1998 Marcus Meissner
- *  2002 Eric Pouech
+ * Copyright 1998 Marcus Meissner
+ * Copyright 2002 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -24,9 +38,9 @@
 #include "wine/winbase16.h"
 #include "shell32_main.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(exec);
+WINE_DEFAULT_DEBUG_CHANNEL(exec);
 
 /* this function is supposed to expand the escape sequences found in the registry
  * some diving reported that the following were used:
diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c
index 52ddebdcd24..1aa59ac9835 100644
--- a/dlls/shell32/shlfileop.c
+++ b/dlls/shell32/shlfileop.c
@@ -1,5 +1,21 @@
 /*
  * SHFileOperation
+ *
+ * Copyright 2000 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <string.h>
 
@@ -10,9 +26,9 @@
 #include "shell32_main.h"
 #include "undocshell.h"
 #include "shlwapi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 BOOL SHELL_WarnItemDelete (int nKindOfDialog, LPCSTR szDir)
 {
diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c
index 12b8c94d460..9bfb06b35fd 100644
--- a/dlls/shell32/shlfolder.c
+++ b/dlls/shell32/shlfolder.c
@@ -6,6 +6,19 @@
  *	
  *	IShellFolder2 and related interfaces
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -28,9 +41,9 @@
 #include "shresdef.h"
 #include "shlwapi.h"
 #include "shellfolder.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 
 /***************************************************************************
diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c
index d5fd01813f4..0cf70af676f 100644
--- a/dlls/shell32/shlmenu.c
+++ b/dlls/shell32/shlmenu.c
@@ -1,6 +1,23 @@
 /*
  * see www.geocities.com/SiliconValley/4942/filemenu.html
+ *
+ * Copyright 1999, 2000 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 #include <string.h>
 
 #include "winreg.h"
@@ -15,7 +32,7 @@
 #include "shlguid.h"
 
 #include "pidl.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 static BOOL FileMenu_AppendItemA(HMENU hMenu, LPCSTR lpText, UINT uID, int icon,
                                  HMENU hMenuPopup, int nItemHeight);
@@ -48,7 +65,7 @@ static BOOL bAbortInit;
 
 #define	CCH_MAXITEMTEXT 256
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 LPFMINFO FM_GetMenuInfo(HMENU hmenu)
 {	MENUINFO	MenuInfo;
diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c
index b1c8284c44e..8fdf99b74ce 100644
--- a/dlls/shell32/shlview.c
+++ b/dlls/shell32/shlview.c
@@ -6,6 +6,20 @@
  * This is the view visualizing the data provied by the shellfolder.
  * No direct access to data from pidls should be done from here. 
  * 
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * FIXME: The order by part of the background context menu should be
  * buily according to the columns shown.
  *
@@ -33,14 +47,14 @@
 #include "shlobj.h"
 #include "undocshell.h"
 #include "shresdef.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "docobj.h"
 #include "pidl.h"
 #include "shell32_main.h"
 #include "shellfolder.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 typedef struct
 {   BOOL    bIsAscending;
diff --git a/dlls/shell32/shpolicy.c b/dlls/shell32/shpolicy.c
index a18ce2169ca..5c336d733c4 100644
--- a/dlls/shell32/shpolicy.c
+++ b/dlls/shell32/shpolicy.c
@@ -1,7 +1,23 @@
 /*
  * shpolicy.c - Data for shell/system policies.
  *
- * Created 1999 by Ian Schmidt <ischmidt@cfl.rr.com>
+ * Copyright 1999 Ian Schmidt <ischmidt@cfl.rr.com>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * NOTES:
  *
  * Some of these policies can be tweaked via the System Policy
  * Editor which came with the Win95 Migration Guide, although
@@ -23,9 +39,9 @@
 #include "undocshell.h"
 #include "wine/winuser16.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 #define SHELL_MAX_POLICIES 57
 
diff --git a/dlls/shell32/shres.rc b/dlls/shell32/shres.rc
index 356fa21365b..1d06931bcc4 100644
--- a/dlls/shell32/shres.rc
+++ b/dlls/shell32/shres.rc
@@ -1,6 +1,21 @@
 /*
  * Top level resource file for shell stuff
  *
+ * Copyright 1998 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h
index b0190e568b4..461907c2789 100644
--- a/dlls/shell32/shresdef.h
+++ b/dlls/shell32/shresdef.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_SHELL_RES_H
 #define __WINE_SHELL_RES_H
 
diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c
index 4a39ae7625d..5cfedba0231 100644
--- a/dlls/shell32/shv_bg_cmenu.c
+++ b/dlls/shell32/shv_bg_cmenu.c
@@ -3,10 +3,24 @@
  *	ShellView Background Context Menu (shv_bg_cm)
  *
  *	Copyright 1999	Juergen Schmied <juergen.schmied@metronet.de>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <string.h>
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "pidl.h"
 #include "shlguid.h"
@@ -18,7 +32,7 @@
 #include "shellfolder.h"
 #include "undocshell.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 /**************************************************************************
 *  IContextMenu Implementation
diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c
index 08883256f9c..3036dea7be6 100644
--- a/dlls/shell32/shv_item_cmenu.c
+++ b/dlls/shell32/shv_item_cmenu.c
@@ -1,12 +1,27 @@
 /*
  *	IContextMenu for items in the shellview
  *
- *	1998, 2000	Juergen Schmied <juergen.schmied@debitel.net>
+ * Copyright 1998, 2000 Juergen Schmied <juergen.schmied@debitel.net>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 #include <string.h>
 
 #include "winerror.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "pidl.h"
 #include "shlguid.h"
@@ -19,7 +34,7 @@
 #include "shell32_main.h"
 #include "shellfolder.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 /**************************************************************************
 *  IContextMenu Implementation
diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c
index a22e59bd390..a5872016ea4 100644
--- a/dlls/shell32/systray.c
+++ b/dlls/shell32/systray.c
@@ -7,6 +7,19 @@
  *  area of KDE or GNOME is delegated to windows/x11drv/wnd.c,
  *  X11DRV_WND_DockWindow.
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -20,9 +33,9 @@
 #include "shellapi.h"
 #include "shell32_main.h"
 #include "commctrl.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 typedef struct SystrayItem {
   HWND                  hWnd;
diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h
index 017c4776393..239de955abc 100644
--- a/dlls/shell32/undocshell.h
+++ b/dlls/shell32/undocshell.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1999, 2000 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_UNDOCSHELL_H
 #define __WINE_UNDOCSHELL_H
 
diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c
index 1cbd227f0a8..13d8cb94565 100644
--- a/dlls/shlwapi/ordinal.c
+++ b/dlls/shlwapi/ordinal.c
@@ -4,6 +4,20 @@
  * Copyright 1997 Marcus Meissner
  *           1998 Jürgen Schmied
  *           2001 Jon Griffiths
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
@@ -23,11 +37,11 @@
 #include "wingdi.h"
 #include "winreg.h"
 #include "winuser.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "ordinal.h"
 #include "shlwapi.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 extern HINSTANCE shlwapi_hInstance;
 extern HMODULE SHLWAPI_hshell32;
diff --git a/dlls/shlwapi/ordinal.h b/dlls/shlwapi/ordinal.h
index 037ff82f2ac..bf2e130772b 100644
--- a/dlls/shlwapi/ordinal.h
+++ b/dlls/shlwapi/ordinal.h
@@ -3,6 +3,22 @@
  * ordinal entry points.
  *
  * Determined by experimentation.
+ *
+ * Copyright 2001 Guy Albertelli
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 typedef struct {
diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c
index 549ec124466..603fa86df02 100644
--- a/dlls/shlwapi/path.c
+++ b/dlls/shlwapi/path.c
@@ -1,5 +1,21 @@
 /*
  * Path Functions
+ *
+ * Copyright 1999, 2000 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <ctype.h>
@@ -14,10 +30,10 @@
 #include "winreg.h"
 #define NO_SHLWAPI_STREAM
 #include "shlwapi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "ordinal.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 INT __cdecl _wtoi(LPWSTR string);
 
diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c
index e29cdfcafd6..79e5a7570f6 100644
--- a/dlls/shlwapi/reg.c
+++ b/dlls/shlwapi/reg.c
@@ -1,5 +1,22 @@
 /*
  * SHLWAPI registry functions
+ *
+ * Copyright 1998 Juergen Schmied
+ * Copyright 2001 Guy Albertelli
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -10,12 +27,12 @@
 #include "winerror.h"
 #include "winnls.h"
 #include "winreg.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #define NO_SHLWAPI_STREAM
 #include "shlwapi.h"
 #include "wine/unicode.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 typedef DWORD (WINAPI *RegQueryFn)(HKEY,LPCVOID,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
 
diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c
index 528b3e083e2..31ed73708de 100644
--- a/dlls/shlwapi/regstream.c
+++ b/dlls/shlwapi/regstream.c
@@ -1,6 +1,23 @@
 /*
  *	SHRegOpenStream
+ *
+ * Copyright 1999 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 #include <string.h>
 
 #include "winerror.h"
@@ -8,9 +25,9 @@
 #include "winreg.h"
 #include "shlobj.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 typedef struct 
 {	ICOM_VFIELD(IStream);
diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c
index ec9d57c5a46..600dfa97ce6 100644
--- a/dlls/shlwapi/shlwapi_main.c
+++ b/dlls/shlwapi/shlwapi_main.c
@@ -3,16 +3,30 @@
  *
  *  Copyright 1998 Marcus Meissner
  *  Copyright 1998 Juergen Schmied (jsch)
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "winbase.h"
 #include "winerror.h"
 #include "winreg.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #define NO_SHLWAPI_STREAM
 #include "shlwapi.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 HINSTANCE shlwapi_hInstance = 0; 
 HMODULE SHLWAPI_hshell32 = 0;
diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c
index 701bfdac698..c80225d94ed 100644
--- a/dlls/shlwapi/string.c
+++ b/dlls/shlwapi/string.c
@@ -1,3 +1,23 @@
+/*
+ * Shlwapi string functions
+ *
+ * Copyright 1998 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <ctype.h>
 #include <stdlib.h> 
 #include <stdio.h>
@@ -13,9 +33,9 @@
 #include "shlwapi.h"
 #include "shlobj.h"
 #include "wine/unicode.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 /*************************************************************************
  * ChrCmpIA					[SHLWAPI.385]
diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c
index ee8d36f9b55..dacbf1e9d81 100644
--- a/dlls/shlwapi/url.c
+++ b/dlls/shlwapi/url.c
@@ -2,6 +2,20 @@
  * Url functions
  *
  * Copyright 2000 Huw D M Davies for CodeWeavers.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -15,10 +29,10 @@
 #include "winreg.h"
 #define NO_SHLWAPI_STREAM
 #include "shlwapi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "ordinal.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 typedef struct {
     LPCWSTR pScheme;      /* [out] start of scheme                     */
diff --git a/dlls/tapi32/assisted.c b/dlls/tapi32/assisted.c
index a794ac871fb..dbd92fc9274 100644
--- a/dlls/tapi32/assisted.c
+++ b/dlls/tapi32/assisted.c
@@ -2,14 +2,28 @@
  * TAPI32 Assisted Telephony
  *
  * Copyright 1999  Andreas Mohr
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "winbase.h"
 #include "windef.h"
 #include "tapi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(tapi);
+WINE_DEFAULT_DEBUG_CHANNEL(tapi);
 
 /***********************************************************************
  *		tapiGetLocationInfo (TAPI32.@)
diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c
index a894f3a429b..5345c2ea61c 100644
--- a/dlls/tapi32/line.c
+++ b/dlls/tapi32/line.c
@@ -2,6 +2,20 @@
  * TAPI32 line services
  *
  * Copyright 1999  Andreas Mohr
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -10,9 +24,9 @@
 #include "winbase.h"
 #include "windef.h"
 #include "tapi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(tapi);
+WINE_DEFAULT_DEBUG_CHANNEL(tapi);
 
 /***********************************************************************
  *		lineAccept (TAPI32.@)
diff --git a/dlls/tapi32/phone.c b/dlls/tapi32/phone.c
index b3b1ab3f69c..110dc497198 100644
--- a/dlls/tapi32/phone.c
+++ b/dlls/tapi32/phone.c
@@ -2,14 +2,28 @@
  * TAPI32 phone services
  *
  * Copyright 1999  Andreas Mohr
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "winbase.h"
 #include "windef.h"
 #include "tapi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(tapi);
+WINE_DEFAULT_DEBUG_CHANNEL(tapi);
 
 /***********************************************************************
  *		phoneClose (TAPI32.@)
diff --git a/dlls/ttydrv/bitmap.c b/dlls/ttydrv/bitmap.c
index 9a09d5fb1ca..880287174c3 100644
--- a/dlls/ttydrv/bitmap.c
+++ b/dlls/ttydrv/bitmap.c
@@ -2,6 +2,20 @@
  * TTY bitmap driver
  *
  * Copyright 1999 Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -12,9 +26,9 @@
 #include "gdi.h"
 #include "ttydrv.h"
 #include "winbase.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ttydrv);
+WINE_DEFAULT_DEBUG_CHANNEL(ttydrv);
 
 /**********************************************************************/
 
diff --git a/dlls/ttydrv/dc.c b/dlls/ttydrv/dc.c
index a9dafb87331..4d9e70e9c3f 100644
--- a/dlls/ttydrv/dc.c
+++ b/dlls/ttydrv/dc.c
@@ -2,6 +2,20 @@
  * TTY DC driver
  *
  * Copyright 1999 Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -11,9 +25,9 @@
 #include "palette.h"
 #include "ttydrv.h"
 #include "winbase.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ttydrv);
+WINE_DEFAULT_DEBUG_CHANNEL(ttydrv);
 
 /**********************************************************************/
 
diff --git a/dlls/ttydrv/graphics.c b/dlls/ttydrv/graphics.c
index ee1960d6960..5b2dc47ac29 100644
--- a/dlls/ttydrv/graphics.c
+++ b/dlls/ttydrv/graphics.c
@@ -2,16 +2,30 @@
  * TTY DC graphics
  *
  * Copyright 1999 Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
 
 #include "winnls.h"
 #include "gdi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "ttydrv.h"
 
-DEFAULT_DEBUG_CHANNEL(ttydrv);
+WINE_DEFAULT_DEBUG_CHANNEL(ttydrv);
 
 /***********************************************************************
  *		TTYDRV_DC_Arc
diff --git a/dlls/ttydrv/objects.c b/dlls/ttydrv/objects.c
index 0165b54d4e6..6737e5bc207 100644
--- a/dlls/ttydrv/objects.c
+++ b/dlls/ttydrv/objects.c
@@ -2,6 +2,20 @@
  * TTY DC objects
  *
  * Copyright 1999 Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -9,9 +23,9 @@
 #include "bitmap.h"
 #include "gdi.h"
 #include "ttydrv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ttydrv);
+WINE_DEFAULT_DEBUG_CHANNEL(ttydrv);
 
 /**********************************************************************/
 
diff --git a/dlls/ttydrv/palette.c b/dlls/ttydrv/palette.c
index c727eb85627..ac359f95109 100644
--- a/dlls/ttydrv/palette.c
+++ b/dlls/ttydrv/palette.c
@@ -2,6 +2,20 @@
  * TTY palette driver
  *
  * Copyright 1999 Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -9,12 +23,12 @@
 #include <stdlib.h>
 
 #include "color.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "palette.h"
 #include "winbase.h"
 #include "ttydrv.h"
 
-DEFAULT_DEBUG_CHANNEL(ttydrv);
+WINE_DEFAULT_DEBUG_CHANNEL(ttydrv);
 
 /**********************************************************************/
 
diff --git a/dlls/ttydrv/ttydrv.h b/dlls/ttydrv/ttydrv.h
index 7190142f5d5..3b18e4670d2 100644
--- a/dlls/ttydrv/ttydrv.h
+++ b/dlls/ttydrv/ttydrv.h
@@ -1,5 +1,21 @@
 /*
  * TTY driver definitions
+ *
+ * Copyright 1998 Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_TTYDRV_H
diff --git a/dlls/ttydrv/ttydrv_main.c b/dlls/ttydrv/ttydrv_main.c
index 3014990bee1..d168e7f94ec 100644
--- a/dlls/ttydrv/ttydrv_main.c
+++ b/dlls/ttydrv/ttydrv_main.c
@@ -1,5 +1,21 @@
 /*
  * TTYDRV initialization code
+ *
+ * Copyright 2000 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -11,10 +27,10 @@
 #include "gdi.h"
 #include "user.h"
 #include "win.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "ttydrv.h"
 
-DEFAULT_DEBUG_CHANNEL(ttydrv);
+WINE_DEFAULT_DEBUG_CHANNEL(ttydrv);
 
 int cell_width = 8;
 int cell_height = 8;
diff --git a/dlls/ttydrv/user.c b/dlls/ttydrv/user.c
index 4486b34d95a..6aabf6e1bd0 100644
--- a/dlls/ttydrv/user.c
+++ b/dlls/ttydrv/user.c
@@ -2,15 +2,29 @@
  * TTYDRV USER driver functions
  *
  * Copyright 1998 Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
 
 #include "dinput.h"
 #include "ttydrv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ttydrv);
+WINE_DEFAULT_DEBUG_CHANNEL(ttydrv);
 
 
 /***********************************************************************
diff --git a/dlls/ttydrv/wnd.c b/dlls/ttydrv/wnd.c
index cc0fd4295e8..4734e950864 100644
--- a/dlls/ttydrv/wnd.c
+++ b/dlls/ttydrv/wnd.c
@@ -2,6 +2,20 @@
  * TTY window driver
  *
  * Copyright 1998,1999 Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -11,10 +25,10 @@
 #include "region.h"
 #include "win.h"
 #include "winpos.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "hook.h"
 
-DEFAULT_DEBUG_CHANNEL(ttydrv);
+WINE_DEFAULT_DEBUG_CHANNEL(ttydrv);
 
 #define SWP_AGG_NOGEOMETRYCHANGE \
     (SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE)
diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c
index 039756aa867..3eb20fcce02 100644
--- a/dlls/urlmon/umon.c
+++ b/dlls/urlmon/umon.c
@@ -5,15 +5,28 @@
  *
  * Ulrich Czekalla
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
 #include "objbase.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "urlmon.h"
 
-DEFAULT_DEBUG_CHANNEL(urlmon);
+WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
 
 /* native urlmon.dll uses this key, too */
 static WCHAR BSCBHolder[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 };
diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c
index 22446fa5b1c..b913b01e99a 100644
--- a/dlls/urlmon/urlmon_main.c
+++ b/dlls/urlmon/urlmon_main.c
@@ -3,15 +3,28 @@
  *
  * Copyright (c) 2000 Patrik Stridvall
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
 #include "winerror.h"
 #include "wtypes.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(win32);
+WINE_DEFAULT_DEBUG_CHANNEL(win32);
 
 /***********************************************************************
  *		DllInstall (URLMON.@)
diff --git a/dlls/user/bidi16.c b/dlls/user/bidi16.c
index 1f3b90d006d..f5da3ba7bc3 100644
--- a/dlls/user/bidi16.c
+++ b/dlls/user/bidi16.c
@@ -1,6 +1,22 @@
 /*
  * Win16 BiDi functions
- * Right now, most of these functions do nothing.
+ * Copyright 2000 Erez Volk
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * NOTE: Right now, most of these functions do nothing.
  */
 
 #include <string.h>
@@ -8,9 +24,9 @@
 #include "wingdi.h"
 #include "wine/winuser16.h"
 #include "winerror.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(relay);
+WINE_DEFAULT_DEBUG_CHANNEL(relay);
 
 /***********************************************************************
  *		ChangeDialogTemplate   (USER.905)
diff --git a/dlls/user/cache.c b/dlls/user/cache.c
index 2724e5cbe37..ecaf6288bcf 100644
--- a/dlls/user/cache.c
+++ b/dlls/user/cache.c
@@ -4,6 +4,19 @@
  * 
  * Copyright 1997 Bertho A. Stultiens
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
diff --git a/dlls/user/comm16.c b/dlls/user/comm16.c
index f473e81a7de..e306aee439c 100644
--- a/dlls/user/comm16.c
+++ b/dlls/user/comm16.c
@@ -5,6 +5,22 @@
  *
  * Copyright 2001 Mike McCormack
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * History:
+ *
  * Mar 31, 1999. Ove Kåven <ovek@arcticnet.no>
  * - Implemented buffers and EnableCommNotification.
  *
@@ -52,9 +68,9 @@
 #include "win.h"
 #include "winerror.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(comm);
+WINE_DEFAULT_DEBUG_CHANNEL(comm);
 
 /* window's semi documented modem status register */
 #define COMM_MSR_OFFSET  35
diff --git a/dlls/user/controls.h b/dlls/user/controls.h
index 5492836840a..42f181e1de3 100644
--- a/dlls/user/controls.h
+++ b/dlls/user/controls.h
@@ -2,6 +2,20 @@
  * User controls definitions
  *
  * Copyright 2000 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_CONTROLS_H
diff --git a/dlls/user/dde/client.c b/dlls/user/dde/client.c
index ee0a63d5d7b..077b2b9387d 100644
--- a/dlls/user/dde/client.c
+++ b/dlls/user/dde/client.c
@@ -8,6 +8,20 @@
  * Copyright 1999 Keith Matthews
  * Copyright 2000 Corel
  * Copyright 2001 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -20,10 +34,10 @@
 #include "dde.h"
 #include "ddeml.h"
 #include "win.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "dde/dde_private.h"
 
-DEFAULT_DEBUG_CHANNEL(ddeml);
+WINE_DEFAULT_DEBUG_CHANNEL(ddeml);
 
 static LRESULT CALLBACK WDML_ClientProc(HWND, UINT, WPARAM, LPARAM);	/* only for one client, not conv list */
 const char  WDML_szClientConvClassA[] = "DdeClientAnsi";
diff --git a/dlls/user/dde/dde_private.h b/dlls/user/dde/dde_private.h
index ff397d8009f..c09d62977e8 100644
--- a/dlls/user/dde/dde_private.h
+++ b/dlls/user/dde/dde_private.h
@@ -8,6 +8,20 @@
  * Copyright 1999 Keith Matthews
  * Copyright 2000 Corel
  * Copyright 2001 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_DDEML_PRIVATE_H
diff --git a/dlls/user/dde/ddeml16.c b/dlls/user/dde/ddeml16.c
index 28cbd98a293..55efab79c1c 100644
--- a/dlls/user/dde/ddeml16.c
+++ b/dlls/user/dde/ddeml16.c
@@ -8,6 +8,20 @@
  * Copyright 1999 Keith Matthews
  * Copyright 2000 Corel
  * Copyright 2001 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -20,9 +34,9 @@
 #include "dde.h"
 #include "ddeml.h"
 #include "dde/dde_private.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ddeml);
+WINE_DEFAULT_DEBUG_CHANNEL(ddeml);
 
 
 typedef HDDEDATA (CALLBACK *PFNCALLBACK16)(UINT16,UINT16,HCONV,HSZ,HSZ,HDDEDATA,DWORD,DWORD);
diff --git a/dlls/user/dde/misc.c b/dlls/user/dde/misc.c
index c2292ac5f94..92a353fd299 100644
--- a/dlls/user/dde/misc.c
+++ b/dlls/user/dde/misc.c
@@ -8,6 +8,20 @@
  * Copyright 1999 Keith Matthews
  * Copyright 2000 Corel
  * Copyright 2001 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -20,10 +34,10 @@
 #include "dde.h"
 #include "ddeml.h"
 #include "win.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "dde/dde_private.h"
 
-DEFAULT_DEBUG_CHANNEL(ddeml);
+WINE_DEFAULT_DEBUG_CHANNEL(ddeml);
 
 static WDML_INSTANCE*	WDML_InstanceList = NULL;
 static DWORD		WDML_MaxInstanceID = 0;  /* OK for present, have to worry about wrap-around later */
diff --git a/dlls/user/dde/server.c b/dlls/user/dde/server.c
index 7a18dc66077..4ce6cc187df 100644
--- a/dlls/user/dde/server.c
+++ b/dlls/user/dde/server.c
@@ -8,6 +8,20 @@
  * Copyright 1999 Keith Matthews
  * Copyright 2000 Corel
  * Copyright 2001 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -19,10 +33,10 @@
 #include "dde.h"
 #include "ddeml.h"
 #include "win.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "dde/dde_private.h"
 
-DEFAULT_DEBUG_CHANNEL(ddeml);
+WINE_DEFAULT_DEBUG_CHANNEL(ddeml);
 
 static const char  szServerNameClassA[] = "DdeServerNameAnsi";
 const char  WDML_szServerConvClassA[] = "DdeServerConvAnsi";
diff --git a/dlls/user/display.c b/dlls/user/display.c
index 2ff1e47b374..98b8c01a459 100644
--- a/dlls/user/display.c
+++ b/dlls/user/display.c
@@ -3,14 +3,27 @@
  *
  * Copyright 1998 Ulrich Weigand
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "windef.h"
 #include "user.h"
 #include "wine/winuser16.h"
 
-DEFAULT_DEBUG_CHANNEL(cursor);
+WINE_DEFAULT_DEBUG_CHANNEL(cursor);
 
 #include "pshpack1.h"
 typedef struct tagCURSORINFO
diff --git a/dlls/user/exticon.c b/dlls/user/exticon.c
index d24695d2543..c703190b75c 100644
--- a/dlls/user/exticon.c
+++ b/dlls/user/exticon.c
@@ -4,6 +4,22 @@
  * taken and slightly changed from shell
  * this should replace the icon extraction code in shell32 and shell16 once
  * it needs a serious test for compliance with the native API 
+ *
+ * Copyright 2000 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -20,9 +36,9 @@
 #include "winuser.h"
 #include "wine/winbase16.h"
 #include "cursoricon.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(icon);
+WINE_DEFAULT_DEBUG_CHANNEL(icon);
 
 #include "pshpack1.h"
 
diff --git a/dlls/user/lstr.c b/dlls/user/lstr.c
index 152a274d6d6..5d45dba034c 100644
--- a/dlls/user/lstr.c
+++ b/dlls/user/lstr.c
@@ -4,6 +4,20 @@
  * Copyright 1993 Yngvi Sigurjonsson (yngvi@hafro.is)
  * Copyright 1996 Alexandre Julliard
  * Copyright 1996 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -24,9 +38,9 @@
 
 #include "msvcrt/excpt.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(resource);
+WINE_DEFAULT_DEBUG_CHANNEL(resource);
 
 /* filter for page-fault exceptions */
 static WINE_EXCEPTION_FILTER(page_fault)
diff --git a/dlls/user/message.c b/dlls/user/message.c
index 98b425c6d35..e6073695fe0 100644
--- a/dlls/user/message.c
+++ b/dlls/user/message.c
@@ -2,6 +2,20 @@
  * Window messaging support
  *
  * Copyright 2001 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "winbase.h"
@@ -19,9 +33,9 @@
 #include "spy.h"
 #include "user.h"
 #include "win.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(msg);
+WINE_DEFAULT_DEBUG_CHANNEL(msg);
 
 #define WM_NCMOUSEFIRST WM_NCMOUSEMOVE
 #define WM_NCMOUSELAST  WM_NCMBUTTONDBLCLK
diff --git a/dlls/user/misc.c b/dlls/user/misc.c
index b4628d4dd22..84d8f41b573 100644
--- a/dlls/user/misc.c
+++ b/dlls/user/misc.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1995 Thomas Sandford
  * Copyright 1997 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
@@ -11,9 +25,9 @@
 #include "winuser.h"
 #include "winerror.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(win);
+WINE_DEFAULT_DEBUG_CHANNEL(win);
 
 /**********************************************************************
  * SetLastErrorEx [USER32.@]  Sets the last-error code.
diff --git a/dlls/user/mouse.c b/dlls/user/mouse.c
index 9fc9112b380..ff820614996 100644
--- a/dlls/user/mouse.c
+++ b/dlls/user/mouse.c
@@ -3,6 +3,19 @@
  * 
  * Copyright 1998 Ulrich Weigand
  * 
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
diff --git a/dlls/user/msg16.c b/dlls/user/msg16.c
index a57e3df585b..ae095bced99 100644
--- a/dlls/user/msg16.c
+++ b/dlls/user/msg16.c
@@ -2,6 +2,20 @@
  * 16-bit messaging support
  *
  * Copyright 2001 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "wine/winuser16.h"
@@ -12,9 +26,9 @@
 #include "task.h"
 #include "thread.h"
 #include "win.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(msg);
+WINE_DEFAULT_DEBUG_CHANNEL(msg);
 
 DWORD USER16_AlertableWait = 0;
 
diff --git a/dlls/user/network.c b/dlls/user/network.c
index 03a7b6e5885..ee6f9c6786c 100644
--- a/dlls/user/network.c
+++ b/dlls/user/network.c
@@ -1,5 +1,21 @@
 /*
  * USER Windows Network functions
+ *
+ * Copyright 1995 Martin von Loewis
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <ctype.h>
@@ -11,9 +27,9 @@
 #include "winbase.h"
 #include "wine/winnet16.h"
 #include "winnetwk.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(wnet);
+WINE_DEFAULT_DEBUG_CHANNEL(wnet);
 
 /*
  * Remote printing 
diff --git a/dlls/user/painting.c b/dlls/user/painting.c
index 19fe3f9d1ac..b5e325b6fe2 100644
--- a/dlls/user/painting.c
+++ b/dlls/user/painting.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1993, 1994, 1995, 2001 Alexandre Julliard
  * Copyright 1999 Alex Korobka
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <string.h>
 
@@ -12,9 +26,9 @@
 #include "wine/server.h"
 #include "win.h"
 #include "dce.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(win);
+WINE_DEFAULT_DEBUG_CHANNEL(win);
 
 /***********************************************************************
  *           add_paint_count
diff --git a/dlls/user/property.c b/dlls/user/property.c
index 2cf3b425e61..62d3837cd7b 100644
--- a/dlls/user/property.c
+++ b/dlls/user/property.c
@@ -2,6 +2,20 @@
  * Window properties
  *
  * Copyright 1995, 1996, 2001 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
diff --git a/dlls/user/resource.c b/dlls/user/resource.c
index 6669f94d3dd..76ec677065d 100644
--- a/dlls/user/resource.c
+++ b/dlls/user/resource.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1993 Robert J. Amstadt
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
@@ -11,10 +25,10 @@
 #include "winnls.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(resource);
-DECLARE_DEBUG_CHANNEL(accel);
+WINE_DEFAULT_DEBUG_CHANNEL(resource);
+WINE_DECLARE_DEBUG_CHANNEL(accel);
 
 /* this is the 8 byte accel struct used in Win32 resources (internal only) */
 typedef struct
diff --git a/dlls/user/resources/display.rc b/dlls/user/resources/display.rc
index d89a745c368..fceb068b66d 100644
--- a/dlls/user/resources/display.rc
+++ b/dlls/user/resources/display.rc
@@ -1,6 +1,21 @@
 /*
  * resource file for DISPLAY driver dll
  *
+ * Copyright 1999 Andreas Mohr
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 1 OEMBIN
diff --git a/dlls/user/resources/mouse.rc b/dlls/user/resources/mouse.rc
index cd75cdf7ee0..64774cfae9c 100644
--- a/dlls/user/resources/mouse.rc
+++ b/dlls/user/resources/mouse.rc
@@ -1,6 +1,21 @@
 /*
  * Top level resource file for MOUSE driver dll
  *
+ * Copyright 1999 Andreas Mohr
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* this ought to be VERSION_INFO */
diff --git a/dlls/user/resources/user32.rc b/dlls/user/resources/user32.rc
index d50e0ed1c9e..7be64c79b1f 100644
--- a/dlls/user/resources/user32.rc
+++ b/dlls/user/resources/user32.rc
@@ -1,6 +1,21 @@
 /*
  * Top level resource file for USER
  *
+ * Copyright 1999 Bertho Stultiens
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
diff --git a/dlls/user/resources/user32_Ca.rc b/dlls/user/resources/user32_Ca.rc
index e21f06c27ad..d2673c2cc07 100644
--- a/dlls/user/resources/user32_Ca.rc
+++ b/dlls/user/resources/user32_Ca.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Marc Huguet Puig
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
 
 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
diff --git a/dlls/user/resources/user32_Cs.rc b/dlls/user/resources/user32_Cs.rc
index aac7dd7cdf6..6128b0679f0 100644
--- a/dlls/user/resources/user32_Cs.rc
+++ b/dlls/user/resources/user32_Cs.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1996 Roman Dolejsi
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
diff --git a/dlls/user/resources/user32_Da.rc b/dlls/user/resources/user32_Da.rc
index c31c755603d..1d454439229 100644
--- a/dlls/user/resources/user32_Da.rc
+++ b/dlls/user/resources/user32_Da.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1995 Morten Welinder
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
diff --git a/dlls/user/resources/user32_De.rc b/dlls/user/resources/user32_De.rc
index a79a52ab980..9f1034a4334 100644
--- a/dlls/user/resources/user32_De.rc
+++ b/dlls/user/resources/user32_De.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1994 Martin von Loewis
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
 
 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE 
diff --git a/dlls/user/resources/user32_En.rc b/dlls/user/resources/user32_En.rc
index 67fc80690a7..53fb3e59835 100644
--- a/dlls/user/resources/user32_En.rc
+++ b/dlls/user/resources/user32_En.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
diff --git a/dlls/user/resources/user32_Eo.rc b/dlls/user/resources/user32_Eo.rc
index 611e185c5ae..a820ccc0d2e 100644
--- a/dlls/user/resources/user32_Eo.rc
+++ b/dlls/user/resources/user32_Eo.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1996 Duncan C Thomson
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
 
 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
diff --git a/dlls/user/resources/user32_Es.rc b/dlls/user/resources/user32_Es.rc
index ea7e0192168..bb979803198 100644
--- a/dlls/user/resources/user32_Es.rc
+++ b/dlls/user/resources/user32_Es.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1995 Jon Tombs
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
 
 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
diff --git a/dlls/user/resources/user32_Fi.rc b/dlls/user/resources/user32_Fi.rc
index b1e810d8d31..c3725e54608 100644
--- a/dlls/user/resources/user32_Fi.rc
+++ b/dlls/user/resources/user32_Fi.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1995 Jukka Iivonen
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
 
 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
diff --git a/dlls/user/resources/user32_Fr.rc b/dlls/user/resources/user32_Fr.rc
index 63236d42183..c501a1d8b5c 100644
--- a/dlls/user/resources/user32_Fr.rc
+++ b/dlls/user/resources/user32_Fr.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
 
 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
diff --git a/dlls/user/resources/user32_Hu.rc b/dlls/user/resources/user32_Hu.rc
index 2bf28aff853..d42417eae2c 100644
--- a/dlls/user/resources/user32_Hu.rc
+++ b/dlls/user/resources/user32_Hu.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1997 John Zero
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
diff --git a/dlls/user/resources/user32_It.rc b/dlls/user/resources/user32_It.rc
index 0617cda2993..c688fa84d49 100644
--- a/dlls/user/resources/user32_It.rc
+++ b/dlls/user/resources/user32_It.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1996 Tristan Tarrant
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
 
 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
diff --git a/dlls/user/resources/user32_Ja.rc b/dlls/user/resources/user32_Ja.rc
index 6d9e0e5261d..a9d1f7c5d87 100644
--- a/dlls/user/resources/user32_Ja.rc
+++ b/dlls/user/resources/user32_Ja.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000 Junichi Kuchinishi
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
diff --git a/dlls/user/resources/user32_Ko.rc b/dlls/user/resources/user32_Ko.rc
index e4d4bd2c77f..607fab41a63 100644
--- a/dlls/user/resources/user32_Ko.rc
+++ b/dlls/user/resources/user32_Ko.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1996 Bang Jun Young
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
diff --git a/dlls/user/resources/user32_Nl.rc b/dlls/user/resources/user32_Nl.rc
index 353f5fd10d0..a8bfc33b3a1 100644
--- a/dlls/user/resources/user32_Nl.rc
+++ b/dlls/user/resources/user32_Nl.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1999 Klaas van Gend
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
 
 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
diff --git a/dlls/user/resources/user32_No.rc b/dlls/user/resources/user32_No.rc
index 64fb6c064df..16d108c959d 100644
--- a/dlls/user/resources/user32_No.rc
+++ b/dlls/user/resources/user32_No.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1994 Dag Asheim
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT
 
 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
diff --git a/dlls/user/resources/user32_Pl.rc b/dlls/user/resources/user32_Pl.rc
index a704d391744..ee0402f7652 100644
--- a/dlls/user/resources/user32_Pl.rc
+++ b/dlls/user/resources/user32_Pl.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1997 Mikolaj Zalewski
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
diff --git a/dlls/user/resources/user32_Pt.rc b/dlls/user/resources/user32_Pt.rc
index 1d81a3c7add..0353187c866 100644
--- a/dlls/user/resources/user32_Pt.rc
+++ b/dlls/user/resources/user32_Pt.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1997 Ricardo R. Massaro
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
 
 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
diff --git a/dlls/user/resources/user32_Ru.rc b/dlls/user/resources/user32_Ru.rc
index 712e0949075..e89cec59068 100644
--- a/dlls/user/resources/user32_Ru.rc
+++ b/dlls/user/resources/user32_Ru.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1999 Alexander Kanavin
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
diff --git a/dlls/user/resources/user32_Sk.rc b/dlls/user/resources/user32_Sk.rc
index e4c768c1f9c..9f11df526e8 100644
--- a/dlls/user/resources/user32_Sk.rc
+++ b/dlls/user/resources/user32_Sk.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000 Simen Zamecnik
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 
 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
diff --git a/dlls/user/resources/user32_Sv.rc b/dlls/user/resources/user32_Sv.rc
index de5ef095bb5..ce2b3d65916 100644
--- a/dlls/user/resources/user32_Sv.rc
+++ b/dlls/user/resources/user32_Sv.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Karl Backström
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
 
 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
diff --git a/dlls/user/resources/user32_Wa.rc b/dlls/user/resources/user32_Wa.rc
index ae33978c343..1fa2fec9494 100644
--- a/dlls/user/resources/user32_Wa.rc
+++ b/dlls/user/resources/user32_Wa.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1999 Pablo Saratxaga
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_WALON, SUBLANG_DEFAULT
 
 /* 
diff --git a/dlls/user/resources/user32_Zh.rc b/dlls/user/resources/user32_Zh.rc
index cf3771a702e..ee75277bc56 100644
--- a/dlls/user/resources/user32_Zh.rc
+++ b/dlls/user/resources/user32_Zh.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000 Aric Stewart
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
diff --git a/dlls/user/resources/user32_bitmaps.rc b/dlls/user/resources/user32_bitmaps.rc
index 28713257274..78747780f6f 100644
--- a/dlls/user/resources/user32_bitmaps.rc
+++ b/dlls/user/resources/user32_bitmaps.rc
@@ -1,5 +1,21 @@
 /*
  * USER bitmaps
+ *
+ * Copyright 2001 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* BINRES obm_trtype.bmp */
diff --git a/dlls/user/resources/user32_cursors.rc b/dlls/user/resources/user32_cursors.rc
index 75b3a3f6aa9..e563e4dbbd8 100644
--- a/dlls/user/resources/user32_cursors.rc
+++ b/dlls/user/resources/user32_cursors.rc
@@ -1,5 +1,21 @@
 /*
  * USER cursors
+ *
+ * Copyright 2001 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* BINRES ocr_normal.cur */
diff --git a/dlls/user/resources/user32_icons.rc b/dlls/user/resources/user32_icons.rc
index 25fdb73824c..6e0ba13dd19 100644
--- a/dlls/user/resources/user32_icons.rc
+++ b/dlls/user/resources/user32_icons.rc
@@ -1,5 +1,21 @@
 /*
  * USER icons
+ *
+ * Copyright 2001 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* BINRES oic_sample.ico */
diff --git a/dlls/user/resources/version.rc b/dlls/user/resources/version.rc
index f8d682ca36f..c94bdb4c925 100644
--- a/dlls/user/resources/version.rc
+++ b/dlls/user/resources/version.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2001 Dmitry Timoshkov
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #define WINE_FILEVERSION_STR "1.0"
 #define WINE_FILEDESCRIPTION_STR "Wine core dll"
 #define WINE_FILENAME_STR "user32.dll"
diff --git a/dlls/user/resources/version16.rc b/dlls/user/resources/version16.rc
index dab8c9deefc..29d20244ebe 100644
--- a/dlls/user/resources/version16.rc
+++ b/dlls/user/resources/version16.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2001 Dmitry Timoshkov
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #define WINE_FILEVERSION_STR "1.0"
 #define WINE_FILEDESCRIPTION_STR "Wine core dll"
 #define WINE_FILENAME_STR "user.exe"
diff --git a/dlls/user/tests/sysparams.c b/dlls/user/tests/sysparams.c
index 7624926ef3f..bda5bc2badd 100644
--- a/dlls/user/tests/sysparams.c
+++ b/dlls/user/tests/sysparams.c
@@ -1,8 +1,21 @@
 /* Unit test suite for functions SystemParametersInfo and GetSystemMetrics.
-
-   Copyright 2002 Andriy Palamarchuk
-
-*/
+ *
+ * Copyright 2002 Andriy Palamarchuk
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/dlls/user/text.c b/dlls/user/text.c
index 851fcdebb78..6422ae5fa3a 100644
--- a/dlls/user/text.c
+++ b/dlls/user/text.c
@@ -8,6 +8,20 @@
  *   1.  DrawText functions
  *   2.  GrayString functions
  *   3.  TabbedText functions
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -21,9 +35,9 @@
 #include "winerror.h"
 #include "winnls.h"
 #include "user.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(text);
+WINE_DEFAULT_DEBUG_CHANNEL(text);
 
 /*********************************************************************
  *
diff --git a/dlls/user/user_main.c b/dlls/user/user_main.c
index efab93dfaf4..bb1b4754476 100644
--- a/dlls/user/user_main.c
+++ b/dlls/user/user_main.c
@@ -1,5 +1,21 @@
 /*
  * USER initialization code
+ *
+ * Copyright 2000 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -22,9 +38,9 @@
 #include "sysmetrics.h"
 #include "user.h"
 #include "win.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(graphics);
+WINE_DEFAULT_DEBUG_CHANNEL(graphics);
 
 USER_DRIVER USER_Driver;
 
diff --git a/dlls/user/wnd16.c b/dlls/user/wnd16.c
index 766406d0d95..7e2e01e9419 100644
--- a/dlls/user/wnd16.c
+++ b/dlls/user/wnd16.c
@@ -2,6 +2,20 @@
  * 16-bit windowing functions
  *
  * Copyright 2001 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "wine/winuser16.h"
diff --git a/dlls/user/wsprintf.c b/dlls/user/wsprintf.c
index ddf2f1351ba..7c33a0a4e47 100644
--- a/dlls/user/wsprintf.c
+++ b/dlls/user/wsprintf.c
@@ -2,6 +2,20 @@
  * wsprintf functions
  *
  * Copyright 1996 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdarg.h>
@@ -16,9 +30,9 @@
 #include "wine/winuser16.h"
 #include "stackframe.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(string);
+WINE_DEFAULT_DEBUG_CHANNEL(string);
 
 
 #define WPRINTF_LEFTALIGN   0x0001  /* Align output on the left ('-' prefix) */
diff --git a/dlls/version/info.c b/dlls/version/info.c
index 6b3bcbeeb08..125b763909b 100644
--- a/dlls/version/info.c
+++ b/dlls/version/info.c
@@ -4,6 +4,20 @@
  * Copyright 1996,1997 Marcus Meissner
  * Copyright 1997 David Cuthbert
  * Copyright 1999 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -14,9 +28,9 @@
 #include "wine/winuser16.h"
 #include "wine/unicode.h"
 #include "winerror.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ver);
+WINE_DEFAULT_DEBUG_CHANNEL(ver);
 
 
 /******************************************************************************
diff --git a/dlls/version/install.c b/dlls/version/install.c
index 41554da7297..eccf681e36d 100644
--- a/dlls/version/install.c
+++ b/dlls/version/install.c
@@ -3,6 +3,20 @@
  * 
  * Copyright 1996,1997 Marcus Meissner
  * Copyright 1997 David Cuthbert
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -16,9 +30,9 @@
 #include "wine/unicode.h"
 #include "winerror.h"
 #include "lzexpand.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ver);
+WINE_DEFAULT_DEBUG_CHANNEL(ver);
 
 
 /******************************************************************************
diff --git a/dlls/version/resource.c b/dlls/version/resource.c
index 126ad29bef4..7b4c3ab905d 100644
--- a/dlls/version/resource.c
+++ b/dlls/version/resource.c
@@ -4,6 +4,20 @@
  * Copyright 1996,1997 Marcus Meissner
  * Copyright 1997 David Cuthbert
  * Copyright 1999 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -21,9 +35,9 @@
 #include "wine/winuser16.h"
 #include "winver.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ver);
+WINE_DEFAULT_DEBUG_CHANNEL(ver);
 
 
 /**********************************************************************
diff --git a/dlls/version/ver16.c b/dlls/version/ver16.c
index 685c9f750a4..f06447d48fc 100644
--- a/dlls/version/ver16.c
+++ b/dlls/version/ver16.c
@@ -2,14 +2,28 @@
  * Implementation of VER.DLL
  *
  * Copyright 1999 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "winbase.h"
 #include "wine/winbase16.h"
 #include "winver.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ver);
+WINE_DEFAULT_DEBUG_CHANNEL(ver);
 
 
 /*************************************************************************
diff --git a/dlls/win32s/w32skernel.c b/dlls/win32s/w32skernel.c
index 0bca7ac7471..5b203eb6a22 100644
--- a/dlls/win32s/w32skernel.c
+++ b/dlls/win32s/w32skernel.c
@@ -3,6 +3,20 @@
  * DLL for Win32s
  *
  * Copyright (c) 1997 Andreas Mohr
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
diff --git a/dlls/win32s/w32sys.c b/dlls/win32s/w32sys.c
index 1065b5e98a3..a57de9c8b0e 100644
--- a/dlls/win32s/w32sys.c
+++ b/dlls/win32s/w32sys.c
@@ -3,6 +3,20 @@
  * helper DLL for Win32s
  *
  * Copyright (c) 1996 Anand Kumria
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <unistd.h>
@@ -10,9 +24,9 @@
 #include "windef.h"
 #include "wine/windef16.h"
 #include "wine/winbase16.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(dll);
+WINE_DEFAULT_DEBUG_CHANNEL(dll);
 
 typedef struct
 {
diff --git a/dlls/win32s/win32s16.c b/dlls/win32s/win32s16.c
index 0b351c1e7d7..e8f78fe1579 100644
--- a/dlls/win32s/win32s16.c
+++ b/dlls/win32s/win32s16.c
@@ -3,15 +3,29 @@
  * DLL for Win32s
  *
  * Copyright (c) 1997 Andreas Mohr
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
 #include <stdlib.h>
 #include "windef.h"
 #include "wine/winbase16.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(dll);
+WINE_DEFAULT_DEBUG_CHANNEL(dll);
 
 /***********************************************************************
  *		BootTask (WIN32S16.2)
diff --git a/dlls/winaspi/aspi.c b/dlls/winaspi/aspi.c
index 6de965daabe..372c8e88aaa 100644
--- a/dlls/winaspi/aspi.c
+++ b/dlls/winaspi/aspi.c
@@ -1,8 +1,21 @@
 /**************************************************************************
-ASPI routines
-(C) 2000 David Elliott <dfe@infinite-internet.net>
-Licensed under the WINE (X11) license
-*/
+ * ASPI routines
+ * Copyright (C) 2000 David Elliott <dfe@infinite-internet.net>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 /* These routines are to be called from either WNASPI32 or WINASPI */
 
@@ -32,12 +45,12 @@ HKEY_DYN_DATA
 #include <errno.h>
 #include <string.h>
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winreg.h"
 #include "winerror.h"
 #include "winescsi.h"
 
-DEFAULT_DEBUG_CHANNEL(aspi);
+WINE_DEFAULT_DEBUG_CHANNEL(aspi);
 
 /* Internal function prototypes */
 static void
diff --git a/dlls/winaspi/aspi.h b/dlls/winaspi/aspi.h
index b9efd4d43fe..4761b39b479 100644
--- a/dlls/winaspi/aspi.h
+++ b/dlls/winaspi/aspi.h
@@ -1,4 +1,21 @@
-/* ASPI definitions used for both WINASPI and WNASPI32 */
+/* ASPI definitions used for both WINASPI and WNASPI32
+ *
+ * Copyright (C) 2000 David Elliott
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef __WINE_ASPI_H
 #define __WINE_ASPI_H
diff --git a/dlls/winaspi/winaspi16.c b/dlls/winaspi/winaspi16.c
index 189a3a65133..d4733d9b535 100644
--- a/dlls/winaspi/winaspi16.c
+++ b/dlls/winaspi/winaspi16.c
@@ -1,3 +1,22 @@
+/*
+ * Copyright 1997 Bruce Milner
+ * Copyright 1998 Andreas Mohr
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include "config.h"
 
 #include <stdlib.h>
@@ -15,10 +34,10 @@
 #include "aspi.h"
 #include "winescsi.h"
 #include "wine/winaspi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "miscemu.h"
 
-DEFAULT_DEBUG_CHANNEL(aspi);
+WINE_DEFAULT_DEBUG_CHANNEL(aspi);
 
 
 /* FIXME!
diff --git a/dlls/winaspi/winaspi32.c b/dlls/winaspi/winaspi32.c
index 5b8c203e5e9..7d3a33de7e8 100644
--- a/dlls/winaspi/winaspi32.c
+++ b/dlls/winaspi/winaspi32.c
@@ -1,3 +1,22 @@
+/*
+ * Copyright 1997 Bruce Milner
+ * Copyright 1998 Andreas Mohr
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include "config.h"
 
 #include <assert.h>
@@ -13,9 +32,9 @@
 #include "aspi.h"
 #include "wnaspi32.h"
 #include "winescsi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(aspi);
+WINE_DEFAULT_DEBUG_CHANNEL(aspi);
 
 /* FIXME!
  * 1) Residual byte length reporting not handled
diff --git a/dlls/winaspi/winescsi.h b/dlls/winaspi/winescsi.h
index 5f171d7d603..6d7efbbd77e 100644
--- a/dlls/winaspi/winescsi.h
+++ b/dlls/winaspi/winescsi.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2000 David Elliott <dfe@infinite-internet.net>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINESCSI_H__
 #define __WINESCSI_H__
 
diff --git a/dlls/winedos/devices.c b/dlls/winedos/devices.c
index ae873836d49..e6e4200d656 100644
--- a/dlls/winedos/devices.c
+++ b/dlls/winedos/devices.c
@@ -2,6 +2,20 @@
  * DOS devices
  *
  * Copyright 1999 Ove Kåven
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -10,7 +24,7 @@
 #include "msdos.h"
 #include "miscemu.h"
 #include "dosexe.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "pshpack1.h"
 
diff --git a/dlls/winedos/dosaspi.c b/dlls/winedos/dosaspi.c
index 0a11d9ac7d1..20a48396e1c 100644
--- a/dlls/winedos/dosaspi.c
+++ b/dlls/winedos/dosaspi.c
@@ -1,14 +1,32 @@
+/*
+ * Copyright 2000 David Elliott
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include "config.h"
 
 #include <string.h>
 #include "winbase.h"
 #include "wine/windef16.h"
 #include "wine/winaspi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "miscemu.h" /* DOSMEM_* */
 #include "winerror.h"
 
-DEFAULT_DEBUG_CHANNEL(aspi);
+WINE_DEFAULT_DEBUG_CHANNEL(aspi);
 
 static HINSTANCE hWNASPI32 = INVALID_HANDLE_VALUE;
 static DWORD (__cdecl *pSendASPI32Command) (LPSRB) = NULL;
diff --git a/dlls/winedos/dosexe.h b/dlls/winedos/dosexe.h
index 1853534cc9a..0ed77c26631 100644
--- a/dlls/winedos/dosexe.h
+++ b/dlls/winedos/dosexe.h
@@ -2,6 +2,20 @@
  * DOS EXE loader
  *
  * Copyright 1998 Ove Kåven
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_DOSEXE_H
diff --git a/dlls/winedos/dosvm.c b/dlls/winedos/dosvm.c
index b4636e6123b..8c3ee62e28d 100644
--- a/dlls/winedos/dosvm.c
+++ b/dlls/winedos/dosvm.c
@@ -3,7 +3,21 @@
  *
  * Copyright 1998 Ove Kåven
  *
- * This code hasn't been completely cleaned up yet.
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Note: This code hasn't been completely cleaned up yet.
  */
 
 #include "config.h"
@@ -33,12 +47,12 @@
 #include "dosexe.h"
 #include "dosvm.h"
 #include "stackframe.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "msvcrt/excpt.h"
 
-DEFAULT_DEBUG_CHANNEL(int);
-DECLARE_DEBUG_CHANNEL(module);
-DECLARE_DEBUG_CHANNEL(relay);
+WINE_DEFAULT_DEBUG_CHANNEL(int);
+WINE_DECLARE_DEBUG_CHANNEL(module);
+WINE_DECLARE_DEBUG_CHANNEL(relay);
 
 WORD DOSVM_psp = 0;
 WORD DOSVM_retval = 0;
diff --git a/dlls/winedos/dosvm.h b/dlls/winedos/dosvm.h
index 10c64fe658f..524670cfc40 100644
--- a/dlls/winedos/dosvm.h
+++ b/dlls/winedos/dosvm.h
@@ -2,6 +2,20 @@
  * DOS virtual machine
  *
  * Copyright 2000 Ove Kåven
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_DOSVM_H
diff --git a/dlls/winedos/int09.c b/dlls/winedos/int09.c
index 96f65e4faf2..8f5e8ac7a40 100644
--- a/dlls/winedos/int09.c
+++ b/dlls/winedos/int09.c
@@ -1,5 +1,21 @@
 /*
  * DOS interrupt 09h handler (IRQ1 - KEYBOARD)
+ *
+ * Copyright 1999 Ove Kåven
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -10,10 +26,10 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "miscemu.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "dosexe.h"
 
-DEFAULT_DEBUG_CHANNEL(int);
+WINE_DEFAULT_DEBUG_CHANNEL(int);
 
 #define QUEUELEN 31
 
diff --git a/dlls/winedos/int10.c b/dlls/winedos/int10.c
index 390b6d975bc..a7338111ab5 100644
--- a/dlls/winedos/int10.c
+++ b/dlls/winedos/int10.c
@@ -1,5 +1,22 @@
 /*
  * BIOS interrupt 10h handler
+ *
+ * Copyright 1998 Ove Kåven
+ * Copyright 1998 Joseph Pranevich
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -8,10 +25,10 @@
 
 #include "miscemu.h"
 #include "vga.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "console.h"
 
-DEFAULT_DEBUG_CHANNEL(int);
+WINE_DEFAULT_DEBUG_CHANNEL(int);
 
 static void conv_text_mode_attributes(char attribute, int *fg, int *bg,
        int *wattribute);
diff --git a/dlls/winedos/int16.c b/dlls/winedos/int16.c
index c25e1e11259..f4538bfb53a 100644
--- a/dlls/winedos/int16.c
+++ b/dlls/winedos/int16.c
@@ -1,5 +1,22 @@
 /*
  * DOS interrupt 16h handler
+ *
+ * Copyright 1998 Joseph Pranevich
+ * Copyright 1999 Ove Kåven
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -11,13 +28,13 @@
 #include "module.h"
 #include "dosexe.h"
 #include "wincon.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "windef.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "miscemu.h"
 
-DEFAULT_DEBUG_CHANNEL(int);
+WINE_DEFAULT_DEBUG_CHANNEL(int);
 
 /**********************************************************************
  *	    DOSVM_Int16Handler
diff --git a/dlls/winedos/int17.c b/dlls/winedos/int17.c
index 5324e53a614..5805fd6676b 100644
--- a/dlls/winedos/int17.c
+++ b/dlls/winedos/int17.c
@@ -1,15 +1,31 @@
 /*
  * BIOS interrupt 17h handler
+ *
+ * Copyright 1998 Carl van Schaik
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
 
 #include "miscemu.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "msdos.h"
 #include "winnt.h"
 
-DEFAULT_DEBUG_CHANNEL(int);
+WINE_DEFAULT_DEBUG_CHANNEL(int);
 
 /**********************************************************************
  *          DOSVM_Int17Handler
diff --git a/dlls/winedos/int19.c b/dlls/winedos/int19.c
index d92daab9a61..3262f6cb9e8 100644
--- a/dlls/winedos/int19.c
+++ b/dlls/winedos/int19.c
@@ -1,12 +1,28 @@
 /*
  * BIOS interrupt 19h handler
+ *
+ * Copyright 1998 Carl van Schaik
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
 #include "miscemu.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(int);
+WINE_DEFAULT_DEBUG_CHANNEL(int);
 
 
 /**********************************************************************
diff --git a/dlls/winedos/int20.c b/dlls/winedos/int20.c
index bb6cef3f0e8..349529ca02d 100644
--- a/dlls/winedos/int20.c
+++ b/dlls/winedos/int20.c
@@ -1,5 +1,21 @@
 /*
  * DOS interrupt 20h handler (TERMINATE PROGRAM)
+ *
+ * Copyright 1997 Andreas Mohr
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
diff --git a/dlls/winedos/int21.c b/dlls/winedos/int21.c
index b044af32b6b..fa9155b82d8 100644
--- a/dlls/winedos/int21.c
+++ b/dlls/winedos/int21.c
@@ -1,5 +1,25 @@
 /*
  * DOS interrupt 21h handler
+ *
+ * Copyright 1993, 1994 Erik Bos
+ * Copyright 1996 Alexandre Julliard
+ * Copyright 1997 Andreas Mohr
+ * Copyright 1998 Uwe Bonnes
+ * Copyright 1998, 1999 Ove Kaaven
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -13,9 +33,9 @@
 #include "msdos.h"
 #include "console.h"
 #include "file.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(int21);
+WINE_DEFAULT_DEBUG_CHANNEL(int21);
 
 void WINAPI DOSVM_Int21Handler_Ioctl( CONTEXT86 *context )
 {
diff --git a/dlls/winedos/int29.c b/dlls/winedos/int29.c
index 65d20a2da37..522e4cf3b64 100644
--- a/dlls/winedos/int29.c
+++ b/dlls/winedos/int29.c
@@ -1,5 +1,21 @@
 /*
  * DOS interrupt 29h handler
+ *
+ * Copyright 1998 Joseph Pranevich
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/dlls/winedos/int31.c b/dlls/winedos/int31.c
index da677a9118c..c4e1d49e83a 100644
--- a/dlls/winedos/int31.c
+++ b/dlls/winedos/int31.c
@@ -2,6 +2,20 @@
  * DPMI 0.9 emulation
  *
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -13,9 +27,9 @@
 #include "msdos.h"
 #include "dosexe.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(int31);
+WINE_DEFAULT_DEBUG_CHANNEL(int31);
 
 /* Structure for real-mode callbacks */
 typedef struct
diff --git a/dlls/winedos/int33.c b/dlls/winedos/int33.c
index 00bd9455d5f..3c95052f769 100644
--- a/dlls/winedos/int33.c
+++ b/dlls/winedos/int33.c
@@ -1,5 +1,21 @@
 /*
  * DOS interrupt 33h handler
+ *
+ * Copyright 1999 Ove Kåven
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -12,9 +28,9 @@
 #include "miscemu.h"
 #include "dosexe.h"
 #include "vga.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(int);
+WINE_DEFAULT_DEBUG_CHANNEL(int);
 
 static struct
 {
diff --git a/dlls/winedos/int67.c b/dlls/winedos/int67.c
index 11abe9ddaa7..0f80d61fc11 100644
--- a/dlls/winedos/int67.c
+++ b/dlls/winedos/int67.c
@@ -1,14 +1,30 @@
 /*
  * Int67 (EMS) emulation
+ *
+ * Copyright 2002 Jukka Heinonen
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
 #include "wine/winbase16.h"
 #include "dosexe.h"
 #include "miscemu.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(int);
+WINE_DEFAULT_DEBUG_CHANNEL(int);
 
 /*
  * EMS page size == 16 kilobytes.
diff --git a/dlls/winedos/ioports.c b/dlls/winedos/ioports.c
index b63e1addd8e..e8e4bc1fda1 100644
--- a/dlls/winedos/ioports.c
+++ b/dlls/winedos/ioports.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1995 Morten Welinder
  * Copyright 1998 Andreas Mohr, Ove Kaaven
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/dlls/winedos/module.c b/dlls/winedos/module.c
index f0b4d9bb6a8..7c004de8aa8 100644
--- a/dlls/winedos/module.c
+++ b/dlls/winedos/module.c
@@ -3,7 +3,21 @@
  *
  * Copyright 1998 Ove Kåven
  *
- * This code hasn't been completely cleaned up yet.
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Note: This code hasn't been completely cleaned up yet.
  */
 
 #include "config.h"
@@ -27,13 +41,13 @@
 #include "task.h"
 #include "file.h"
 #include "miscemu.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "dosexe.h"
 #include "dosvm.h"
 #include "options.h"
 #include "vga.h"
 
-DEFAULT_DEBUG_CHANNEL(module);
+WINE_DEFAULT_DEBUG_CHANNEL(module);
 
 #ifdef MZ_SUPPORTED
 
diff --git a/dlls/winedos/vga.c b/dlls/winedos/vga.c
index dcadac724bb..61d5ef42b80 100644
--- a/dlls/winedos/vga.c
+++ b/dlls/winedos/vga.c
@@ -3,6 +3,19 @@
  * 
  * Copyright 1998 Ove Kåven (with some help from Marcus Meissner)
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -15,9 +28,9 @@
 #include "vga.h"
 #include "ddraw.h"
 #include "services.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 static IDirectDraw *lpddraw = NULL;
 static IDirectDrawSurface *lpddsurf;
diff --git a/dlls/winedos/vga.h b/dlls/winedos/vga.h
index 57800d2df60..3da55ac16d0 100644
--- a/dlls/winedos/vga.h
+++ b/dlls/winedos/vga.h
@@ -3,6 +3,19 @@
  * 
  * Copyright 1998 Ove KÅven
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_VGA_H
diff --git a/dlls/winedos/xms.c b/dlls/winedos/xms.c
index eaf727c2a90..36876dcd553 100644
--- a/dlls/winedos/xms.c
+++ b/dlls/winedos/xms.c
@@ -3,7 +3,21 @@
  *
  * Copyright 1998 Ove Kåven
  *
- * This XMS emulation is hooked through the DPMI interrupt.
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Note: This XMS emulation is hooked through the DPMI interrupt.
  */
 
 #include <unistd.h>
@@ -13,9 +27,9 @@
 #include "module.h"
 #include "miscemu.h"
 #include "toolhelp.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(int31);
+WINE_DEFAULT_DEBUG_CHANNEL(int31);
 
 typedef struct {
  WORD Handle;
diff --git a/dlls/wineps/afm.c b/dlls/wineps/afm.c
index 7f7a417ab72..39c8daca5f3 100644
--- a/dlls/wineps/afm.c
+++ b/dlls/wineps/afm.c
@@ -5,7 +5,20 @@
  *
  *	Copyright 1998  Huw D M Davies
  *  	Copyright 2001  Ian Pilcher
- * 
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -13,9 +26,9 @@
 #include <string.h>
 
 #include "psdrv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(psdrv);
+WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
 
 /* ptr to fonts for which we have afm files */
 FONTFAMILY *PSDRV_AFMFontList = NULL;
diff --git a/dlls/wineps/afm2c.c b/dlls/wineps/afm2c.c
index 40c62fb0ad9..aa9494a8efa 100644
--- a/dlls/wineps/afm2c.c
+++ b/dlls/wineps/afm2c.c
@@ -4,6 +4,21 @@
  *
  *  Copyright 2001 Ian Pilcher
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * NOTES:
  *
  *  PSDRV_AFM2C(AFM *afm) writes the AFM data structure addressed by afm (and
  *  its subsidiary objects) as a C file which can which can then be built in to
@@ -33,10 +48,10 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "psdrv.h"
 
-DEFAULT_DEBUG_CHANNEL(psdrv);
+WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
 
 inline static void cursorto(FILE *of, int np, int cp)
 {
diff --git a/dlls/wineps/bitblt.c b/dlls/wineps/bitblt.c
index 83f9d98b2e7..c800a871443 100644
--- a/dlls/wineps/bitblt.c
+++ b/dlls/wineps/bitblt.c
@@ -3,14 +3,27 @@
  *
  * Copyright 1999  Huw D M Davies
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "gdi.h"
 #include "psdrv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winbase.h"
 
-DEFAULT_DEBUG_CHANNEL(psdrv);
+WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
 
 
 /***********************************************************************
diff --git a/dlls/wineps/bitmap.c b/dlls/wineps/bitmap.c
index 23c806f96bd..cf11e0c2cec 100644
--- a/dlls/wineps/bitmap.c
+++ b/dlls/wineps/bitmap.c
@@ -3,14 +3,27 @@
  *
  * Copyright 1998  Huw D M Davies
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "psdrv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "bitmap.h"
 #include "winbase.h"
 
-DEFAULT_DEBUG_CHANNEL(psdrv);
+WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
 
 
 /***************************************************************************
diff --git a/dlls/wineps/brush.c b/dlls/wineps/brush.c
index 0b621fc3fa9..aa5cc33078c 100644
--- a/dlls/wineps/brush.c
+++ b/dlls/wineps/brush.c
@@ -3,13 +3,26 @@
  *
  * Copyright 1998  Huw D M Davies
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "psdrv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winbase.h"
 
-DEFAULT_DEBUG_CHANNEL(psdrv);
+WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
 
 /***********************************************************************
  *           PSDRV_BRUSH_SelectObject
diff --git a/dlls/wineps/clipping.c b/dlls/wineps/clipping.c
index 4ab3e5711f2..5aae92a1290 100644
--- a/dlls/wineps/clipping.c
+++ b/dlls/wineps/clipping.c
@@ -3,14 +3,27 @@
  *
  *	Copyright 1999  Luc Tourangau 
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "gdi.h"
 #include "psdrv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winbase.h"
 
-DEFAULT_DEBUG_CHANNEL(psdrv);
+WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
 
 /***********************************************************************
  *           PSDRV_SetDeviceClipping
diff --git a/dlls/wineps/color.c b/dlls/wineps/color.c
index 4197cddd007..a75e53651c8 100644
--- a/dlls/wineps/color.c
+++ b/dlls/wineps/color.c
@@ -3,12 +3,25 @@
  *
  *	Copyright 1998  Huw D M Davies
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "psdrv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(psdrv);
+WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
 
 /**********************************************************************
  *	     PSDRV_CmpColor
diff --git a/dlls/wineps/driver.c b/dlls/wineps/driver.c
index 2fdef4ca6ee..f3339b33290 100644
--- a/dlls/wineps/driver.c
+++ b/dlls/wineps/driver.c
@@ -7,17 +7,30 @@
  *
  * Copyright 1998  Huw D M Davies
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
 #include "psdrv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winuser.h"
 #include "winspool.h"
 #include "prsht.h"
 #include "psdlg.h"
 
-DEFAULT_DEBUG_CHANNEL(psdrv);
+WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
 
 
 /************************************************************************
diff --git a/dlls/wineps/escape.c b/dlls/wineps/escape.c
index cec303be45d..54e139a8a40 100644
--- a/dlls/wineps/escape.c
+++ b/dlls/wineps/escape.c
@@ -2,15 +2,29 @@
  *	PostScript driver Escape function
  *
  *	Copyright 1998  Huw D M Davies
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "windef.h"
 #include "wingdi.h"
 #include "wine/winuser16.h"
 #include "psdrv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winspool.h"
 
-DEFAULT_DEBUG_CHANNEL(psdrv);
+WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
 
 
 /**********************************************************************
diff --git a/dlls/wineps/font.c b/dlls/wineps/font.c
index 660b6405bfc..0ecc99d396d 100644
--- a/dlls/wineps/font.c
+++ b/dlls/wineps/font.c
@@ -3,15 +3,28 @@
  *
  *	Copyright 1998  Huw D M Davies
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <string.h>
 #include <stdlib.h> 	    /* for bsearch() */
 #include "winspool.h"
 #include "psdrv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winerror.h"
 
-DEFAULT_DEBUG_CHANNEL(psdrv);
+WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
 
 /***********************************************************************
  *           is_stock_font
diff --git a/dlls/wineps/glyphlist.c b/dlls/wineps/glyphlist.c
index b8349b3b53f..2d1fbfaf6f8 100644
--- a/dlls/wineps/glyphlist.c
+++ b/dlls/wineps/glyphlist.c
@@ -6,13 +6,28 @@
  *	each GLYPHNAME structure is initialized, so future sorts/searches can
  *	be done without comparing strings.
  *
+ * Copyright 2001 Ian Pilcher
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
 #include "psdrv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(psdrv);
+WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
 
 #define	GLYPHLIST_ALLOCSIZE	1024
 
diff --git a/dlls/wineps/graphics.c b/dlls/wineps/graphics.c
index 289a1cc03ea..0b3509fbc99 100644
--- a/dlls/wineps/graphics.c
+++ b/dlls/wineps/graphics.c
@@ -3,6 +3,19 @@
  *
  *	Copyright 1998  Huw D M Davies
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -16,10 +29,10 @@
  #define PI M_PI
 #endif
 #include "psdrv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winspool.h"
 
-DEFAULT_DEBUG_CHANNEL(psdrv);
+WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
 
 
 /***********************************************************************
diff --git a/dlls/wineps/init.c b/dlls/wineps/init.c
index d7d6fd9b205..2c159327433 100644
--- a/dlls/wineps/init.c
+++ b/dlls/wineps/init.c
@@ -4,6 +4,19 @@
  *	Copyright 1998 Huw D M Davies
  *	Copyright 2001 Marcus Meissner
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -13,7 +26,7 @@
 
 #include "gdi.h"
 #include "psdrv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winreg.h"
 #include "winspool.h"
 #include "winerror.h"
@@ -22,7 +35,7 @@
 # include <cups/cups.h>
 #endif
 
-DEFAULT_DEBUG_CHANNEL(psdrv);
+WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
 
 static PSDRV_DEVMODEA DefaultDevmode = 
 {
diff --git a/dlls/wineps/mkagl.c b/dlls/wineps/mkagl.c
index cdea782b673..a6328f7fb42 100644
--- a/dlls/wineps/mkagl.c
+++ b/dlls/wineps/mkagl.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2001 Ian Pilcher
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <sys/types.h>
 #include <dirent.h>
 #include <string.h>
diff --git a/dlls/wineps/objects.c b/dlls/wineps/objects.c
index 58202fbc9b8..48d3835860f 100644
--- a/dlls/wineps/objects.c
+++ b/dlls/wineps/objects.c
@@ -3,12 +3,25 @@
  *
  *	Copyright 1998  Huw D M Davies
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "psdrv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(psdrv);
+WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
 
 /***********************************************************************
  *           PSDRV_BITMAP_SelectObject
diff --git a/dlls/wineps/pen.c b/dlls/wineps/pen.c
index f2d13e23db2..1f9c3a214af 100644
--- a/dlls/wineps/pen.c
+++ b/dlls/wineps/pen.c
@@ -3,12 +3,25 @@
  *
  *	Copyright 1998  Huw D M Davies
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "psdrv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(psdrv);
+WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
 
 static char PEN_dash[]       = "50 30";     /* -----   -----   -----  */
 static char PEN_dot[]        = "20";      /* --  --  --  --  --  -- */
diff --git a/dlls/wineps/ppd.c b/dlls/wineps/ppd.c
index bf747023c32..7b017acd352 100644
--- a/dlls/wineps/ppd.c
+++ b/dlls/wineps/ppd.c
@@ -3,17 +3,31 @@
  *	See  http://www.adobe.com/supportservice/devrelations/PDFS/TN/5003.PPD_Spec_v4.3.pdf
  *
  *	Copyright 1998  Huw D M Davies
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
 #include <stdio.h>
 #include <ctype.h>
 #include "winnt.h" /* HEAP_ZERO_MEMORY */
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "psdrv.h"
 #include "winspool.h"
 
-DEFAULT_DEBUG_CHANNEL(psdrv);
+WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
 
 typedef struct {
 char	*key;
diff --git a/dlls/wineps/ps.c b/dlls/wineps/ps.c
index 9286a3421d6..6f8d67c64bf 100644
--- a/dlls/wineps/ps.c
+++ b/dlls/wineps/ps.c
@@ -3,6 +3,19 @@
  *
  *	Copyright 1998  Huw D M Davies
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <ctype.h>
@@ -10,9 +23,9 @@
 #include <string.h>
 #include "psdrv.h"
 #include "winspool.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(psdrv);
+WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
 
 static char psheader[] = /* title llx lly urx ury orientation */
 "%%!PS-Adobe-3.0\n"
diff --git a/dlls/wineps/psdlg.h b/dlls/wineps/psdlg.h
index bf59e027dea..6e58563a1b7 100644
--- a/dlls/wineps/psdlg.h
+++ b/dlls/wineps/psdlg.h
@@ -2,6 +2,20 @@
  * Wine PostScript Driver Dialog IDs
  *
  * Copyright 1999  Huw D M Davies
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_PSDLG_H
diff --git a/dlls/wineps/psdrv.h b/dlls/wineps/psdrv.h
index ff50cc4d7ca..0e1009ecd3c 100644
--- a/dlls/wineps/psdrv.h
+++ b/dlls/wineps/psdrv.h
@@ -1,11 +1,26 @@
-#ifndef __WINE_PSDRV_H
-#define __WINE_PSDRV_H
-
 /*
  *	PostScript driver definitions
  *
  *	Copyright 1998  Huw D M Davies
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
+#ifndef __WINE_PSDRV_H
+#define __WINE_PSDRV_H
+
 #include "windef.h"
 #include "wingdi.h"
 #include "gdi.h"
diff --git a/dlls/wineps/rsrc.rc b/dlls/wineps/rsrc.rc
index 210b87bb5c7..b5deae21c03 100644
--- a/dlls/wineps/rsrc.rc
+++ b/dlls/wineps/rsrc.rc
@@ -1,6 +1,21 @@
 /*
  * Top level resource file for wineps
  *
+ * Copyright 2000 Huw D M Davies
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
diff --git a/dlls/wineps/text.c b/dlls/wineps/text.c
index f92b1f69c46..56c8fa63f87 100644
--- a/dlls/wineps/text.c
+++ b/dlls/wineps/text.c
@@ -3,13 +3,26 @@
  *
  *	Copyright 1998  Huw D M Davies
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <string.h>
 #include "psdrv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winspool.h"
 
-DEFAULT_DEBUG_CHANNEL(psdrv);
+WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
 
 static BOOL PSDRV_Text(DC *dc, INT x, INT y, LPCWSTR str, UINT count,
 		       BOOL bDrawBackground, const INT *lpDx);
diff --git a/dlls/wineps/truetype.c b/dlls/wineps/truetype.c
index c7dbed78bde..1605b62660a 100644
--- a/dlls/wineps/truetype.c
+++ b/dlls/wineps/truetype.c
@@ -4,6 +4,19 @@
  *
  *  Copyright 2001  Ian Pilcher
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  *  NOTE:  Many of the functions in this file can return either fatal errors
  *  	(memory allocation failure or unexpected FreeType error) or non-fatal
@@ -51,9 +64,9 @@
 #include "winerror.h"
 #include "winreg.h"
 #include "psdrv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(psdrv);
+WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
 
 #define REQUIRED_FACE_FLAGS 	(   FT_FACE_FLAG_SCALABLE   |	\
     	    	    	    	    FT_FACE_FLAG_HORIZONTAL |	\
diff --git a/dlls/wineps/type1afm.c b/dlls/wineps/type1afm.c
index ac2d4a171da..0b06f57d746 100644
--- a/dlls/wineps/type1afm.c
+++ b/dlls/wineps/type1afm.c
@@ -4,6 +4,19 @@
  *
  *  Copyright 2001  Ian Pilcher
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  *  NOTE:  Many of the functions in this file can return either fatal errors
  *  	(memory allocation failure) or non-fatal errors (unusable AFM file).
@@ -30,9 +43,9 @@
 #include "winerror.h"
 #include "winreg.h"
 #include "psdrv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(psdrv);
+WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
 
 /*******************************************************************************
  *  ReadLine
diff --git a/dlls/wineps/wps_De.rc b/dlls/wineps/wps_De.rc
index 1a06e422d53..0aa957b885a 100644
--- a/dlls/wineps/wps_De.rc
+++ b/dlls/wineps/wps_De.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2001 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
 
 PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215
diff --git a/dlls/wineps/wps_En.rc b/dlls/wineps/wps_En.rc
index 6044125ff6d..66824e874cc 100644
--- a/dlls/wineps/wps_En.rc
+++ b/dlls/wineps/wps_En.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000 Huw D M Davies
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215
diff --git a/dlls/wineps/wps_Ru.rc b/dlls/wineps/wps_Ru.rc
index 1302ec84e72..6b80a0a40c8 100644
--- a/dlls/wineps/wps_Ru.rc
+++ b/dlls/wineps/wps_Ru.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000 Dmitry Timoshkov
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 /* Russian strings in cp1251 */
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
diff --git a/dlls/wineps/wps_Sk.rc b/dlls/wineps/wps_Sk.rc
index eee21d66325..fab29421b4d 100644
--- a/dlls/wineps/wps_Sk.rc
+++ b/dlls/wineps/wps_Sk.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000 Peter Ivanyi
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 
 PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215
diff --git a/dlls/wineps/wps_xx.rc b/dlls/wineps/wps_xx.rc
index e00ed6091ca..a99bf03ed53 100644
--- a/dlls/wineps/wps_xx.rc
+++ b/dlls/wineps/wps_xx.rc
@@ -1,4 +1,20 @@
 /*
  * Language neutral resources for wineps
+ *
+ * Copyright 2000 Huw D M Davies
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c
index 6f51ba2f7ba..099f99a9352 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -7,6 +7,20 @@
  * Noureddine Jemmali
  *
  * Copyright 2000 Andreas Mohr
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -28,10 +42,10 @@
 #include "wininet.h"
 #include "winerror.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "internet.h"
 
-DEFAULT_DEBUG_CHANNEL(wininet);
+WINE_DEFAULT_DEBUG_CHANNEL(wininet);
 
 #define NOACCOUNT 		"noaccount"
 #define DATA_PACKET_SIZE 	0x2000
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 9292aa46f23..c8bcecb2c01 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -5,6 +5,19 @@
  *
  * Ulrich Czekalla
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -29,9 +42,9 @@
 #include "shlwapi.h"
 
 #include "internet.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(wininet);
+WINE_DEFAULT_DEBUG_CHANNEL(wininet);
 
 #define HTTPHEADER " HTTP/1.0"
 #define HTTPHOSTHEADER "\r\nHost: "
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index a89d68721cc..1d4ffb2148a 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -5,6 +5,19 @@
  *
  * Ulrich Czekalla
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -23,14 +36,14 @@
 #include "winbase.h"
 #include "winreg.h"
 #include "wininet.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winerror.h"
 #define NO_SHLWAPI_STREAM
 #include "shlwapi.h"
 
 #include "internet.h"
 
-DEFAULT_DEBUG_CHANNEL(wininet);
+WINE_DEFAULT_DEBUG_CHANNEL(wininet);
 
 #define MAX_IDLE_WORKER 1000*60*1
 #define MAX_WORKER_THREADS 10
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index 2c3cf548af3..d45d8bb18f2 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -1,3 +1,25 @@
+/*
+ * Wininet
+ *
+ * Copyright 1999 Corel Corporation
+ *
+ * Ulrich Czekalla
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef _WINE_INTERNET_H_
 #define _WINE_INTERNET_H_
 
diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c
index 4dfddb9054c..c7f5fce56cd 100644
--- a/dlls/wininet/urlcache.c
+++ b/dlls/wininet/urlcache.c
@@ -5,6 +5,19 @@
  *
  * Eric Kohl
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "config.h"
 
@@ -17,10 +30,10 @@
 #include "wininet.h"
 #include "winerror.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "internet.h"
 
-DEFAULT_DEBUG_CHANNEL(wininet);
+WINE_DEFAULT_DEBUG_CHANNEL(wininet);
 
 
 INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryA(LPCSTR lpszUrlSearchPattern,
diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c
index 53601fe3230..03081048329 100644
--- a/dlls/wininet/utility.c
+++ b/dlls/wininet/utility.c
@@ -5,6 +5,19 @@
  *
  * Ulrich Czekalla
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -18,10 +31,10 @@
 #include "wininet.h"
 #include "winerror.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "internet.h"
 
-DEFAULT_DEBUG_CHANNEL(wininet);
+WINE_DEFAULT_DEBUG_CHANNEL(wininet);
 
 #define TIME_STRING_LEN  30
 
diff --git a/dlls/wininet/wininet_main.c b/dlls/wininet/wininet_main.c
index 85deb327d1b..2873a633f49 100644
--- a/dlls/wininet/wininet_main.c
+++ b/dlls/wininet/wininet_main.c
@@ -3,14 +3,27 @@
  *
  * Copyright (c) 2000 Patrik Stridvall
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
 #include "winerror.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(wininet);
+WINE_DEFAULT_DEBUG_CHANNEL(wininet);
 
 /***********************************************************************
  *		DllInstall (WININET.@)
diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c
index 02aa57d2564..8ad4a85f374 100644
--- a/dlls/winmm/driver.c
+++ b/dlls/winmm/driver.c
@@ -6,6 +6,20 @@
  * Copyright 1994 Martin Ayotte
  * Copyright 1998 Marcus Meissner
  * Copyright 1999 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -14,9 +28,9 @@
 #include "mmddk.h"
 #include "winemm.h"
 #include "wine/winbase16.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(driver);
+WINE_DEFAULT_DEBUG_CHANNEL(driver);
 
 static LPWINE_DRIVER	lpDrvItemList = NULL;
 
diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c
index 0e9b8a97ca0..b6aaea61068 100644
--- a/dlls/winmm/joystick.c
+++ b/dlls/winmm/joystick.c
@@ -5,6 +5,20 @@
  * Copyright 1997 Andreas Mohr
  *	     2000 Wolfgang Schwotzer
  *                Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -25,9 +39,9 @@
 #include "wine/mmsystem16.h"
 #include "winemm.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(mmsys);
+WINE_DEFAULT_DEBUG_CHANNEL(mmsys);
 
 #define MAXJOYSTICK	(JOYSTICKID2 + 1)
 #define JOY_PERIOD_MIN	(10)	/* min Capture time period */
diff --git a/dlls/winmm/joystick/joystick.c b/dlls/winmm/joystick/joystick.c
index df0d440ab6d..94c80675b66 100644
--- a/dlls/winmm/joystick/joystick.c
+++ b/dlls/winmm/joystick/joystick.c
@@ -4,6 +4,22 @@
  *
  * Copyright 1997 Andreas Mohr
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * NOTES:
+ *
  * nearly all joystick functions can be regarded as obsolete,
  * as Linux (2.1.x) now supports extended joysticks
  * with a completely new joystick driver interface
@@ -42,9 +58,9 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "mmddk.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(joystick);
+WINE_DEFAULT_DEBUG_CHANNEL(joystick);
 
 #ifdef HAVE_LINUX_JOYSTICK_H
 
diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c
index 75ebeed938f..9221eb7d221 100644
--- a/dlls/winmm/lolvldrv.c
+++ b/dlls/winmm/lolvldrv.c
@@ -4,6 +4,20 @@
  * MMSYTEM low level drivers handling functions
  *
  * Copyright 1999 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -13,9 +27,9 @@
 #include "winreg.h"
 #include "winver.h"
 #include "winemm.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(mmsys);
+WINE_DEFAULT_DEBUG_CHANNEL(mmsys);
 
 typedef	DWORD	(CALLBACK *WINEMM_msgFunc16)(UINT16, WORD, DWORD, DWORD, DWORD);
 typedef	DWORD	(CALLBACK *WINEMM_msgFunc32)(UINT  , UINT, DWORD, DWORD, DWORD);
diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c
index 44998814c3a..4dc2ab6c22a 100644
--- a/dlls/winmm/mci.c
+++ b/dlls/winmm/mci.c
@@ -4,6 +4,20 @@
  * MCI internal functions
  *
  * Copyright 1998/1999 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -21,9 +35,9 @@
 #include "digitalv.h"
 #include "winemm.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(mci);
+WINE_DEFAULT_DEBUG_CHANNEL(mci);
 
 static	int			MCI_InstalledCount;
 static	LPSTR			MCI_lpInstallNames = NULL;
diff --git a/dlls/winmm/mcianim/mcianim.c b/dlls/winmm/mcianim/mcianim.c
index b1bb879fac0..d50522110ac 100644
--- a/dlls/winmm/mcianim/mcianim.c
+++ b/dlls/winmm/mcianim/mcianim.c
@@ -3,6 +3,20 @@
  * Sample MCI ANIMATION Wine Driver for Linux
  *
  * Copyright 1994 Martin Ayotte
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -11,9 +25,9 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "mmddk.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(mcianim);
+WINE_DEFAULT_DEBUG_CHANNEL(mcianim);
 
 #define ANIMFRAMES_PERSEC 	30
 #define ANIMFRAMES_PERMIN 	1800
diff --git a/dlls/winmm/mciavi/info.c b/dlls/winmm/mciavi/info.c
index 4c232a44141..885e510ec3e 100644
--- a/dlls/winmm/mciavi/info.c
+++ b/dlls/winmm/mciavi/info.c
@@ -4,13 +4,27 @@
  * Digital video MCI Wine Driver
  *
  * Copyright 1999, 2000 Eric POUECH
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
 #include "private_mciavi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(mciavi);
+WINE_DEFAULT_DEBUG_CHANNEL(mciavi);
 
 /**************************************************************************
  * 				MCIAVI_ConvertFrameToTimeFormat	[internal]	
diff --git a/dlls/winmm/mciavi/mciavi.c b/dlls/winmm/mciavi/mciavi.c
index 44b9dced2ad..b7917ed7ec6 100644
--- a/dlls/winmm/mciavi/mciavi.c
+++ b/dlls/winmm/mciavi/mciavi.c
@@ -4,6 +4,20 @@
  * Digital video MCI Wine Driver
  *
  * Copyright 1999, 2000 Eric POUECH
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* TODO list :
@@ -26,9 +40,9 @@
 
 #include <string.h>
 #include "private_mciavi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(mciavi);
+WINE_DEFAULT_DEBUG_CHANNEL(mciavi);
 
 /* ===================================================================
  * ===================================================================
diff --git a/dlls/winmm/mciavi/mciavi_res.rc b/dlls/winmm/mciavi/mciavi_res.rc
index befc39dac41..7d4911a48e4 100644
--- a/dlls/winmm/mciavi/mciavi_res.rc
+++ b/dlls/winmm/mciavi/mciavi_res.rc
@@ -1,7 +1,20 @@
 /* MciAvi resources
  *
- * (c) 2000, Eric Pouech
+ * Copyright (c) 2000, Eric Pouech
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "mmddk.h"
diff --git a/dlls/winmm/mciavi/mmoutput.c b/dlls/winmm/mciavi/mmoutput.c
index bcac07d3ea3..9b4ea34cf3d 100644
--- a/dlls/winmm/mciavi/mmoutput.c
+++ b/dlls/winmm/mciavi/mmoutput.c
@@ -4,12 +4,26 @@
  * Digital video MCI Wine Driver
  *
  * Copyright 1999, 2000 Eric POUECH
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "private_mciavi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(mciavi);
+WINE_DEFAULT_DEBUG_CHANNEL(mciavi);
 
 static BOOL MCIAVI_GetInfoAudio(WINE_MCIAVI* wma, const MMCKINFO* mmckList)
 {
diff --git a/dlls/winmm/mciavi/private_mciavi.h b/dlls/winmm/mciavi/private_mciavi.h
index 5c39f96b15d..259c184887a 100644
--- a/dlls/winmm/mciavi/private_mciavi.h
+++ b/dlls/winmm/mciavi/private_mciavi.h
@@ -4,6 +4,20 @@
  * Digital video MCI Wine Driver
  *
  * Copyright 1999, 2000 Eric POUECH
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
diff --git a/dlls/winmm/mciavi/wnd.c b/dlls/winmm/mciavi/wnd.c
index 35b04de2d1c..87c9b27c970 100644
--- a/dlls/winmm/mciavi/wnd.c
+++ b/dlls/winmm/mciavi/wnd.c
@@ -4,13 +4,27 @@
  * Digital video MCI Wine Driver
  *
  * Copyright 1999, 2000 Eric POUECH
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
 #include "private_mciavi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(mciavi);
+WINE_DEFAULT_DEBUG_CHANNEL(mciavi);
 
 static LRESULT WINAPI MCIAVI_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
diff --git a/dlls/winmm/mcicda/mcicda.c b/dlls/winmm/mcicda/mcicda.c
index fba5ded9009..1974296f045 100644
--- a/dlls/winmm/mcicda/mcicda.c
+++ b/dlls/winmm/mcicda/mcicda.c
@@ -5,6 +5,20 @@
  * Copyright 1994    Martin Ayotte
  * Copyright 1998-99 Eric Pouech
  * Copyright 2000    Andreas Mohr
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -19,9 +33,9 @@
 #include "winioctl.h"
 #include "ntddstor.h"
 #include "ntddcdrm.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(mcicda);
+WINE_DEFAULT_DEBUG_CHANNEL(mcicda);
 
 #define CDFRAMES_PERSEC                 75
 #define CDFRAMES_PERMIN                 (CDFRAMES_PERSEC * 60)
diff --git a/dlls/winmm/mciseq/mcimidi.c b/dlls/winmm/mciseq/mcimidi.c
index 5b86cc5885f..aa0ef966db9 100644
--- a/dlls/winmm/mciseq/mcimidi.c
+++ b/dlls/winmm/mciseq/mcimidi.c
@@ -5,6 +5,20 @@
  *
  * Copyright 	1994 Martin Ayotte
  *		1999 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* 
@@ -24,9 +38,9 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "mmddk.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(mcimidi);
+WINE_DEFAULT_DEBUG_CHANNEL(mcimidi);
 
 #define MIDI_NOTEOFF             0x80
 #define MIDI_NOTEON              0x90
diff --git a/dlls/winmm/mciwave/mciwave.c b/dlls/winmm/mciwave/mciwave.c
index 830ace6c91d..c794859b1d2 100644
--- a/dlls/winmm/mciwave/mciwave.c
+++ b/dlls/winmm/mciwave/mciwave.c
@@ -5,6 +5,20 @@
  * Copyright 	1994 Martin Ayotte
  *		1999,2000 Eric Pouech
  *              2000 Francois Jacques
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "winerror.h"
@@ -14,9 +28,9 @@
 #include "winuser.h"
 #include "mmddk.h"
 #include "digitalv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(mciwave);
+WINE_DEFAULT_DEBUG_CHANNEL(mciwave);
 
 typedef struct {
     UINT			wDevID;
diff --git a/dlls/winmm/midimap/midimap.c b/dlls/winmm/midimap/midimap.c
index 393c2d72222..60e02472a28 100644
--- a/dlls/winmm/midimap/midimap.c
+++ b/dlls/winmm/midimap/midimap.c
@@ -4,6 +4,20 @@
  *
  * Copyright 	1999, 2000, 2001 Eric Pouech
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * TODO:
  *	notification has to be implemented
  *	IDF file loading
@@ -17,7 +31,7 @@
 #include "winuser.h"
 #include "mmddk.h"
 #include "winreg.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 /*
  * Here's how Windows stores the midiOut mapping information.
@@ -61,7 +75,7 @@
  * This last part isn't implemented (.idf file support).
  */
 
-DEFAULT_DEBUG_CHANNEL(msacm);
+WINE_DEFAULT_DEBUG_CHANNEL(msacm);
 
 typedef struct tagMIDIOUTPORT 
 {
diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c
index f7b68265ff6..d69dec2292d 100644
--- a/dlls/winmm/mmio.c
+++ b/dlls/winmm/mmio.c
@@ -5,6 +5,20 @@
  * Copyright 1998 Andrew Taylor
  * Copyright 1998 Ove Kåven
  * Copyright 2000 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* Still to be done:
@@ -31,9 +45,9 @@
 #include "heap.h"
 #include "winemm.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(mmio);
+WINE_DEFAULT_DEBUG_CHANNEL(mmio);
 
 /**************************************************************************
  *               	mmioDosIOProc           		[internal]
diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c
index 825e5274f9b..e474f7fd1c9 100644
--- a/dlls/winmm/mmsystem.c
+++ b/dlls/winmm/mmsystem.c
@@ -4,6 +4,20 @@
  * MMSYTEM functions
  *
  * Copyright 1993 Martin Ayotte
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* 
@@ -30,9 +44,9 @@
 #include "ntddk.h"
 #include "winemm.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(mmsys);
+WINE_DEFAULT_DEBUG_CHANNEL(mmsys);
 
 static LPWINE_MM_IDATA		lpFirstIData = NULL;
 
diff --git a/dlls/winmm/sound16.c b/dlls/winmm/sound16.c
index 45bbc32504f..1ad1f5e9221 100644
--- a/dlls/winmm/sound16.c
+++ b/dlls/winmm/sound16.c
@@ -2,14 +2,28 @@
  * 16-bit sound support
  *
  *  Copyright  Robert J. Amstadt, 1993
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
 #include "windef.h"
 #include "wine/windef16.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(sound);
+WINE_DEFAULT_DEBUG_CHANNEL(sound);
 
 /***********************************************************************
  *		OpenSound (SOUND.1)
diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c
index 0f2a3c37aaa..ca76c7f74ed 100644
--- a/dlls/winmm/time.c
+++ b/dlls/winmm/time.c
@@ -4,6 +4,20 @@
  * MMSYSTEM time functions
  *
  * Copyright 1993 Martin Ayotte
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -22,9 +36,9 @@
 #include "wine/mmsystem16.h"
 #include "winemm.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(mmtime);
+WINE_DEFAULT_DEBUG_CHANNEL(mmtime);
 
 /*
  * FIXME
diff --git a/dlls/winmm/wavemap/wavemap.c b/dlls/winmm/wavemap/wavemap.c
index b60428875a5..5d12130eba4 100644
--- a/dlls/winmm/wavemap/wavemap.c
+++ b/dlls/winmm/wavemap/wavemap.c
@@ -3,6 +3,20 @@
  * Wine Wave mapper driver
  *
  * Copyright 	1999,2001 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* TODOs
@@ -21,9 +35,9 @@
 #include "winuser.h"
 #include "mmddk.h"
 #include "msacm.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(msacm);
+WINE_DEFAULT_DEBUG_CHANNEL(msacm);
 
 typedef	struct tagWAVEMAPDATA {
     struct tagWAVEMAPDATA*	self;
diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h
index 81d89e6a7ba..b6e2620b181 100644
--- a/dlls/winmm/winemm.h
+++ b/dlls/winmm/winemm.h
@@ -4,9 +4,21 @@
  * Copyright 1998, Luiz Otavio L. Zorzella
  *           1999, Eric Pouech
  *
- * File:      winemm.h
  * Purpose:   multimedia declarations (internal to WINMM & MMSYSTEM DLLs)
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *****************************************************************************
  */
 
diff --git a/dlls/winmm/wineoss/audio.c b/dlls/winmm/wineoss/audio.c
index 5656ef8edfa..78b1a341987 100644
--- a/dlls/winmm/wineoss/audio.c
+++ b/dlls/winmm/wineoss/audio.c
@@ -5,6 +5,20 @@
  * Copyright 1994 Martin Ayotte
  *           1999 Eric Pouech (async playing in waveOut/waveIn)
  *	     2000 Eric Pouech (loops in waveOut)
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 /*
  * FIXME:
@@ -35,9 +49,9 @@
 #include "dsound.h"
 #include "dsdriver.h"
 #include "oss.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(wave);
+WINE_DEFAULT_DEBUG_CHANNEL(wave);
 
 /* Allow 1% deviation for sample rates (some ES137x cards) */
 #define NEAR_MATCH(rate1,rate2) (((100*((int)(rate1)-(int)(rate2)))/(rate1))==0)
diff --git a/dlls/winmm/wineoss/midi.c b/dlls/winmm/wineoss/midi.c
index 672dc0bf244..9cf3998f6e0 100644
--- a/dlls/winmm/wineoss/midi.c
+++ b/dlls/winmm/wineoss/midi.c
@@ -10,6 +10,20 @@
  * 			current support is limited to MIDI ports of OSS systems
  * 		98/9	rewriting MCI code for MIDI
  * 		98/11 	splitted in midi.c and mcimidi.c
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -25,9 +39,9 @@
 #include "winuser.h"
 #include "mmddk.h"
 #include "oss.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(midi);
+WINE_DEFAULT_DEBUG_CHANNEL(midi);
 
 #ifdef HAVE_OSS_MIDI
 
diff --git a/dlls/winmm/wineoss/midipatch.c b/dlls/winmm/wineoss/midipatch.c
index a2e5d277a1d..a75798734f9 100644
--- a/dlls/winmm/wineoss/midipatch.c
+++ b/dlls/winmm/wineoss/midipatch.c
@@ -3,6 +3,21 @@
 /*
  * FM patches for wine MIDI driver
  *
+ * Copyright 1999 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* 
diff --git a/dlls/winmm/wineoss/mixer.c b/dlls/winmm/wineoss/mixer.c
index 8113c28ebbb..8175a08e2af 100644
--- a/dlls/winmm/wineoss/mixer.c
+++ b/dlls/winmm/wineoss/mixer.c
@@ -5,6 +5,20 @@
  *
  * Copyright 	1997 Marcus Meissner
  * 		1999,2001 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -20,9 +34,9 @@
 #include "windef.h"
 #include "mmddk.h"
 #include "oss.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(mmaux);
+WINE_DEFAULT_DEBUG_CHANNEL(mmaux);
 
 #ifdef HAVE_OSS
 
diff --git a/dlls/winmm/wineoss/mmaux.c b/dlls/winmm/wineoss/mmaux.c
index 1a9267f9578..d280b429d11 100644
--- a/dlls/winmm/wineoss/mmaux.c
+++ b/dlls/winmm/wineoss/mmaux.c
@@ -3,6 +3,20 @@
  * Sample AUXILARY Wine Driver
  *
  * Copyright 1994 Martin Ayotte
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define EMULATE_SB16
@@ -17,9 +31,9 @@
 #include "windef.h"
 #include "mmddk.h"
 #include "oss.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(mmaux);
+WINE_DEFAULT_DEBUG_CHANNEL(mmaux);
     
 #ifdef HAVE_OSS
 
diff --git a/dlls/winmm/wineoss/oss.c b/dlls/winmm/wineoss/oss.c
index bf8367e8e40..8d5368b267c 100644
--- a/dlls/winmm/wineoss/oss.c
+++ b/dlls/winmm/wineoss/oss.c
@@ -3,6 +3,20 @@
  * Wine Driver for Open Sound System
  *
  * Copyright 	1999 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/dlls/winmm/wineoss/oss.h b/dlls/winmm/wineoss/oss.h
index f890fc8afc6..533e6659588 100644
--- a/dlls/winmm/wineoss/oss.h
+++ b/dlls/winmm/wineoss/oss.h
@@ -1,4 +1,21 @@
-/* Definition for OSS drivers : wine multimedia system */
+/* Definition for OSS drivers : wine multimedia system
+ *
+ * Copyright 1999 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef __WINE_CONFIG_H 
 # error You must include config.h to use this header 
diff --git a/dlls/winmm/winmm_En.rc b/dlls/winmm/winmm_En.rc
index df8dbe9fb4a..9cae1c2adc5 100644
--- a/dlls/winmm/winmm_En.rc
+++ b/dlls/winmm/winmm_En.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1999 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 STRINGTABLE LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 BEGIN
 
diff --git a/dlls/winmm/winmm_Es.rc b/dlls/winmm/winmm_Es.rc
index a0e71c0c77a..81a55cb85d0 100644
--- a/dlls/winmm/winmm_Es.rc
+++ b/dlls/winmm/winmm_Es.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1999 Julio Cesar Gazquez
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
    BEGIN
 
diff --git a/dlls/winmm/winmm_Fr.rc b/dlls/winmm/winmm_Fr.rc
index 62e839882a7..6214dbea02d 100644
--- a/dlls/winmm/winmm_Fr.rc
+++ b/dlls/winmm/winmm_Fr.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1999 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 STRINGTABLE LANGUAGE  LANG_FRENCH, SUBLANG_DEFAULT
 BEGIN
 
diff --git a/dlls/winmm/winmm_Nl.rc b/dlls/winmm/winmm_Nl.rc
index 781691579fc..d7c4dde148d 100644
--- a/dlls/winmm/winmm_Nl.rc
+++ b/dlls/winmm/winmm_Nl.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1999 Klaas van Gend
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
 BEGIN
 
diff --git a/dlls/winmm/winmm_Pt.rc b/dlls/winmm/winmm_Pt.rc
index bf07e40afd9..e7d1da86c3e 100644
--- a/dlls/winmm/winmm_Pt.rc
+++ b/dlls/winmm/winmm_Pt.rc
@@ -1,4 +1,20 @@
-/* 1999 - Translated by Gustavo Junior Alves <alves@correionet.com.br> */
+/*
+ * Copyright 1999 Gustavo Junior Alves
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 STRINGTABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 BEGIN
diff --git a/dlls/winmm/winmm_Ru.rc b/dlls/winmm/winmm_Ru.rc
index 15223d6906a..56ef9adef20 100644
--- a/dlls/winmm/winmm_Ru.rc
+++ b/dlls/winmm/winmm_Ru.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000 Oleg Korda
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 STRINGTABLE LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL
 BEGIN
 
diff --git a/dlls/winmm/winmm_Sk.rc b/dlls/winmm/winmm_Sk.rc
index 4b994f273bb..5695dc8af85 100644
--- a/dlls/winmm/winmm_Sk.rc
+++ b/dlls/winmm/winmm_Sk.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000 Peter Ivanyi
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 STRINGTABLE LANGUAGE LANG_SLOVAK, SUBLANG_NEUTRAL
 BEGIN
 
diff --git a/dlls/winmm/winmm_res.rc b/dlls/winmm/winmm_res.rc
index 107109b6368..68d296d9e10 100644
--- a/dlls/winmm/winmm_res.rc
+++ b/dlls/winmm/winmm_res.rc
@@ -1,6 +1,20 @@
 /* Multimedia resources (MMSYSTEM.DLL & WINMM.DLL
  *
- * (c) 1999, Eric Pouech
+ * Copyright (c) 1999, Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * Note: Win 9x (and of course Win 3.x) store their resources in MMSYSTEM.DLL
  *       Wine stores all resources in WINMM.DLL (as NT does)
diff --git a/dlls/winnls/winnls.c b/dlls/winnls/winnls.c
index 7f7fdba1ef6..fd640248aca 100644
--- a/dlls/winnls/winnls.c
+++ b/dlls/winnls/winnls.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2001 Andreas Mohr
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include "windef.h"
 #include "wine/winuser16.h"
 
diff --git a/dlls/winsock/async.c b/dlls/winsock/async.c
index 79a9c644d0f..0239f23e00d 100644
--- a/dlls/winsock/async.c
+++ b/dlls/winsock/async.c
@@ -1,7 +1,21 @@
 /* Async WINSOCK DNS services
  * 
- * (C) 1993,1994,1996,1997 John Brezak, Erik Bos, Alex Korobka.
- * (C) 1999 Marcus Meissner
+ * Copyright (C) 1993,1994,1996,1997 John Brezak, Erik Bos, Alex Korobka.
+ * Copyright (C) 1999 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * NOTE: If you make any changes to fix a particular app, make sure
  * they don't break something else like Netscape or telnet and ftp
@@ -87,9 +101,9 @@
 #include "wine/winsock16.h"
 #include "winnt.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(winsock);
+WINE_DEFAULT_DEBUG_CHANNEL(winsock);
 
 
 /* critical section to protect some non-rentrant net function */
diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c
index ed0800156cb..379e28d61e6 100644
--- a/dlls/winsock/socket.c
+++ b/dlls/winsock/socket.c
@@ -2,7 +2,21 @@
  * based on Windows Sockets 1.1 specs
  * (ftp.microsoft.com:/Advsys/winsock/spec11/WINSOCK.TXT)
  * 
- * (C) 1993,1994,1996,1997 John Brezak, Erik Bos, Alex Korobka.
+ * Copyright (C) 1993,1994,1996,1997 John Brezak, Erik Bos, Alex Korobka.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * NOTE: If you make any changes to fix a particular app, make sure 
  * they don't break something else like Netscape or telnet and ftp 
@@ -93,10 +107,10 @@
 #include "services.h"
 #include "wine/server.h"
 #include "file.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 
-DEFAULT_DEBUG_CHANNEL(winsock);
+WINE_DEFAULT_DEBUG_CHANNEL(winsock);
 
 /* critical section to protect some non-rentrant net function */
 extern CRITICAL_SECTION csWSgetXXXbyYYY;
diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c
index 6a7095ecba0..047739fefd4 100644
--- a/dlls/winspool/info.c
+++ b/dlls/winspool/info.c
@@ -6,6 +6,20 @@
  * Copyright 1999 Klaas van Gend
  * Copyright 1999, 2000 Huw D M Davies
  * Copyright 2001 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -24,11 +38,11 @@
 #include "winreg.h"
 #include "wine/windef16.h"
 #include "wine/unicode.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "heap.h"
 #include "winnls.h"
 
-DEFAULT_DEBUG_CHANNEL(winspool);
+WINE_DEFAULT_DEBUG_CHANNEL(winspool);
 
 static LPWSTR *printer_array;
 static int nb_printers;
diff --git a/dlls/winspool/wspool.c b/dlls/winspool/wspool.c
index e36e474915e..1db1dfc7428 100644
--- a/dlls/winspool/wspool.c
+++ b/dlls/winspool/wspool.c
@@ -3,14 +3,28 @@
  *
  *
  * Copyright 1999 Thuy Nguyen
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 
 #include "config.h"
 #include "winspool.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(winspool);
+WINE_DEFAULT_DEBUG_CHANNEL(winspool);
 
 
 /******************************************************************************
diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c
index 0c01594f78e..d31f7e08c6d 100644
--- a/dlls/wintrust/wintrust_main.c
+++ b/dlls/wintrust/wintrust_main.c
@@ -1,12 +1,30 @@
+/*
+ * Copyright 2001 Rein Klazes
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include "config.h"
 
 #include "windef.h"
 #include "winerror.h"
 #include "guiddef.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(win32);
+WINE_DEFAULT_DEBUG_CHANNEL(win32);
 
 /***********************************************************************
  *		WinVerifyTrust (WINTRUST.@)
diff --git a/dlls/wsock32/protocol.c b/dlls/wsock32/protocol.c
index 5d18c60aeb2..88f7ce3befb 100644
--- a/dlls/wsock32/protocol.c
+++ b/dlls/wsock32/protocol.c
@@ -2,6 +2,20 @@
  * WSOCK32 specific functions
  *
  * Copyright (C) 2001 Stefan Leichter
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* All we need are a couple constants for EnumProtocols. Once it is 
@@ -36,9 +50,9 @@
 #include "wsipx.h"
 #include "wshisotp.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(winsock);
+WINE_DEFAULT_DEBUG_CHANNEL(winsock);
 
 /* name of the protocols
  */
diff --git a/dlls/wsock32/socket.c b/dlls/wsock32/socket.c
index 677a7ee56a9..fe797c53dcb 100644
--- a/dlls/wsock32/socket.c
+++ b/dlls/wsock32/socket.c
@@ -2,6 +2,20 @@
  * WSOCK32 specific functions
  *
  * Copyright (C) 1993,1994,1996,1997 John Brezak, Erik Bos, Alex Korobka.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 
@@ -50,7 +64,7 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winsock2.h"
 #include "winnt.h"
 #include "wscontrol.h"
@@ -68,7 +82,7 @@ extern int    WINAPI ioctlsocket(SOCKET,long,u_long*);
 /* */
 
 
-DEFAULT_DEBUG_CHANNEL(winsock);
+WINE_DEFAULT_DEBUG_CHANNEL(winsock);
 
 
 /***********************************************************************
diff --git a/dlls/wsock32/wscontrol.h b/dlls/wsock32/wscontrol.h
index b44bb36698d..6db761be6fa 100644
--- a/dlls/wsock32/wscontrol.h
+++ b/dlls/wsock32/wscontrol.h
@@ -7,6 +7,22 @@
  * The functionality of WsControl was created by observing its behaviour
  * in Windows 98, so there are likely to be bugs with the assumptions
  * that were made.
+ *
+ * Copyright 2000 James Hatheway
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef WSCONTROL_H_INCLUDED
diff --git a/dlls/x11drv/desktop.c b/dlls/x11drv/desktop.c
index 5576f140529..385d6c8d1bc 100644
--- a/dlls/x11drv/desktop.c
+++ b/dlls/x11drv/desktop.c
@@ -2,6 +2,20 @@
  * X11DRV desktop window handling
  *
  * Copyright 2001 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -12,9 +26,9 @@
 #include "wine/winuser16.h"
 #include "win.h"
 #include "x11drv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(x11drv);
+WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
 
 
 /* desktop window procedure */
diff --git a/dlls/x11drv/dga2.c b/dlls/x11drv/dga2.c
index a6ca7aa65dd..2c9aab44809 100644
--- a/dlls/x11drv/dga2.c
+++ b/dlls/x11drv/dga2.c
@@ -2,6 +2,20 @@
  * DirectDraw DGA2 interface
  *
  * Copyright 2001 TransGaming Technologies, Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -17,9 +31,9 @@
 #include "windef.h"
 #include "wingdi.h"
 #include "ddrawi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(x11drv);
+WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
 
 extern int usedga;
 
diff --git a/dlls/x11drv/dga2.h b/dlls/x11drv/dga2.h
index 226234f15df..73e9e84c5b7 100644
--- a/dlls/x11drv/dga2.h
+++ b/dlls/x11drv/dga2.h
@@ -2,6 +2,20 @@
  * DirectDraw HAL XVidMode interface
  *
  * Copyright 2001 TransGaming Technologies, Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #ifndef __WINE_DGA2_H
 #define __WINE_DGA2_H
diff --git a/dlls/x11drv/mouse.c b/dlls/x11drv/mouse.c
index d1144887068..dc72cc9dae2 100644
--- a/dlls/x11drv/mouse.c
+++ b/dlls/x11drv/mouse.c
@@ -2,6 +2,20 @@
  * X11 mouse driver
  *
  * Copyright 1998 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -15,9 +29,9 @@
 #include "wine/winuser16.h"
 
 #include "x11drv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(cursor);
+WINE_DEFAULT_DEBUG_CHANNEL(cursor);
 
 /**********************************************************************/
 
diff --git a/dlls/x11drv/mwm.h b/dlls/x11drv/mwm.h
index c5b85ef78a8..dcfe9f679cc 100644
--- a/dlls/x11drv/mwm.h
+++ b/dlls/x11drv/mwm.h
@@ -3,6 +3,20 @@
  *
  * Copyright 2001 Ove Kåven, TransGaming Technologies Inc.
  * (these definitions were found in GTK+ 1.2, gdk/MwmUtil.h)
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #ifndef __WINE_MWM_H
 #define __WINE_MWM_H
diff --git a/dlls/x11drv/scroll.c b/dlls/x11drv/scroll.c
index 2df11bf399e..ec69bdf18b8 100644
--- a/dlls/x11drv/scroll.c
+++ b/dlls/x11drv/scroll.c
@@ -4,6 +4,20 @@
  * Copyright 1993  David W. Metcalfe
  * Copyright 1995, 1996 Alex Korobka
  * Copyright 2001 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -17,9 +31,9 @@
 
 #include "x11drv.h"
 #include "win.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(scroll);
+WINE_DEFAULT_DEBUG_CHANNEL(scroll);
 
 
 /*************************************************************************
diff --git a/dlls/x11drv/window.c b/dlls/x11drv/window.c
index b9b64d2a24d..1c1bc4f811c 100644
--- a/dlls/x11drv/window.c
+++ b/dlls/x11drv/window.c
@@ -4,6 +4,20 @@
  * Copyright 1993, 1994, 1995, 1996, 2001 Alexandre Julliard
  * Copyright 1993 David Metcalfe
  * Copyright 1995, 1996 Alex Korobka
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -19,7 +33,7 @@
 #include "winuser.h"
 #include "wine/unicode.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "x11drv.h"
 #include "win.h"
 #include "winpos.h"
@@ -28,7 +42,7 @@
 #include "hook.h"
 #include "mwm.h"
 
-DEFAULT_DEBUG_CHANNEL(x11drv);
+WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
 
 extern Pixmap X11DRV_BITMAP_Pixmap( HBITMAP );
 
diff --git a/dlls/x11drv/winpos.c b/dlls/x11drv/winpos.c
index efb0bf7e186..b72eeb25c73 100644
--- a/dlls/x11drv/winpos.c
+++ b/dlls/x11drv/winpos.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1993, 1994, 1995, 2001 Alexandre Julliard
  * Copyright 1995, 1996, 1999 Alex Korobka
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -26,9 +40,9 @@
 #include "nonclient.h"
 #include "message.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(x11drv);
+WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
 
 #define SWP_AGG_NOGEOMETRYCHANGE \
     (SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE)
diff --git a/dlls/x11drv/x11ddraw.c b/dlls/x11drv/x11ddraw.c
index 901485b1366..cf96a39fe30 100644
--- a/dlls/x11drv/x11ddraw.c
+++ b/dlls/x11drv/x11ddraw.c
@@ -2,6 +2,20 @@
  * DirectDraw driver interface
  *
  * Copyright 2001 TransGaming Technologies, Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -18,9 +32,9 @@
 #include "wingdi.h"
 #include "ddrawi.h"
 #include "bitmap.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(x11drv);
+WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
 
 extern int dxgrab;
 
diff --git a/dlls/x11drv/x11ddraw.h b/dlls/x11drv/x11ddraw.h
index 0836f642be5..dcd690886f3 100644
--- a/dlls/x11drv/x11ddraw.h
+++ b/dlls/x11drv/x11ddraw.h
@@ -2,6 +2,20 @@
  * DirectDraw HAL base interface
  *
  * Copyright 2001 TransGaming Technologies, Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #ifndef __WINE_X11DDRAW_H
 #define __WINE_X11DDRAW_H
diff --git a/dlls/x11drv/x11drv_main.c b/dlls/x11drv/x11drv_main.c
index ae2248e79d9..1c3ebe5ae48 100644
--- a/dlls/x11drv/x11drv_main.c
+++ b/dlls/x11drv/x11drv_main.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1998 Patrik Stridvall
  * Copyright 2000 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -31,7 +45,7 @@ static int *ph_errno = &h_errno;
 #include "wine/winbase16.h"
 #include "winreg.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "gdi.h"
 #include "file.h"
 #include "options.h"
@@ -42,7 +56,7 @@ static int *ph_errno = &h_errno;
 #include "xvidmode.h"
 #include "dga2.h"
 
-DEFAULT_DEBUG_CHANNEL(x11drv);
+WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
 
 static void (*old_tsx11_lock)(void);
 static void (*old_tsx11_unlock)(void);
diff --git a/dlls/x11drv/xrender.c b/dlls/x11drv/xrender.c
index a1b8f8019b9..3ab276e6aa5 100644
--- a/dlls/x11drv/xrender.c
+++ b/dlls/x11drv/xrender.c
@@ -2,13 +2,27 @@
  * Functions to use the XRender extension
  *
  * Copyright 2001 Huw D M Davies for CodeWeavers
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "config.h"
 
 #include "winnt.h"
 #include "x11drv.h"
 #include "bitmap.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "region.h"
 #include <string.h>
 #include <stdlib.h>
@@ -16,7 +30,7 @@
 #include <assert.h>
 
 BOOL X11DRV_XRender_Installed = FALSE;
-DEFAULT_DEBUG_CHANNEL(xrender);
+WINE_DEFAULT_DEBUG_CHANNEL(xrender);
 
 #ifdef HAVE_LIBXRENDER
 
diff --git a/dlls/x11drv/xvidmode.c b/dlls/x11drv/xvidmode.c
index e2a9a2adaee..7976d4b2033 100644
--- a/dlls/x11drv/xvidmode.c
+++ b/dlls/x11drv/xvidmode.c
@@ -2,6 +2,20 @@
  * DirectDraw XVidMode interface
  *
  * Copyright 2001 TransGaming Technologies, Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* FIXME: ChangeDisplaySettings ought to be able to use this */
@@ -18,9 +32,9 @@
 #include "windef.h"
 #include "wingdi.h"
 #include "ddrawi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(x11drv);
+WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
 
 #ifdef HAVE_LIBXXF86VM
 
diff --git a/dlls/x11drv/xvidmode.h b/dlls/x11drv/xvidmode.h
index 5bc8d516199..12a8b9a09d0 100644
--- a/dlls/x11drv/xvidmode.h
+++ b/dlls/x11drv/xvidmode.h
@@ -2,6 +2,20 @@
  * DirectDraw HAL XVidMode interface
  *
  * Copyright 2001 TransGaming Technologies, Inc.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #ifndef __WINE_XVIDMODE_H
 #define __WINE_XVIDMODE_H
diff --git a/files/change.c b/files/change.c
index a7a4cd09715..32370c02398 100644
--- a/files/change.c
+++ b/files/change.c
@@ -7,6 +7,20 @@
  * See http://x57.deja.com/getdoc.xp?AN=575483053 for possible solutions.
  *
  * Copyright 1998 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
@@ -17,9 +31,9 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "wine/server.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(file);
+WINE_DEFAULT_DEBUG_CHANNEL(file);
 
 /****************************************************************************
  *		FindFirstChangeNotificationA (KERNEL32.@)
diff --git a/files/directory.c b/files/directory.c
index c6f0b4ef610..95121b1b759 100644
--- a/files/directory.c
+++ b/files/directory.c
@@ -2,6 +2,20 @@
  * DOS directories functions
  *
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -30,10 +44,10 @@
 #include "heap.h"
 #include "msdos.h"
 #include "options.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(dosfs);
-DECLARE_DEBUG_CHANNEL(file);
+WINE_DEFAULT_DEBUG_CHANNEL(dosfs);
+WINE_DECLARE_DEBUG_CHANNEL(file);
 
 static DOS_FULL_NAME DIR_Windows;
 static DOS_FULL_NAME DIR_System;
diff --git a/files/dos_fs.c b/files/dos_fs.c
index ff756fce34e..ebd9c9b88c5 100644
--- a/files/dos_fs.c
+++ b/files/dos_fs.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1993 Erik Bos
  * Copyright 1996 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -37,10 +51,10 @@
 #include "wine/server.h"
 #include "msvcrt/excpt.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(dosfs);
-DECLARE_DEBUG_CHANNEL(file);
+WINE_DEFAULT_DEBUG_CHANNEL(dosfs);
+WINE_DECLARE_DEBUG_CHANNEL(file);
 
 /* Define the VFAT ioctl to get both short and long file names */
 /* FIXME: is it possible to get this to work on other systems? */
diff --git a/files/drive.c b/files/drive.c
index 9ed9c58ec42..302edcaac12 100644
--- a/files/drive.c
+++ b/files/drive.c
@@ -8,6 +8,19 @@
  *  (c) 1999 Petr Tomasek <tomasek@etf.cuni.cz>
  *  (c) 2000 Andreas Mohr (changes)
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -49,14 +62,14 @@
 #include "msdos.h"
 #include "options.h"
 #include "task.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "wine/server.h"
 #include "winioctl.h"
 #include "ntddstor.h"
 #include "ntddcdrm.h"
 
-DEFAULT_DEBUG_CHANNEL(dosfs);
-DECLARE_DEBUG_CHANNEL(file);
+WINE_DEFAULT_DEBUG_CHANNEL(dosfs);
+WINE_DECLARE_DEBUG_CHANNEL(file);
 
 typedef struct
 {
diff --git a/files/file.c b/files/file.c
index 19a01739caf..c10885711ba 100644
--- a/files/file.c
+++ b/files/file.c
@@ -4,6 +4,20 @@
  * Copyright 1993 John Burton
  * Copyright 1996 Alexandre Julliard
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * TODO:
  *    Fix the CopyFileEx methods to implement the "extended" functionality.
  *    Right now, they simply call the CopyFile method.
@@ -42,11 +56,11 @@
 #include "heap.h"
 #include "msdos.h"
 #include "wincon.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #include "wine/server.h"
 
-DEFAULT_DEBUG_CHANNEL(file);
+WINE_DEFAULT_DEBUG_CHANNEL(file);
 
 #if defined(MAP_ANONYMOUS) && !defined(MAP_ANON)
 #define MAP_ANON MAP_ANONYMOUS
diff --git a/files/profile.c b/files/profile.c
index bcea9b2b361..a15e165f5d6 100644
--- a/files/profile.c
+++ b/files/profile.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1993 Miguel de Icaza
  * Copyright 1996 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <ctype.h>
@@ -24,11 +38,11 @@
 #include "winreg.h"
 #include "file.h"
 #include "heap.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "options.h"
 #include "wine/server.h"
 
-DEFAULT_DEBUG_CHANNEL(profile);
+WINE_DEFAULT_DEBUG_CHANNEL(profile);
 
 typedef struct tagPROFILEKEY
 {
diff --git a/files/tape.c b/files/tape.c
index a9c17b18d42..fe1ad048197 100644
--- a/files/tape.c
+++ b/files/tape.c
@@ -4,15 +4,29 @@
  * Copyright 1999 Chris Morgan <cmorgan@wpi.edu>
  *                James Abbatiello <abbeyj@wpi.edu>
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * TODO: 
  *    Everything, all functions are stubs.
  */
 
 #include "winbase.h"
 #include "winerror.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(tape);
+WINE_DEFAULT_DEBUG_CHANNEL(tape);
 
 
 /************************************************************************
diff --git a/graphics/bitblt.c b/graphics/bitblt.c
index 6c4657735bf..a6ac8f092db 100644
--- a/graphics/bitblt.c
+++ b/graphics/bitblt.c
@@ -2,12 +2,26 @@
  * GDI bit-blit operations
  *
  * Copyright 1993, 1994  Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "gdi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(bitblt);
+WINE_DEFAULT_DEBUG_CHANNEL(bitblt);
 
 
 /***********************************************************************
diff --git a/graphics/dispdib.c b/graphics/dispdib.c
index 92b63c9ba52..8c1989f8001 100644
--- a/graphics/dispdib.c
+++ b/graphics/dispdib.c
@@ -3,6 +3,19 @@
  * 
  * Copyright 1998 Ove Kåven (with some help from Marcus Meissner)
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -10,9 +23,9 @@
 #include "wingdi.h"
 #include "wine/wingdi16.h"
 #include "dispdib.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(ddraw);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 #if 0
 
diff --git a/graphics/enhmetafiledrv/dc.c b/graphics/enhmetafiledrv/dc.c
index 20ebb1ad6e1..64b08b95c5e 100644
--- a/graphics/enhmetafiledrv/dc.c
+++ b/graphics/enhmetafiledrv/dc.c
@@ -3,11 +3,25 @@
  *
  * Copyright 1999 Huw D M Davies
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 #include "enhmetafiledrv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(enhmetafile);
+WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile);
 
 INT EMFDRV_SaveDC( DC *dc )
 {
diff --git a/graphics/enhmetafiledrv/graphics.c b/graphics/enhmetafiledrv/graphics.c
index 49e54998ce1..b0770d25869 100644
--- a/graphics/enhmetafiledrv/graphics.c
+++ b/graphics/enhmetafiledrv/graphics.c
@@ -2,6 +2,20 @@
  * Enhanced MetaFile driver graphics functions
  *
  * Copyright 1999 Huw D M Davies
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -9,9 +23,9 @@
 
 #include "gdi.h"
 #include "enhmetafiledrv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(enhmetafile);
+WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile);
 
 /**********************************************************************
  *	     EMFDRV_MoveTo
diff --git a/graphics/enhmetafiledrv/init.c b/graphics/enhmetafiledrv/init.c
index 2ef4444129b..aeba8e220fd 100644
--- a/graphics/enhmetafiledrv/init.c
+++ b/graphics/enhmetafiledrv/init.c
@@ -2,6 +2,20 @@
  * Enhanced MetaFile driver initialisation functions
  *
  * Copyright 1999 Huw D M Davies
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -10,9 +24,9 @@
 #include "wingdi.h"
 #include "gdi.h"
 #include "enhmetafiledrv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(enhmetafile);
+WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile);
 
 static const DC_FUNCTIONS EMFDRV_Funcs =
 {
diff --git a/graphics/enhmetafiledrv/mapping.c b/graphics/enhmetafiledrv/mapping.c
index c9bed814524..97db539786f 100644
--- a/graphics/enhmetafiledrv/mapping.c
+++ b/graphics/enhmetafiledrv/mapping.c
@@ -2,6 +2,20 @@
  * Enhanced MetaFile driver mapping functions
  *
  * Copyright 1999 Huw D M Davies
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "enhmetafiledrv.h"
 
diff --git a/graphics/enhmetafiledrv/objects.c b/graphics/enhmetafiledrv/objects.c
index 0cd11e6e6ab..eec50e08ea5 100644
--- a/graphics/enhmetafiledrv/objects.c
+++ b/graphics/enhmetafiledrv/objects.c
@@ -2,6 +2,20 @@
  * Enhanced MetaFile objects
  *
  * Copyright 1999 Huw D M Davies
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -10,9 +24,9 @@
 
 #include "bitmap.h"
 #include "enhmetafiledrv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(enhmetafile);
+WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile);
 
 /***********************************************************************
  *           EMFDRV_BITMAP_SelectObject
diff --git a/graphics/env.c b/graphics/env.c
index 9180248ded8..727affe7f87 100644
--- a/graphics/env.c
+++ b/graphics/env.c
@@ -5,6 +5,20 @@
  *
  * Copyright 1997 Marcus Meissner
  * Copyright 1998 Andreas Mohr
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -13,9 +27,9 @@
 #include <string.h>
 
 #include "gdi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(gdi);
+WINE_DEFAULT_DEBUG_CHANNEL(gdi);
 
 typedef struct {
         ATOM atom;
diff --git a/graphics/escape.c b/graphics/escape.c
index 0271ae2c016..e99aa81f4d0 100644
--- a/graphics/escape.c
+++ b/graphics/escape.c
@@ -3,15 +3,29 @@
  *
  * Copyright 1994  Bob Amstadt
  * Copyright 2001  Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
 #include "windef.h"
 #include "wingdi.h"
 #include "gdi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(driver);
+WINE_DEFAULT_DEBUG_CHANNEL(driver);
 
 /***********************************************************************
  *            Escape  [GDI.38]
diff --git a/graphics/fontengine.c b/graphics/fontengine.c
index d98b291f32c..ade4d8a8a60 100644
--- a/graphics/fontengine.c
+++ b/graphics/fontengine.c
@@ -3,16 +3,29 @@
  *
  * Copyright 1996 John Harvey
  * Copyright 1998 David Lee Lambert
- * 
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "winbase.h"
 #include "font.h"
-#include "debugtools.h"     
+#include "wine/debug.h"     
 
-DEFAULT_DEBUG_CHANNEL(font);
+WINE_DEFAULT_DEBUG_CHANNEL(font);
 
 /***********************************************************************
  *		EngineEnumerateFont (GDI.300)
diff --git a/graphics/mapping.c b/graphics/mapping.c
index c55229b56ba..66a76db05a0 100644
--- a/graphics/mapping.c
+++ b/graphics/mapping.c
@@ -2,12 +2,26 @@
  * GDI mapping mode functions
  *
  * Copyright 1993 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "gdi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(gdi);
+WINE_DEFAULT_DEBUG_CHANNEL(gdi);
 
 
 /***********************************************************************
diff --git a/graphics/metafiledrv/bitblt.c b/graphics/metafiledrv/bitblt.c
index ab0e9509c6a..d19e9ecd59d 100644
--- a/graphics/metafiledrv/bitblt.c
+++ b/graphics/metafiledrv/bitblt.c
@@ -2,16 +2,30 @@
  * GDI bit-blit operations
  *
  * Copyright 1993, 1994  Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
 
 #include "gdi.h"
 #include "metafiledrv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "bitmap.h"
 
-DEFAULT_DEBUG_CHANNEL(metafile);
+WINE_DEFAULT_DEBUG_CHANNEL(metafile);
 
 /***********************************************************************
  *           MFDRV_PatBlt
diff --git a/graphics/metafiledrv/dc.c b/graphics/metafiledrv/dc.c
index 0d28dfbd62b..7e685409946 100644
--- a/graphics/metafiledrv/dc.c
+++ b/graphics/metafiledrv/dc.c
@@ -3,6 +3,19 @@
  *
  * Copyright 1999 Huw D M Davies
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "metafiledrv.h"
diff --git a/graphics/metafiledrv/graphics.c b/graphics/metafiledrv/graphics.c
index 66d437baaea..e1f5f1828dc 100644
--- a/graphics/metafiledrv/graphics.c
+++ b/graphics/metafiledrv/graphics.c
@@ -2,6 +2,20 @@
  * Metafile driver graphics functions
  *
  * Copyright 1993, 1994 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -10,9 +24,9 @@
 #include "gdi.h"
 #include "region.h"
 #include "metafiledrv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(metafile);
+WINE_DEFAULT_DEBUG_CHANNEL(metafile);
 
 /**********************************************************************
  *	     MFDRV_MoveTo
diff --git a/graphics/metafiledrv/init.c b/graphics/metafiledrv/init.c
index 797a26befd8..362ed87cced 100644
--- a/graphics/metafiledrv/init.c
+++ b/graphics/metafiledrv/init.c
@@ -2,6 +2,20 @@
  * Metafile driver initialisation functions
  *
  * Copyright 1996 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
@@ -9,9 +23,9 @@
 #include "gdi.h"
 #include "metafile.h"
 #include "metafiledrv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(metafile);
+WINE_DEFAULT_DEBUG_CHANNEL(metafile);
 
 #include <string.h>
 
diff --git a/graphics/metafiledrv/mapping.c b/graphics/metafiledrv/mapping.c
index 4d89005d610..55c2064b005 100644
--- a/graphics/metafiledrv/mapping.c
+++ b/graphics/metafiledrv/mapping.c
@@ -2,6 +2,20 @@
  * Metafile GDI mapping mode functions
  *
  * Copyright 1996 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "gdi.h"
diff --git a/graphics/metafiledrv/metafiledrv.h b/graphics/metafiledrv/metafiledrv.h
index 24473189deb..dbd91864b07 100644
--- a/graphics/metafiledrv/metafiledrv.h
+++ b/graphics/metafiledrv/metafiledrv.h
@@ -1,5 +1,21 @@
 /*
  * Metafile driver definitions
+ *
+ * Copyright 1996 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_METAFILEDRV_H
diff --git a/graphics/metafiledrv/objects.c b/graphics/metafiledrv/objects.c
index cb89f6f9ae3..a5b0eabd7b8 100644
--- a/graphics/metafiledrv/objects.c
+++ b/graphics/metafiledrv/objects.c
@@ -2,6 +2,20 @@
  * GDI objects
  *
  * Copyright 1993 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -11,9 +25,9 @@
 #include "bitmap.h"
 #include "font.h"
 #include "metafiledrv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(metafile);
+WINE_DEFAULT_DEBUG_CHANNEL(metafile);
 
 
 /***********************************************************************
diff --git a/graphics/metafiledrv/text.c b/graphics/metafiledrv/text.c
index 64b4b49a81d..c75dd711127 100644
--- a/graphics/metafiledrv/text.c
+++ b/graphics/metafiledrv/text.c
@@ -3,15 +3,28 @@
  *
  * Copyright 1993, 1994 Alexandre Julliard
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
 
 #include "windef.h"
 #include "metafiledrv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(metafile);
+WINE_DEFAULT_DEBUG_CHANNEL(metafile);
 
 
 /******************************************************************
diff --git a/graphics/painting.c b/graphics/painting.c
index d3b0251b14e..d644909ae06 100644
--- a/graphics/painting.c
+++ b/graphics/painting.c
@@ -4,6 +4,20 @@
  * Copyright 1993, 1994 Alexandre Julliard
  * Copyright 1997 Bertho A. Stultiens
  *           1999 Huw D M Davies
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -16,9 +30,9 @@
 #include "bitmap.h"
 #include "region.h"
 #include "path.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(gdi);
+WINE_DEFAULT_DEBUG_CHANNEL(gdi);
 
 
 /***********************************************************************
diff --git a/graphics/path.c b/graphics/path.c
index 9841a8ce4fd..537b9c21cde 100644
--- a/graphics/path.c
+++ b/graphics/path.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1997, 1998 Martin Boehme
  *                 1999 Huw D M Davies
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -19,10 +33,10 @@
 #include "winerror.h"
 
 #include "gdi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "path.h"
 
-DEFAULT_DEBUG_CHANNEL(gdi);
+WINE_DEFAULT_DEBUG_CHANNEL(gdi);
 
 /* Notes on the implementation
  *
diff --git a/graphics/win16drv/brush.c b/graphics/win16drv/brush.c
index 2ef65f2a033..9f501535535 100644
--- a/graphics/win16drv/brush.c
+++ b/graphics/win16drv/brush.c
@@ -2,13 +2,27 @@
  * GDI brush objects - win16drv
  *
  * Copyright 1997  John Harvey
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
 #include "win16drv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(win16drv);
+WINE_DEFAULT_DEBUG_CHANNEL(win16drv);
 
 HBRUSH WIN16DRV_BRUSH_SelectObject( DC * dc, HBRUSH hbrush )
 {
diff --git a/graphics/win16drv/font.c b/graphics/win16drv/font.c
index 921cb3803ee..1fd78c7fa80 100644
--- a/graphics/win16drv/font.c
+++ b/graphics/win16drv/font.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1996 John Harvey
  *           1998 Huw Davies
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -11,9 +25,9 @@
 #include "win16drv.h"
 #include "font.h"
 #include "gdi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(win16drv);
+WINE_DEFAULT_DEBUG_CHANNEL(win16drv);
 
 
 /***********************************************************************
diff --git a/graphics/win16drv/graphics.c b/graphics/win16drv/graphics.c
index 0cd100faffb..478651315dc 100644
--- a/graphics/win16drv/graphics.c
+++ b/graphics/win16drv/graphics.c
@@ -2,14 +2,28 @@
  * Windows 16 bit device driver graphics functions
  *
  * Copyright 1997 John Harvey
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
 
 #include "win16drv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(win16drv);
+WINE_DEFAULT_DEBUG_CHANNEL(win16drv);
 
 /***********************************************************************
  *           WIN16DRV_LineTo
diff --git a/graphics/win16drv/init.c b/graphics/win16drv/init.c
index d561a8a567d..97ec6d953c5 100644
--- a/graphics/win16drv/init.c
+++ b/graphics/win16drv/init.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1996 John Harvey
  *           1998 Huw Davies
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <ctype.h>
@@ -14,9 +28,9 @@
 #include "gdi.h"
 #include "bitmap.h"
 #include "font.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(win16drv);
+WINE_DEFAULT_DEBUG_CHANNEL(win16drv);
 
 #define SUPPORT_REALIZED_FONTS 1
 #include "pshpack1.h"
diff --git a/graphics/win16drv/objects.c b/graphics/win16drv/objects.c
index 47d4c352ae3..a3d2564fff0 100644
--- a/graphics/win16drv/objects.c
+++ b/graphics/win16drv/objects.c
@@ -2,6 +2,20 @@
  * GDI objects
  *
  * Copyright 1993 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -11,9 +25,9 @@
 
 #include "win16drv.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(gdi);
+WINE_DEFAULT_DEBUG_CHANNEL(gdi);
 
 
 /***********************************************************************
diff --git a/graphics/win16drv/pen.c b/graphics/win16drv/pen.c
index ecca11bde3e..30e9d3b41e8 100644
--- a/graphics/win16drv/pen.c
+++ b/graphics/win16drv/pen.c
@@ -2,12 +2,26 @@
  * GDI pen objects
  *
  * Copyright 1997 John Harvey
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "win16drv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(win16drv);
+WINE_DEFAULT_DEBUG_CHANNEL(win16drv);
 
 /***********************************************************************
  *           PEN_SelectObject
diff --git a/graphics/win16drv/prtdrv.c b/graphics/win16drv/prtdrv.c
index e23d680b356..b4563406e65 100644
--- a/graphics/win16drv/prtdrv.c
+++ b/graphics/win16drv/prtdrv.c
@@ -2,6 +2,20 @@
  * Windows Device Context initialisation functions
  *
  * Copyright 1996,1997 John Harvey
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -13,10 +27,10 @@
 #include "wine/winbase16.h"
 #include "winuser.h"
 #include "win16drv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "bitmap.h"
 
-DEFAULT_DEBUG_CHANNEL(win16drv);
+WINE_DEFAULT_DEBUG_CHANNEL(win16drv);
 
 /* ### start build ### */
 extern WORD CALLBACK PRTDRV_CallTo16_word_lwll (FARPROC16,LONG,WORD,LONG,LONG);
diff --git a/graphics/win16drv/text.c b/graphics/win16drv/text.c
index 98392dfb63f..2650bf6b2b3 100644
--- a/graphics/win16drv/text.c
+++ b/graphics/win16drv/text.c
@@ -3,16 +3,30 @@
  *
  * Copyright 1996 John Harvey
  *           1998 Huw Davies
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
 #include "win16drv.h"
 #include "gdi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winbase.h"
 #include "winnls.h"
 
-DEFAULT_DEBUG_CHANNEL(win16drv);
+WINE_DEFAULT_DEBUG_CHANNEL(win16drv);
 
 /***********************************************************************
  *           WIN16DRV_ExtTextOut
diff --git a/graphics/x11drv/bitblt.c b/graphics/x11drv/bitblt.c
index f89d6f90f53..7b7c2061193 100644
--- a/graphics/x11drv/bitblt.c
+++ b/graphics/x11drv/bitblt.c
@@ -2,6 +2,20 @@
  * GDI bit-blit operations
  *
  * Copyright 1993, 1994  Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -20,9 +34,9 @@
 #include "bitmap.h"
 #include "gdi.h"
 #include "x11drv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(bitblt);
+WINE_DEFAULT_DEBUG_CHANNEL(bitblt);
 
 
 #define DST 0   /* Destination drawable */
diff --git a/graphics/x11drv/bitmap.c b/graphics/x11drv/bitmap.c
index 8d94629a5c5..3ab5f71322d 100644
--- a/graphics/x11drv/bitmap.c
+++ b/graphics/x11drv/bitmap.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1993 Alexandre Julliard
  *           1999 Noel Borthwick
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -14,13 +28,13 @@
 #include <stdlib.h>
 #include "gdi.h"
 #include "bitmap.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "x11drv.h"
 #include "wingdi.h"
 #include "windef.h"
 #include "wine/winuser16.h"
 
-DEFAULT_DEBUG_CHANNEL(x11drv);
+WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
 
   /* GCs used for B&W and color bitmap operations */
 GC BITMAP_monoGC = 0, BITMAP_colorGC = 0;
diff --git a/graphics/x11drv/brush.c b/graphics/x11drv/brush.c
index 8125ce3a4f1..55c6f78e2e7 100644
--- a/graphics/x11drv/brush.c
+++ b/graphics/x11drv/brush.c
@@ -2,6 +2,20 @@
  * X11DRV brush objects
  *
  * Copyright 1993, 1994  Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -12,9 +26,9 @@
 #include "bitmap.h"
 #include "color.h"
 #include "x11drv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(gdi);
+WINE_DEFAULT_DEBUG_CHANNEL(gdi);
 
 #define NB_HATCH_STYLES  (HS_DIAGCROSS+1)
 
diff --git a/graphics/x11drv/clipping.c b/graphics/x11drv/clipping.c
index 1200da081e0..8fcf56c3052 100644
--- a/graphics/x11drv/clipping.c
+++ b/graphics/x11drv/clipping.c
@@ -2,6 +2,20 @@
  * X11DRV clipping functions
  *
  * Copyright 1998 Huw Davies
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -13,9 +27,9 @@
 #include "gdi.h"
 #include "x11drv.h"
 #include "region.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(x11drv);
+WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
 
 /***********************************************************************
  *           X11DRV_SetDeviceClipping
diff --git a/graphics/x11drv/codepage.c b/graphics/x11drv/codepage.c
index c4d9480cbb6..d76a20ffe1a 100644
--- a/graphics/x11drv/codepage.c
+++ b/graphics/x11drv/codepage.c
@@ -2,6 +2,20 @@
  * X11 codepage handling
  *
  * Copyright 2000 Hidenori Takeshima <hidenori@a2.ctktv.ne.jp>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -13,9 +27,9 @@
 #include "windef.h"
 #include "winnls.h"
 #include "x11font.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(text);
+WINE_DEFAULT_DEBUG_CHANNEL(text);
 
 /***********************************************************************
  *           IsLegalDBCSChar for cp932/936/949/950/euc
diff --git a/graphics/x11drv/dib.c b/graphics/x11drv/dib.c
index 17c8ffb0857..ab92d2a7a11 100644
--- a/graphics/x11drv/dib.c
+++ b/graphics/x11drv/dib.c
@@ -2,6 +2,20 @@
  * X11DRV device-independent bitmaps
  *
  * Copyright 1993,1994  Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -23,13 +37,13 @@
 #include "windef.h"
 #include "bitmap.h"
 #include "x11drv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "gdi.h"
 #include "palette.h"
 #include "global.h"
 
-DEFAULT_DEBUG_CHANNEL(bitmap);
-DECLARE_DEBUG_CHANNEL(x11drv);
+WINE_DEFAULT_DEBUG_CHANNEL(bitmap);
+WINE_DECLARE_DEBUG_CHANNEL(x11drv);
 
 static int ximageDepthTable[32];
 
diff --git a/graphics/x11drv/graphics.c b/graphics/x11drv/graphics.c
index 63004130adf..83953ec284d 100644
--- a/graphics/x11drv/graphics.c
+++ b/graphics/x11drv/graphics.c
@@ -2,6 +2,20 @@
  * X11 graphics driver graphics functions
  *
  * Copyright 1993,1994 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /*
@@ -32,9 +46,9 @@
 #include "gdi.h"
 #include "palette.h"
 #include "region.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(graphics);
+WINE_DEFAULT_DEBUG_CHANNEL(graphics);
 
 #define ABS(x)    ((x)<0?(-(x)):(x))
 
diff --git a/graphics/x11drv/init.c b/graphics/x11drv/init.c
index a1f675c48c9..da0680e8884 100644
--- a/graphics/x11drv/init.c
+++ b/graphics/x11drv/init.c
@@ -2,6 +2,20 @@
  * X11 graphics driver initialisation functions
  *
  * Copyright 1996 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -12,12 +26,12 @@
 
 #include "bitmap.h"
 #include "palette.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winnt.h"
 #include "x11drv.h"
 #include "ddrawi.h"
 
-DEFAULT_DEBUG_CHANNEL(x11drv);
+WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
 
 const DC_FUNCTIONS *X11DRV_DC_Funcs = NULL;  /* hack */
 
diff --git a/graphics/x11drv/objects.c b/graphics/x11drv/objects.c
index ad429e7ba75..ba9c68a5a73 100644
--- a/graphics/x11drv/objects.c
+++ b/graphics/x11drv/objects.c
@@ -2,6 +2,20 @@
  * GDI objects
  *
  * Copyright 1993 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -10,9 +24,9 @@
 #include <stdio.h>
 
 #include "x11drv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(gdi);
+WINE_DEFAULT_DEBUG_CHANNEL(gdi);
 
 
 /***********************************************************************
diff --git a/graphics/x11drv/opengl.c b/graphics/x11drv/opengl.c
index c4eb37f827b..3389977b4a4 100644
--- a/graphics/x11drv/opengl.c
+++ b/graphics/x11drv/opengl.c
@@ -3,6 +3,19 @@
  *
  * Copyright 2000 Lionel Ulmer
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -12,12 +25,12 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "gdi.h"
 #include "x11drv.h"
 #include "wine_gl.h"
 
-DEFAULT_DEBUG_CHANNEL(opengl);
+WINE_DEFAULT_DEBUG_CHANNEL(opengl);
 
 #ifdef HAVE_OPENGL
 
diff --git a/graphics/x11drv/palette.c b/graphics/x11drv/palette.c
index a23f13c2a4a..a711541f50a 100644
--- a/graphics/x11drv/palette.c
+++ b/graphics/x11drv/palette.c
@@ -3,6 +3,19 @@
  *
  * Copyright 1994, 1995 Alexandre Julliard
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -13,14 +26,14 @@
 #include <string.h>
 
 #include "color.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "gdi.h"
 #include "palette.h"
 #include "windef.h"
 #include "winreg.h"
 #include "x11drv.h"
 
-DEFAULT_DEBUG_CHANNEL(palette);
+WINE_DEFAULT_DEBUG_CHANNEL(palette);
 
 /* Palette indexed mode:
  *	logical palette -> mapping -> pixel
diff --git a/graphics/x11drv/pen.c b/graphics/x11drv/pen.c
index a2d14e141ef..508366c5b9d 100644
--- a/graphics/x11drv/pen.c
+++ b/graphics/x11drv/pen.c
@@ -2,14 +2,28 @@
  * X11DRV pen objects
  *
  * Copyright 1993 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
 
 #include "x11drv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(x11drv);
+WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
 
 static const char PEN_dash[]       = { 16,8 };
 static const char PEN_dot[]        = { 4,4 };
diff --git a/graphics/x11drv/text.c b/graphics/x11drv/text.c
index f01453fd6f0..6b91eb1c4fa 100644
--- a/graphics/x11drv/text.c
+++ b/graphics/x11drv/text.c
@@ -2,6 +2,20 @@
  * X11 graphics driver text functions
  *
  * Copyright 1993,1994 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -18,9 +32,9 @@
 #include "gdi.h"
 #include "x11font.h"
 #include "bitmap.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(text);
+WINE_DEFAULT_DEBUG_CHANNEL(text);
 
 #define SWAP_INT(a,b)  { int t = a; a = b; b = t; }
 #define IROUND(x) (int)((x)>0? (x)+0.5 : (x) - 0.5)
diff --git a/graphics/x11drv/xfont.c b/graphics/x11drv/xfont.c
index 5af32f57547..e34e33b3379 100644
--- a/graphics/x11drv/xfont.c
+++ b/graphics/x11drv/xfont.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1997 Alex Korobka
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * TODO: Mapping algorithm tweaks, FO_SYNTH_... flags (ExtTextOut() will
  *	 have to be changed for that), dynamic font loading (FreeType).
  */
@@ -27,13 +41,13 @@
 #include "winnls.h"
 #include "winreg.h"
 #include "font.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "user.h" /* for TWEAK_WineLook (FIXME) */
 #include "x11font.h"
 #include "wine/server.h"
 #include "wine/unicode.h"
 
-DEFAULT_DEBUG_CHANNEL(font);
+WINE_DEFAULT_DEBUG_CHANNEL(font);
 
 #define X_PFONT_MAGIC		(0xFADE0000)
 #define X_FMC_MAGIC		(0x0000CAFE)
diff --git a/if1632/builtin.c b/if1632/builtin.c
index d8a2df1ff88..4b0238d5bfb 100644
--- a/if1632/builtin.c
+++ b/if1632/builtin.c
@@ -2,6 +2,20 @@
  * Built-in modules
  *
  * Copyright 1996 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
@@ -16,10 +30,10 @@
 #include "module.h"
 #include "miscemu.h"
 #include "stackframe.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "toolhelp.h"
 
-DEFAULT_DEBUG_CHANNEL(module);
+WINE_DEFAULT_DEBUG_CHANNEL(module);
 
 typedef struct
 {
diff --git a/if1632/relay.c b/if1632/relay.c
index 59eaf5cec27..6c6a12bb296 100644
--- a/if1632/relay.c
+++ b/if1632/relay.c
@@ -1,6 +1,20 @@
 /*
  * Copyright 1993 Robert J. Amstadt
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
@@ -15,9 +29,9 @@
 #include "selectors.h"
 #include "builtin16.h"
 #include "syslevel.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(relay);
+WINE_DEFAULT_DEBUG_CHANNEL(relay);
 
 /***********************************************************************
  *           RELAY_Init
diff --git a/if1632/snoop.c b/if1632/snoop.c
index cf7616b72cc..2754c5a15f3 100644
--- a/if1632/snoop.c
+++ b/if1632/snoop.c
@@ -2,6 +2,20 @@
  * 386-specific Win16 dll<->dll snooping functions
  *
  * Copyright 1998 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
@@ -17,9 +31,9 @@
 #include "builtin16.h"
 #include "toolhelp.h"
 #include "snoop.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(snoop);
+WINE_DEFAULT_DEBUG_CHANNEL(snoop);
 
 #ifdef __i386__
 
diff --git a/include/amaudio.h b/include/amaudio.h
index f0488d7e8f2..7125391eeb6 100644
--- a/include/amaudio.h
+++ b/include/amaudio.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2001 Hidenori Takeshima
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_AMAUDIO_H_
 #define __WINE_AMAUDIO_H_
 
diff --git a/include/amvideo.h b/include/amvideo.h
index 50cd4389d0a..48600c71472 100644
--- a/include/amvideo.h
+++ b/include/amvideo.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2001 Hidenori Takeshima
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_AMVIDEO_H_
 #define __WINE_AMVIDEO_H_
 
diff --git a/include/audevcod.h b/include/audevcod.h
index eb53f1e5884..fc17deade1f 100644
--- a/include/audevcod.h
+++ b/include/audevcod.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2001 Hidenori Takeshima
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_AUDEVCOD_H_
 #define __WINE_AUDEVCOD_H_
 
diff --git a/include/basetsd.h b/include/basetsd.h
index 51f15f4a493..31b28017ce1 100644
--- a/include/basetsd.h
+++ b/include/basetsd.h
@@ -1,6 +1,22 @@
 /*
  * Compilers that uses ILP32, LP64 or P64 type models
  * for both Win32 and Win64 are supported by this file.
+ *
+ * Copyright (C) 1999 Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_BASETSD_H
diff --git a/include/bitmap.h b/include/bitmap.h
index 7b9aeb34387..f0683656bcf 100644
--- a/include/bitmap.h
+++ b/include/bitmap.h
@@ -2,6 +2,20 @@
  * GDI bitmap definitions
  *
  * Copyright 1993, 1994  Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_BITMAP_H
diff --git a/include/brush.h b/include/brush.h
index 5ca8b58dc4f..996067c017e 100644
--- a/include/brush.h
+++ b/include/brush.h
@@ -2,6 +2,20 @@
  * GDI brush definitions
  *
  * Copyright 1994 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_BRUSH_H
diff --git a/include/builtin16.h b/include/builtin16.h
index 567c8833cb2..3b9bcc79fc7 100644
--- a/include/builtin16.h
+++ b/include/builtin16.h
@@ -2,6 +2,20 @@
  * Win16 built-in DLLs definitions
  *
  * Copyright 1999 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_BUILTIN16_H
diff --git a/include/callback.h b/include/callback.h
index f06304262b3..f2b634ba449 100644
--- a/include/callback.h
+++ b/include/callback.h
@@ -2,6 +2,20 @@
  * Callback functions
  *
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_CALLBACK_H
diff --git a/include/cderr.h b/include/cderr.h
index b74706a08d1..88938fb8423 100644
--- a/include/cderr.h
+++ b/include/cderr.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 1999 Bertho Stultiens
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_CDERR_H
 #define __WINE_CDERR_H
 
diff --git a/include/cguid.h b/include/cguid.h
index 6e566dd02eb..338ae8ed1f4 100644
--- a/include/cguid.h
+++ b/include/cguid.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2000 Peter Hunnisett
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __CGUID_H__
 #define __CGUID_H__
 
diff --git a/include/clipboard.h b/include/clipboard.h
index dca0f1495f0..7699d2ba6dd 100644
--- a/include/clipboard.h
+++ b/include/clipboard.h
@@ -1,3 +1,23 @@
+/*
+ * Copyright 1994 Martin Ayotte
+ * Copyright 1996 Alex Korobka
+ * Copyright 1999 Noel Borthwick
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_CLIPBOARD_H
 #define __WINE_CLIPBOARD_H
 
diff --git a/include/color.h b/include/color.h
index 3c85e1ea2d5..af63f2feb6d 100644
--- a/include/color.h
+++ b/include/color.h
@@ -1,3 +1,22 @@
+/*
+ * Copyright 1993 Alexandre Julliard
+ * Copyright 1996 Alex Korobka
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_COLOR_H
 #define __WINE_COLOR_H
 
diff --git a/include/comcat.h b/include/comcat.h
index f9e042d2cbe..d76da13f7b9 100644
--- a/include/comcat.h
+++ b/include/comcat.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2000 Francois Gouget
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE__
 #include "rpc.h"
 #include "rpcndr.h"
diff --git a/include/commctrl.h b/include/commctrl.h
index 976a35b49db..2a341fb0e01 100644
--- a/include/commctrl.h
+++ b/include/commctrl.h
@@ -1,5 +1,21 @@
 /*
  * Common controls definitions
+ *
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_COMMCTRL_H
diff --git a/include/commdlg.h b/include/commdlg.h
index 84c9db5150b..0f563fae493 100644
--- a/include/commdlg.h
+++ b/include/commdlg.h
@@ -1,5 +1,21 @@
 /*
  * COMMDLG - Common Wine Dialog ... :-)
+ *
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_COMMDLG_H
diff --git a/include/compobj.h b/include/compobj.h
index d42ac8fad37..ffc2f7927d0 100644
--- a/include/compobj.h
+++ b/include/compobj.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2000 Francois Gouget
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_COMPOBJ_H
 #define __WINE_COMPOBJ_H
 
diff --git a/include/console.h b/include/console.h
index 2793c815f30..9c8589798ed 100644
--- a/include/console.h
+++ b/include/console.h
@@ -1,9 +1,23 @@
-/* console.h */
-/* Copyright 1998 - Joseph Pranevich */
-
-/* Include file for definitions pertaining to Wine's text-console
-   interface. 
-*/
+/*
+ * Include file for definitions pertaining to Wine's text-console
+ * interface.
+ *
+ * Copyright 1998 - Joseph Pranevich
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef __WINE_CONSOLE_H
 #define __WINE_CONSOLE_H
diff --git a/include/control.h b/include/control.h
index c1675d1c211..6d5793d8371 100644
--- a/include/control.h
+++ b/include/control.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2001 Hidenori Takeshima
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_CONTROL_H_
 #define __WINE_CONTROL_H_
 
diff --git a/include/cpl.h b/include/cpl.h
index c0ade8671ed..c9e3461cf01 100644
--- a/include/cpl.h
+++ b/include/cpl.h
@@ -1,4 +1,22 @@
-/* Control panel definitions */
+/*
+ * Control panel definitions
+ *
+ * Copyright (C) 2001 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef _INC_CPL
 #define _INC_CPL
diff --git a/include/cursoricon.h b/include/cursoricon.h
index 878bb832823..8b3944409fc 100644
--- a/include/cursoricon.h
+++ b/include/cursoricon.h
@@ -2,6 +2,20 @@
  * Cursor and icon definitions
  *
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_CURSORICON_H
diff --git a/include/d3d.h b/include/d3d.h
index 5192f879940..c65b1d68767 100644
--- a/include/d3d.h
+++ b/include/d3d.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_D3D_H
 #define __WINE_D3D_H
 
diff --git a/include/d3dcaps.h b/include/d3dcaps.h
index cf196286e00..4b9ab4718d2 100644
--- a/include/d3dcaps.h
+++ b/include/d3dcaps.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2000 Peter Hunnisett
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_D3DCAPS_H
 #define __WINE_D3DCAPS_H
 
diff --git a/include/d3dhal.h b/include/d3dhal.h
index 63df3e7e2b3..b8908e47da4 100644
--- a/include/d3dhal.h
+++ b/include/d3dhal.h
@@ -1,5 +1,23 @@
-/* Direct3D driver interface */
-/* (DirectX 7 version) */
+/*
+ * Direct3D driver interface
+ * (DirectX 7 version)
+ *
+ * Copyright (C) 2001 Ove Kaaven
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef __WINE_D3DHAL_H
 #define __WINE_D3DHAL_H
diff --git a/include/d3dtypes.h b/include/d3dtypes.h
index 346f33affd2..effd5fef557 100644
--- a/include/d3dtypes.h
+++ b/include/d3dtypes.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2000 Peter Hunnisett
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 /* FIXME: Need to add C++ code for certain structs for headers - this is going to be a problem
           if WINE continues to only use C code  - I suppose that we could always inline in
           the header file to get around that little problem... */
diff --git a/include/d3dvec.inl b/include/d3dvec.inl
index 6621b9e1e35..9b4c53f4b09 100644
--- a/include/d3dvec.inl
+++ b/include/d3dvec.inl
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2000 Ove Kaaven
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_D3DVEC_INL
 #define __WINE_D3DVEC_INL
 
diff --git a/include/dce.h b/include/dce.h
index 637cce2285d..f77d7f47dde 100644
--- a/include/dce.h
+++ b/include/dce.h
@@ -2,6 +2,20 @@
  * USER DCE definitions
  *
  * Copyright 1993 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_DCE_H
diff --git a/include/dciddi.h b/include/dciddi.h
index 8c430f59c42..c5708e26880 100644
--- a/include/dciddi.h
+++ b/include/dciddi.h
@@ -1,4 +1,22 @@
-/* DCI driver interface */
+/*
+ * DCI driver interface
+ *
+ * Copyright (C) 2001 Ove Kaaven
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef __WINE_DCIDDI_H
 #define __WINE_DCIDDI_H
diff --git a/include/dde.h b/include/dde.h
index b8bf1bc4020..7062c903bdf 100644
--- a/include/dde.h
+++ b/include/dde.h
@@ -2,10 +2,21 @@
  * Copyright 1995, Technion, Israel Institute of Technology
  * Electrical Eng, Software Lab.
  * Author:    Michael Veksler.
- ***************************************************************************
- * File:      dde.h
  * Purpose:   dde declarations
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *****************************************************************************
  */
 #ifndef __WINE_DDE_H
diff --git a/include/ddeml.h b/include/ddeml.h
index c495583f886..b055f8f13bd 100644
--- a/include/ddeml.h
+++ b/include/ddeml.h
@@ -3,6 +3,20 @@
  *
  * Copyright 1997 Alexandre Julliard
  * Copyright 1997 Len White
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_DDEML_H
diff --git a/include/ddraw.h b/include/ddraw.h
index 78622cbcce1..7ac35da0d42 100644
--- a/include/ddraw.h
+++ b/include/ddraw.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_DDRAW_H
 #define __WINE_DDRAW_H
 
diff --git a/include/ddrawi.h b/include/ddrawi.h
index b2d5d22e627..6f907ad1133 100644
--- a/include/ddrawi.h
+++ b/include/ddrawi.h
@@ -1,5 +1,23 @@
-/* DirectDraw driver interface */
-/* (DirectX 7 version) */
+/*
+ * DirectDraw driver interface
+ * (DirectX 7 version)
+ *
+ * Copyright (C) 2001 Ove Kaaven
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef __WINE_DDRAWI_H
 #define __WINE_DDRAWI_H
diff --git a/include/digitalv.h b/include/digitalv.h
index 2adf5eaafa8..1d2356f5f6f 100644
--- a/include/digitalv.h
+++ b/include/digitalv.h
@@ -1,4 +1,20 @@
-/* -*- tab-width: 8; c-basic-offset: 4 -*- */
+/*
+ * Copyright (C) 1999 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef __WINE_DIGITALV_H
 #define __WINE_DIGITALV_H
diff --git a/include/dinput.h b/include/dinput.h
index 0e23aa06936..d8ce8d15cf2 100644
--- a/include/dinput.h
+++ b/include/dinput.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_DINPUT_H
 #define __WINE_DINPUT_H
 
diff --git a/include/dispdib.h b/include/dispdib.h
index 7304cf05927..aaae52c0f31 100644
--- a/include/dispdib.h
+++ b/include/dispdib.h
@@ -3,6 +3,19 @@
  * 
  * Copyright 1998 Ove KÅven
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_DISPDIB_H
diff --git a/include/dlgs.h b/include/dlgs.h
index 8296eb0b999..74c57723363 100644
--- a/include/dlgs.h
+++ b/include/dlgs.h
@@ -1,6 +1,22 @@
-/******************************************************************************
-* dlgs.h -      Common dialog's dialog control ID numbers                     *
-******************************************************************************/
+/*
+ * Common dialog's dialog control ID numbers
+ *
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef __WINE_DLGS_H
 #define __WINE_DLGS_H
diff --git a/include/docobj.h b/include/docobj.h
index 04b26e705fb..7b0e54f3135 100644
--- a/include/docobj.h
+++ b/include/docobj.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 1999 Paul Quinn
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE__
 #include "rpc.h"
 #include "rpcndr.h"
diff --git a/include/dplay.h b/include/dplay.h
index 2ccbb709820..452408476ac 100644
--- a/include/dplay.h
+++ b/include/dplay.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_DPLAY_H
 #define __WINE_DPLAY_H
 
diff --git a/include/dplobby.h b/include/dplobby.h
index cc170e2aaed..289220bab9e 100644
--- a/include/dplobby.h
+++ b/include/dplobby.h
@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 1999 Francois Gouget
+ * Copyright (C) 1999 Peter Hunnisett
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_DPLOBBY_H
 #define __WINE_DPLOBBY_H
 
diff --git a/include/drive.h b/include/drive.h
index 4673d75a603..c69a599554f 100644
--- a/include/drive.h
+++ b/include/drive.h
@@ -2,6 +2,20 @@
  * DOS drive handling declarations
  *
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_DRIVE_H
diff --git a/include/dsdriver.h b/include/dsdriver.h
index e485c957227..8426ea60aaa 100644
--- a/include/dsdriver.h
+++ b/include/dsdriver.h
@@ -1,5 +1,23 @@
-/* DirectSound driver */
-/* (DirectX 5 version) */
+/*
+ * DirectSound driver
+ * (DirectX 5 version)
+ *
+ * Copyright (C) 2000 Ove Kaaven
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef __WINE_DSDRIVER_H
 #define __WINE_DSDRIVER_H
diff --git a/include/dshow.h b/include/dshow.h
index a2e50644cd9..7dbc49c4b05 100644
--- a/include/dshow.h
+++ b/include/dshow.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2001 Hidenori Takeshima
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_DSHOW_H
 #define __WINE_DSHOW_H
 
diff --git a/include/dsound.h b/include/dsound.h
index 0673c9b2160..3a7311d2e47 100644
--- a/include/dsound.h
+++ b/include/dsound.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_DSOUND_H
 #define __WINE_DSOUND_H
 
diff --git a/include/enhmetafiledrv.h b/include/enhmetafiledrv.h
index 34acd04b272..334ff7c3341 100644
--- a/include/enhmetafiledrv.h
+++ b/include/enhmetafiledrv.h
@@ -1,5 +1,21 @@
 /*
  * Enhanced MetaFile driver definitions
+ *
+ * Copyright 1999 Huw D M Davies
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_ENHMETAFILEDRV_H
diff --git a/include/errors.h b/include/errors.h
index 9ea1ce267c4..9efbc87ef69 100644
--- a/include/errors.h
+++ b/include/errors.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2001 Hidenori Takeshima
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef	WINE_DSHOW_ERRORS_H
 #define	WINE_DSHOW_ERRORS_H
 
diff --git a/include/evcode.h b/include/evcode.h
index bc7e04a62f3..1032bc0f9a6 100644
--- a/include/evcode.h
+++ b/include/evcode.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2001 Hidenori Takeshima
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_EVCODE_H
 #define __WINE_EVCODE_H
 
diff --git a/include/file.h b/include/file.h
index 815501efb04..9f15f449733 100644
--- a/include/file.h
+++ b/include/file.h
@@ -2,6 +2,20 @@
  * File handling declarations
  *
  * Copyright 1996 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_FILE_H
diff --git a/include/font.h b/include/font.h
index 2ed53f538d2..93a754976fc 100644
--- a/include/font.h
+++ b/include/font.h
@@ -2,6 +2,20 @@
  * GDI font definitions
  *
  * Copyright 1994 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_FONT_H
diff --git a/include/gdi.h b/include/gdi.h
index 5812aabed27..4ae82895f68 100644
--- a/include/gdi.h
+++ b/include/gdi.h
@@ -2,6 +2,20 @@
  * GDI definitions
  *
  * Copyright 1993 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_GDI_H
diff --git a/include/global.h b/include/global.h
index 89bd38b6b21..b8984d5669f 100644
--- a/include/global.h
+++ b/include/global.h
@@ -2,6 +2,20 @@
  * Global heap declarations
  *
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_GLOBAL_H
diff --git a/include/guiddef.h b/include/guiddef.h
index e91ce2c1b85..310cf61feb6 100644
--- a/include/guiddef.h
+++ b/include/guiddef.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2000 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef GUID_DEFINED
 #define GUID_DEFINED
 typedef struct _GUID
diff --git a/include/heap.h b/include/heap.h
index da35319429b..cdeb5516c60 100644
--- a/include/heap.h
+++ b/include/heap.h
@@ -2,6 +2,20 @@
  * Win32 heap definitions
  *
  * Copyright 1996 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_HEAP_H
diff --git a/include/hook.h b/include/hook.h
index 24bdb2b2089..c91edf12c7f 100644
--- a/include/hook.h
+++ b/include/hook.h
@@ -2,6 +2,20 @@
  * Windows hook definitions
  *
  * Copyright 1994 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_HOOK_H
diff --git a/include/imagehlp.h b/include/imagehlp.h
index 442a47c758e..05741716767 100644
--- a/include/imagehlp.h
+++ b/include/imagehlp.h
@@ -1,5 +1,21 @@
 /*
- *      imagehlp.h   -       Declarations for IMAGEHLP
+ * Declarations for IMAGEHLP
+ *
+ * Copyright (C) 1998 Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_IMAGEHLP_H
diff --git a/include/imm.h b/include/imm.h
index f893464729f..937a1182e52 100644
--- a/include/imm.h
+++ b/include/imm.h
@@ -1,5 +1,21 @@
 /*
- *	imm.h	-	Declarations for IMM32
+ * Declarations for IMM32
+ *
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_IMM_H
diff --git a/include/initguid.h b/include/initguid.h
index cec8b20e1e0..53993eb426b 100644
--- a/include/initguid.h
+++ b/include/initguid.h
@@ -1,9 +1,25 @@
 /*
- * defines a minimum set of macros create GUID's to keep the size 
+ * Defines a minimum set of macros create GUID's to keep the size 
  * small
  *
- * this file should be included into "only GUID definition *.h" like
+ * This file should be included into "only GUID definition *.h" like
  * shlguid.h
+ *
+ * Copyright (C) 1999 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define INITGUID
diff --git a/include/input.h b/include/input.h
index 6b02ef1ff05..ab657ce4dfc 100644
--- a/include/input.h
+++ b/include/input.h
@@ -2,6 +2,20 @@
  * USER input header file
  * Copyright 1997 David Faure
  *
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_INPUT_H
diff --git a/include/instance.h b/include/instance.h
index 324cbf2de5a..93d4f08ecdb 100644
--- a/include/instance.h
+++ b/include/instance.h
@@ -2,6 +2,20 @@
  * Instance data declaration
  *
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_INSTANCE_H
diff --git a/include/lmcons.h b/include/lmcons.h
index dd780871a7b..8012bb8cbec 100644
--- a/include/lmcons.h
+++ b/include/lmcons.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 1999 Rein Klazes
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_LMCONS_H
 #define __WINE_LMCONS_H
 
diff --git a/include/local.h b/include/local.h
index 66ee895b4d3..964ba4bf861 100644
--- a/include/local.h
+++ b/include/local.h
@@ -2,6 +2,20 @@
  * Local heap declarations
  *
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_LOCAL_H
diff --git a/include/lzexpand.h b/include/lzexpand.h
index 27d50ebc67c..ffca935b33f 100644
--- a/include/lzexpand.h
+++ b/include/lzexpand.h
@@ -1,7 +1,20 @@
 /* Includefile for the decompression library, lzexpand
  *
  * Copyright 1996 Marcus Meissner
- * FIXME: Who's copyright are the prototypes?
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_LZEXPAND_H
diff --git a/include/mapi.h b/include/mapi.h
index b063ea20ed7..e70652e0388 100644
--- a/include/mapi.h
+++ b/include/mapi.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2000 François Gouget
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef MAPI_H
 #define MAPI_H
 
diff --git a/include/mapicode.h b/include/mapicode.h
index 4795c0282cf..6a7a75ba602 100644
--- a/include/mapicode.h
+++ b/include/mapicode.h
@@ -1,5 +1,21 @@
 /*
- * status codes returned by MAPI
+ * Status codes returned by MAPI
+ *
+ * Copyright (C) 2002 Aric Stewart
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef MAPICODE_H
diff --git a/include/mapidefs.h b/include/mapidefs.h
index a2fee6bb7c5..7e378378550 100644
--- a/include/mapidefs.h
+++ b/include/mapidefs.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 1998 Justin Bradford
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_MAPIDEFS_H
 #define __WINE_MAPIDEFS_H
 
diff --git a/include/mciavi.h b/include/mciavi.h
index 44116a32107..ba39bbc251d 100644
--- a/include/mciavi.h
+++ b/include/mciavi.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2001 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #define MCI_MCIAVI_PLAY_WINDOW		0x01000000L
 #define MCI_MCIAVI_PLAY_FULLSCREEN	0x02000000L
 #define MCI_MCIAVI_PLAY_FULLBY2		0x04000000L
diff --git a/include/mcx.h b/include/mcx.h
index 8de99a66470..8062ef60809 100644
--- a/include/mcx.h
+++ b/include/mcx.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2000 Francois Gouget
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_MCX_H
 #define __WINE_MCX_H
 
diff --git a/include/message.h b/include/message.h
index c5f80bc97e0..e1aa0c19dc4 100644
--- a/include/message.h
+++ b/include/message.h
@@ -2,6 +2,20 @@
  * Message definitions
  *
  * Copyright 1993 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_MESSAGE_H
diff --git a/include/metafile.h b/include/metafile.h
index 7b4d6a67905..420306768a3 100644
--- a/include/metafile.h
+++ b/include/metafile.h
@@ -2,6 +2,20 @@
  * Metafile definitions
  *
  * Copyright  David W. Metcalfe, 1994
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_METAFILE_H
diff --git a/include/minmax.h b/include/minmax.h
index 0367857f46a..03494962346 100644
--- a/include/minmax.h
+++ b/include/minmax.h
@@ -2,6 +2,20 @@
  * min/max macros
  *
  * Copyright 2001 Francois Gouget
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_MINMAX_H
diff --git a/include/miscemu.h b/include/miscemu.h
index a02d80e8e92..e1e86284d2d 100644
--- a/include/miscemu.h
+++ b/include/miscemu.h
@@ -2,6 +2,20 @@
  * Misc. emulation definitions
  *
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_MISCEMU_H
diff --git a/include/mmddk.h b/include/mmddk.h
index 67e69e6daad..2b98e638e71 100644
--- a/include/mmddk.h
+++ b/include/mmddk.h
@@ -4,10 +4,23 @@
  * Copyright 1998, Luiz Otavio L. Zorzella
  *           1999, Eric Pouech
  *
- * File:      mmddk.h
  * Purpose:   multimedia declarations (external to WINMM & MMSYSTEM DLLs
  *                                     for other DLLs (MCI, drivers...))
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  *****************************************************************************
  */
 #ifndef __MMDDK_H 
diff --git a/include/mmreg.h b/include/mmreg.h
index 879a625e29f..b8991694512 100644
--- a/include/mmreg.h
+++ b/include/mmreg.h
@@ -1,5 +1,21 @@
 /*
- *      mmreg.h   -       Declarations for MultiMedia-REGistration
+ * Declarations for MultiMedia-REGistration
+ *
+ * Copyright (C) 1999 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_MMREG_H
diff --git a/include/mmsystem.h b/include/mmsystem.h
index 405f55c1c07..467258ab16f 100644
--- a/include/mmsystem.h
+++ b/include/mmsystem.h
@@ -1,5 +1,21 @@
-/* 
+/*
  * MMSYSTEM - Multimedia Wine Extension ... :-)
+ *
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_MMSYSTEM_H
diff --git a/include/module.h b/include/module.h
index b98bcd5824b..8c5b360b035 100644
--- a/include/module.h
+++ b/include/module.h
@@ -2,6 +2,20 @@
  * Module definitions
  *
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_MODULE_H
diff --git a/include/msacm.h b/include/msacm.h
index a98915215a5..b7c205a7db0 100644
--- a/include/msacm.h
+++ b/include/msacm.h
@@ -1,5 +1,21 @@
 /*
- *      msacm.h   -       Declarations for MSACM
+ * Declarations for MSACM
+ *
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_MSACM_H
diff --git a/include/msacmdlg.h b/include/msacmdlg.h
index c6c97e67fc0..6f8ab688cd8 100644
--- a/include/msacmdlg.h
+++ b/include/msacmdlg.h
@@ -1,4 +1,22 @@
-/* msacmdlg.h definitions for MSACM dialog boxes */
+/*
+ * definitions for MSACM dialog boxes
+ *
+ * Copyright (C) 2001 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #define DLG_ACMFORMATCHOOSE_ID              70
 #define IDD_ACMFORMATCHOOSE_BTN_HELP        9
diff --git a/include/msdos.h b/include/msdos.h
index 9e6dfa3d2be..fca4c06196b 100644
--- a/include/msdos.h
+++ b/include/msdos.h
@@ -1,3 +1,22 @@
+/*
+ * Copyright 1994 Erik Bos
+ * Copyright 1999 Ove Kaaven
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_MSDOS_H
 #define __WINE_MSDOS_H
 
diff --git a/include/msvcrt/crtdbg.h b/include/msvcrt/crtdbg.h
index 78c2e17886b..2e6adb5c96c 100644
--- a/include/msvcrt/crtdbg.h
+++ b/include/msvcrt/crtdbg.h
@@ -2,6 +2,20 @@
  * Debug API
  *
  * Copyright 2001 Francois Gouget.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #ifndef __WINE_CRTDBG_H_
 #define __WINE_CRTDBG_H_
diff --git a/include/msvcrt/eh.h b/include/msvcrt/eh.h
index becf989dea0..001517298eb 100644
--- a/include/msvcrt/eh.h
+++ b/include/msvcrt/eh.h
@@ -2,6 +2,20 @@
  * C++ exception handling facility
  *
  * Copyright 2000 Francois Gouget.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #ifndef __WINE_EH_H
 #define __WINE_EH_H
diff --git a/include/msvcrt/excpt.h b/include/msvcrt/excpt.h
index e57f90ab925..6faf3fae92d 100644
--- a/include/msvcrt/excpt.h
+++ b/include/msvcrt/excpt.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2002 Peter Hunnisett
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_EXCPT_H
 #define __WINE_EXCPT_H
 
diff --git a/include/msvcrt/locale.h b/include/msvcrt/locale.h
index 6db787b6c95..f57a0735511 100644
--- a/include/msvcrt/locale.h
+++ b/include/msvcrt/locale.h
@@ -2,6 +2,20 @@
  * Locale definitions
  *
  * Copyright 2000 Francois Gouget.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #ifndef __WINE_LOCALE_H
 #define __WINE_LOCALE_H
diff --git a/include/msvcrt/malloc.h b/include/msvcrt/malloc.h
index d458bebc8d3..54fd99bc584 100644
--- a/include/msvcrt/malloc.h
+++ b/include/msvcrt/malloc.h
@@ -2,6 +2,20 @@
  * Heap definitions
  *
  * Copyright 2001 Francois Gouget.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #ifndef __WINE_MALLOC_H
 #define __WINE_MALLOC_H
diff --git a/include/msvcrt/mbctype.h b/include/msvcrt/mbctype.h
index 6060ef36cc8..336f4c44147 100644
--- a/include/msvcrt/mbctype.h
+++ b/include/msvcrt/mbctype.h
@@ -2,6 +2,20 @@
  * Multibyte char definitions
  *
  * Copyright 2001 Francois Gouget.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #ifndef __WINE_MBCTYPE_H
 #define __WINE_MBCTYPE_H
diff --git a/include/msvcrt/mbstring.h b/include/msvcrt/mbstring.h
index 8738a357e78..bef7396456f 100644
--- a/include/msvcrt/mbstring.h
+++ b/include/msvcrt/mbstring.h
@@ -2,6 +2,20 @@
  * Multibyte string definitions
  *
  * Copyright 2001 Francois Gouget.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #ifndef __WINE_MBSTRING_H
 #define __WINE_MBSTRING_H
diff --git a/include/msvcrt/search.h b/include/msvcrt/search.h
index ea6526ae7a8..ff54a373d4b 100644
--- a/include/msvcrt/search.h
+++ b/include/msvcrt/search.h
@@ -2,6 +2,20 @@
  * Heap definitions
  *
  * Copyright 2001 Francois Gouget.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #ifndef __WINE_SEARCH_H
 #define __WINE_SEARCH_H
diff --git a/include/msvcrt/setjmp.h b/include/msvcrt/setjmp.h
index c234a78415b..28391f2cf4d 100644
--- a/include/msvcrt/setjmp.h
+++ b/include/msvcrt/setjmp.h
@@ -2,6 +2,20 @@
  * Setjmp/Longjmp definitions
  *
  * Copyright 2001 Francois Gouget.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #ifndef __WINE_SETJMP_H
 #define __WINE_SETJMP_H
diff --git a/include/msvcrt/stddef.h b/include/msvcrt/stddef.h
index a3bef9e34a9..ea8516bbb7b 100644
--- a/include/msvcrt/stddef.h
+++ b/include/msvcrt/stddef.h
@@ -2,6 +2,20 @@
  * Time definitions
  *
  * Copyright 2000 Francois Gouget.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #ifndef __WINE_STDDEF_H
 #define __WINE_STDDEF_H
diff --git a/include/msvcrt/sys/timeb.h b/include/msvcrt/sys/timeb.h
index beae8c75639..eac101d579f 100644
--- a/include/msvcrt/sys/timeb.h
+++ b/include/msvcrt/sys/timeb.h
@@ -2,6 +2,20 @@
  * Path and directory definitions
  *
  * Copyright 2000 Francois Gouget.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #ifndef __WINE_SYS_TIMEB_H
 #define __WINE_SYS_TIMEB_H
diff --git a/include/msvcrt/sys/types.h b/include/msvcrt/sys/types.h
index 5ca2e7c9ca4..3354e6ee534 100644
--- a/include/msvcrt/sys/types.h
+++ b/include/msvcrt/sys/types.h
@@ -2,6 +2,20 @@
  * _stat() definitions
  *
  * Copyright 2000 Francois Gouget.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #ifndef __WINE_SYS_TYPES_H
 #define __WINE_SYS_TYPES_H
diff --git a/include/msvcrt/sys/utime.h b/include/msvcrt/sys/utime.h
index d1cfba3a499..225922b7f3b 100644
--- a/include/msvcrt/sys/utime.h
+++ b/include/msvcrt/sys/utime.h
@@ -2,6 +2,20 @@
  * Path and directory definitions
  *
  * Copyright 2000 Francois Gouget.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #ifndef __WINE_SYS_UTIME_H
 #define __WINE_SYS_UTIME_H
diff --git a/include/msvcrt/time.h b/include/msvcrt/time.h
index 97b1f821eae..4f4113d72ea 100644
--- a/include/msvcrt/time.h
+++ b/include/msvcrt/time.h
@@ -2,6 +2,20 @@
  * Time definitions
  *
  * Copyright 2000 Francois Gouget.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #ifndef __WINE_TIME_H
 #define __WINE_TIME_H
diff --git a/include/msvcrt/wctype.h b/include/msvcrt/wctype.h
index 98b47378b4f..ff0cc4ed433 100644
--- a/include/msvcrt/wctype.h
+++ b/include/msvcrt/wctype.h
@@ -2,6 +2,20 @@
  * Unicode definitions
  *
  * Copyright 2000 Francois Gouget.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #ifndef __WINE_WCTYPE_H
 #define __WINE_WCTYPE_H
diff --git a/include/nb30.h b/include/nb30.h
index 4526d00894b..b04a11b853d 100644
--- a/include/nb30.h
+++ b/include/nb30.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2001 Mike McCormack
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef NCB_INCLUDED
 #define NCB_INCLUDED
 
diff --git a/include/netspi.h b/include/netspi.h
index e2464c86265..a1e9e188b73 100644
--- a/include/netspi.h
+++ b/include/netspi.h
@@ -1,5 +1,21 @@
 /*
  * MPR - Network provider services
+ *
+ * Copyright (C) 1999 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef _NETSPI_H_
diff --git a/include/nonclient.h b/include/nonclient.h
index 2d928a4c587..7935a4cd86d 100644
--- a/include/nonclient.h
+++ b/include/nonclient.h
@@ -2,6 +2,20 @@
  * Window non-client functions definitions
  *
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_NONCLIENT_H
diff --git a/include/nspapi.h b/include/nspapi.h
index e83447fa594..64c1b8ff3c1 100644
--- a/include/nspapi.h
+++ b/include/nspapi.h
@@ -1,5 +1,21 @@
 /* NSPAPI.H -- winsock 1.1
  * not supported on win95
+ *
+ * Copyright (C) 2001 Stefan Leichter
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef _WINE_NSPAPI_
diff --git a/include/ntddcdrm.h b/include/ntddcdrm.h
index cd3f3f3dea3..e0902dd31b8 100644
--- a/include/ntddcdrm.h
+++ b/include/ntddcdrm.h
@@ -1,4 +1,22 @@
-/* DDK information for CD ROM */
+/*
+ * DDK information for CD ROM
+ *
+ * Copyright (C) 2002 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef __NTDDCDRM_H
 #define __NTDDCDRM_H
diff --git a/include/ntddk.h b/include/ntddk.h
index 5d07690dc5c..071c109d955 100644
--- a/include/ntddk.h
+++ b/include/ntddk.h
@@ -1,8 +1,24 @@
 /*
-	this file defines interfaces mainly exposed to device drivers and
-	native nt dll's
+ * this file defines interfaces mainly exposed to device drivers and
+ * native nt dlls
+ *
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
-*/
 #ifndef __WINE_NTDDK_H
 #define __WINE_NTDDK_H
 
diff --git a/include/ntddstor.h b/include/ntddstor.h
index cbc9b5d2214..1f8f1340498 100644
--- a/include/ntddstor.h
+++ b/include/ntddstor.h
@@ -1,4 +1,22 @@
-/* DDK definitions for storage media access */
+/*
+ * DDK definitions for storage media access
+ *
+ * Copyright (C) 2002 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef _NTDDSTOR_H_
 #define _NTDDSTOR_H_
diff --git a/include/ntdef.h b/include/ntdef.h
index 742f32a0f20..21f3e0bbb79 100644
--- a/include/ntdef.h
+++ b/include/ntdef.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 1999 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_NTDEF_H
 #define __WINE_NTDEF_H
 
diff --git a/include/ntsecapi.h b/include/ntsecapi.h
index 814ffbc4695..b7765e2bac6 100644
--- a/include/ntsecapi.h
+++ b/include/ntsecapi.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 1999 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_NTSECAPI_H
 #define __WINE_NTSECAPI_H
 
diff --git a/include/oaidl.h b/include/oaidl.h
index d2b92914e15..363f356f1ed 100644
--- a/include/oaidl.h
+++ b/include/oaidl.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 1999 Francis Beaudet
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE__
 #include "rpc.h"
 #include "rpcndr.h"
diff --git a/include/objbase.h b/include/objbase.h
index a6d3312e40f..9484adb06a3 100644
--- a/include/objbase.h
+++ b/include/objbase.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 1998 François Gouget
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_OBJBASE_H
 #define __WINE_OBJBASE_H
 
diff --git a/include/objidl.h b/include/objidl.h
index e4fa1ebd5ea..0ff74b68315 100644
--- a/include/objidl.h
+++ b/include/objidl.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE__
 #include "rpc.h"
 #include "rpcndr.h"
diff --git a/include/ocidl.h b/include/ocidl.h
index 9750614d384..e6bb7e0271b 100644
--- a/include/ocidl.h
+++ b/include/ocidl.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 1999 Francis Beaudet
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE__
 #include "rpc.h"
 #include "rpcndr.h"
diff --git a/include/ole.h b/include/ole.h
index a048b4d0ef0..8f00d262838 100644
--- a/include/ole.h
+++ b/include/ole.h
@@ -1,5 +1,21 @@
 /*
- *	ole.h	-	Declarations for OLESVR and OLECLI
+ * Declarations for OLESVR and OLECLI
+ *
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_OLE_H
diff --git a/include/ole2.h b/include/ole2.h
index c0f1cb3be81..582fe319d8b 100644
--- a/include/ole2.h
+++ b/include/ole2.h
@@ -1,5 +1,21 @@
 /*
- *	ole2.h - Declarations for OLE2
+ * Declarations for OLE2
+ *
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_OLE2_H
diff --git a/include/ole2ver.h b/include/ole2ver.h
index 6844ab52c7f..037ab190b2c 100644
--- a/include/ole2ver.h
+++ b/include/ole2ver.h
@@ -1,5 +1,21 @@
 /*
- *  ole2ver.h - Version number info
+ * Version number info
+ *
+ * Copyright (C) 1999 Paul Quinn
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_OLE2VER_H
diff --git a/include/oleauto.h b/include/oleauto.h
index 672aedb085a..0badc6dc0ec 100644
--- a/include/oleauto.h
+++ b/include/oleauto.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_OLEAUTO_H
 #define __WINE_OLEAUTO_H
 
diff --git a/include/olectl.h b/include/olectl.h
index a57ae832768..83d78ba9af9 100644
--- a/include/olectl.h
+++ b/include/olectl.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_OLECTL_H
 #define __WINE_OLECTL_H
 
diff --git a/include/oledlg.h b/include/oledlg.h
index 4ee424807d1..5ef5ea1e88a 100644
--- a/include/oledlg.h
+++ b/include/oledlg.h
@@ -1,5 +1,21 @@
 /*
- *	oledlg.h	-	Declarations for OLEDLG
+ * Declarations for OLEDLG
+ *
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_OLEDLG_H
diff --git a/include/oleidl.h b/include/oleidl.h
index 4a705d555f3..84684c2b669 100644
--- a/include/oleidl.h
+++ b/include/oleidl.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 1999 Francis Beaudet
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE__
 #include "rpc.h"
 #include "rpcndr.h"
diff --git a/include/options.h b/include/options.h
index 00f6a459d59..88e543d9f27 100644
--- a/include/options.h
+++ b/include/options.h
@@ -2,6 +2,20 @@
  * Command-line options.
  *
  * Copyright 1994 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_OPTIONS_H
diff --git a/include/palette.h b/include/palette.h
index a7011f1ad4c..1c024269740 100644
--- a/include/palette.h
+++ b/include/palette.h
@@ -2,6 +2,20 @@
  * GDI palette definitions
  *
  * Copyright 1994 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_PALETTE_H
diff --git a/include/path.h b/include/path.h
index bdea087fa64..944121e6ecd 100644
--- a/include/path.h
+++ b/include/path.h
@@ -2,6 +2,20 @@
  * Graphics paths (BeginPath, EndPath etc.)
  *
  * Copyright 1997, 1998 Martin Boehme
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_PATH_H
diff --git a/include/pen.h b/include/pen.h
index 7f89ec3b3e5..75a73bbd211 100644
--- a/include/pen.h
+++ b/include/pen.h
@@ -2,6 +2,20 @@
  * GDI pen definitions
  *
  * Copyright 1994 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_PEN_H
diff --git a/include/poppack.h b/include/poppack.h
index 50dc5b51b9d..82c83c6f97c 100644
--- a/include/poppack.h
+++ b/include/poppack.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 1999 Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #if defined(__WINE_PSHPACK_H3)
 #  ifndef __WINE_INTERNAL_POPPACK
 #    undef __WINE_PSHPACK_H3
diff --git a/include/prsht.h b/include/prsht.h
index 205384235c9..0f52bd6e564 100644
--- a/include/prsht.h
+++ b/include/prsht.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_PRSHT_H
 #define __WINE_PRSHT_H
 
diff --git a/include/psapi.h b/include/psapi.h
index 8fedeb1f399..79f57d5b10e 100644
--- a/include/psapi.h
+++ b/include/psapi.h
@@ -1,5 +1,21 @@
 /*
- *      psapi.h        -       Declarations for PSAPI
+ * Declarations for PSAPI
+ *
+ * Copyright (C) 1998 Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_PSAPI_H
diff --git a/include/pshpack1.h b/include/pshpack1.h
index a2947087104..54a1ababd65 100644
--- a/include/pshpack1.h
+++ b/include/pshpack1.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 1999 Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #if defined(__WINE_PSHPACK_H3)
 
    /* Depth > 3 */
diff --git a/include/pshpack2.h b/include/pshpack2.h
index acc9798da01..060642ec8da 100644
--- a/include/pshpack2.h
+++ b/include/pshpack2.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 1999 Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #if defined(__WINE_PSHPACK_H3)
 
    /* Depth > 3 */
diff --git a/include/pshpack4.h b/include/pshpack4.h
index 336c77ccbe3..7f19dfc42a4 100644
--- a/include/pshpack4.h
+++ b/include/pshpack4.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 1999 Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #if defined(__WINE_PSHPACK_H3)
 
    /* Depth > 3 */
diff --git a/include/pshpack8.h b/include/pshpack8.h
index 5d12ba33ec8..59d7a9284ad 100644
--- a/include/pshpack8.h
+++ b/include/pshpack8.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 1999 Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #if defined(__WINE_PSHPACK_H3)
 
    /* Depth > 3 */
diff --git a/include/queue.h b/include/queue.h
index 9a14ccdd6e8..996e1d6b59c 100644
--- a/include/queue.h
+++ b/include/queue.h
@@ -2,6 +2,20 @@
  * Message queues definitions
  *
  * Copyright 1993 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_QUEUE_H
diff --git a/include/ras.h b/include/ras.h
index c2edf74983e..77b864bd0c3 100644
--- a/include/ras.h
+++ b/include/ras.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 1998 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_RAS_H
 #define __WINE_RAS_H
 
diff --git a/include/region.h b/include/region.h
index 0370c5f99e5..e66f9a69a3d 100644
--- a/include/region.h
+++ b/include/region.h
@@ -2,6 +2,20 @@
  * GDI region definitions
  *
  * Copyright 1998 Huw Davies
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_REGION_H
diff --git a/include/regstr.h b/include/regstr.h
index 21f263b6a98..8ccd18f94fb 100644
--- a/include/regstr.h
+++ b/include/regstr.h
@@ -1,6 +1,23 @@
 /*
- * 		Win32 registry string defines (see also winnt.h)
+ * Win32 registry string defines (see also winnt.h)
+ *
+ * Copyright (C) 2000 Andreas Mohr
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 #ifndef _INC_REGSTR
 #define _INC_REGSTR
 
diff --git a/include/richedit.h b/include/richedit.h
index ca08bfc25c9..b10a60d6d49 100644
--- a/include/richedit.h
+++ b/include/richedit.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2000 Jean-Claude Batista
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_RICHEDIT_H
 #define __WINE_RICHEDIT_H
 
diff --git a/include/rpc.h b/include/rpc.h
index 1d0c7ab4f18..f553073571b 100644
--- a/include/rpc.h
+++ b/include/rpc.h
@@ -1,7 +1,23 @@
-/**************************************
+/*
  *    RPC interface
  *
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 #if !defined(RPC_NO_WINDOWS_H) && !defined(__WINE__)
 #include "windows.h"
 #endif
diff --git a/include/rpcdce.h b/include/rpcdce.h
index f033297f7a5..02912b9f6fe 100644
--- a/include/rpcdce.h
+++ b/include/rpcdce.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2000 Francois Gouget
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_RPCDCE_H
 #define __WINE_RPCDCE_H
 
diff --git a/include/rpcdcep.h b/include/rpcdcep.h
index ac005248196..eaf0a7594bd 100644
--- a/include/rpcdcep.h
+++ b/include/rpcdcep.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2000 Francois Gouget
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_RPCDCEP_H
 #define __WINE_RPCDCEP_H
 
diff --git a/include/rpcndr.h b/include/rpcndr.h
index b89c6e05c93..3813a66bdc7 100644
--- a/include/rpcndr.h
+++ b/include/rpcndr.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2000 Francois Gouget
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_RPCNDR_H
 #define __WINE_RPCNDR_H
 
diff --git a/include/rpcnterr.h b/include/rpcnterr.h
index 6bd971754f9..ad342ba7852 100644
--- a/include/rpcnterr.h
+++ b/include/rpcnterr.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2001 Peter Hunnisett
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __RPCNTERR_H__
 #define __RPCNTERR_H__
 
diff --git a/include/rpcproxy.h b/include/rpcproxy.h
index 947dbe6c587..38a5faeaeb4 100644
--- a/include/rpcproxy.h
+++ b/include/rpcproxy.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2001 Ove Kaaven
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_RPCPROXY_H
 #define __WINE_RPCPROXY_H
 
diff --git a/include/selectors.h b/include/selectors.h
index 6f400948cde..e5bfbcb3c3d 100644
--- a/include/selectors.h
+++ b/include/selectors.h
@@ -2,6 +2,20 @@
  * Selector definitions
  *
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_SELECTORS_H
diff --git a/include/services.h b/include/services.h
index 4e00dad6b5c..a14665879bb 100644
--- a/include/services.h
+++ b/include/services.h
@@ -2,6 +2,20 @@
  * Kernel Service Thread API
  *
  * Copyright 1999 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_SERVICES_H
diff --git a/include/servprov.h b/include/servprov.h
index de0a90e3a5a..222f29d713c 100644
--- a/include/servprov.h
+++ b/include/servprov.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 1999 Francois Gouget
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE__
 #include "rpc.h"
 #include "rpcndr.h"
diff --git a/include/setupapi.h b/include/setupapi.h
index 8296fad06fd..955610e3280 100644
--- a/include/setupapi.h
+++ b/include/setupapi.h
@@ -1,7 +1,20 @@
-/* Initial setupapi.h.  
-
-   FIXME: Missing A LOT of definitions / declarations! 
-*/
+/*
+ * Copyright (C) 2000 James Hatheway
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef __SETUPAPI__
 #define __SETUPAPI__
diff --git a/include/shellapi.h b/include/shellapi.h
index f590906dd8f..e9a8470e989 100644
--- a/include/shellapi.h
+++ b/include/shellapi.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_SHELLAPI_H
 #define __WINE_SHELLAPI_H
 
diff --git a/include/shlguid.h b/include/shlguid.h
index 51302f37dfb..19bc8e5245f 100644
--- a/include/shlguid.h
+++ b/include/shlguid.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 1999 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_SHLGUID_H
 #define __WINE_SHLGUID_H
 
diff --git a/include/shlobj.h b/include/shlobj.h
index 4e872a92058..6c1891d340d 100644
--- a/include/shlobj.h
+++ b/include/shlobj.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_SHLOBJ_H
 #define __WINE_SHLOBJ_H
 
diff --git a/include/shlwapi.h b/include/shlwapi.h
index be7d5037f7e..05855ee1fcf 100644
--- a/include/shlwapi.h
+++ b/include/shlwapi.h
@@ -1,6 +1,23 @@
 /*
  * SHLWAPI.DLL functions
+ *
+ * Copyright (C) 2000 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 #ifndef __WINE_SHLWAPI_H
 #define __WINE_SHLWAPI_H
 
diff --git a/include/snoop.h b/include/snoop.h
index 6fd85b1fe5d..4cb2a15dcb3 100644
--- a/include/snoop.h
+++ b/include/snoop.h
@@ -1,6 +1,23 @@
 /* 
  * Definitions for inter-dll snooping
+ *
+ * Copyright 1998 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 #ifndef __WINE_SNOOP_H
 #define __WINE_SNOOP_H
 
diff --git a/include/spy.h b/include/spy.h
index 93f3c614f7e..938a77c1ff4 100644
--- a/include/spy.h
+++ b/include/spy.h
@@ -1,5 +1,22 @@
 /*
  * Message Logging functions
+ *
+ * Copyright 1994 Bob Amstadt
+ * Copyright 1995 Alex Korobka  
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_SPY_H
diff --git a/include/sql.h b/include/sql.h
index 0466200f6f9..5cc4192769d 100644
--- a/include/sql.h
+++ b/include/sql.h
@@ -1,7 +1,23 @@
 /*
  * ODBC definitions
  *
- */ 
+ * Copyright (C) 1999 Xiang Li
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __SQL_H
 #define __SQL_H
 
diff --git a/include/sqlext.h b/include/sqlext.h
index c218d9ac09b..743cfb23692 100644
--- a/include/sqlext.h
+++ b/include/sqlext.h
@@ -1,6 +1,23 @@
 /*
  * MS SQL Extension definitions
+ *
+ * Copyright (C) 1999 Xiang Li
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 #ifndef __SQLEXT_H
 #define __SQLEXT_H
 
diff --git a/include/sqltypes.h b/include/sqltypes.h
index 2d62f5bd222..bb2dd4a65d4 100644
--- a/include/sqltypes.h
+++ b/include/sqltypes.h
@@ -1,6 +1,21 @@
 /*
- * sqltypes.h
+ * Copyright (C) 1999 Xiang Li
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 #ifndef __SQLTYPES_H
 #define __SQLTYPES_H
 
diff --git a/include/stackframe.h b/include/stackframe.h
index d97d7914751..3ed5d84454b 100644
--- a/include/stackframe.h
+++ b/include/stackframe.h
@@ -2,6 +2,20 @@
  * 16-bit and 32-bit mode stack frame layout
  *
  * Copyright 1995, 1998 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_STACKFRAME_H
diff --git a/include/storage.h b/include/storage.h
index 10fd6935a71..665187add62 100644
--- a/include/storage.h
+++ b/include/storage.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 1999 François Gouget
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_STORAGE_H
 #define __WINE_STORAGE_H
 
diff --git a/include/strmif.h b/include/strmif.h
index 5006e2bbc46..6414edf9dd3 100644
--- a/include/strmif.h
+++ b/include/strmif.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2001 Hidenori Takeshima
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE__
 #include "rpc.h"
 #include "rpcndr.h"
diff --git a/include/syslevel.h b/include/syslevel.h
index c75755f0d77..03415950bfc 100644
--- a/include/syslevel.h
+++ b/include/syslevel.h
@@ -2,6 +2,20 @@
  * Win32 'syslevel' routines
  *
  * Copyright 1998 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_SYSLEVEL_H
diff --git a/include/sysmetrics.h b/include/sysmetrics.h
index f39a05cd926..98047859a8a 100644
--- a/include/sysmetrics.h
+++ b/include/sysmetrics.h
@@ -2,6 +2,20 @@
  * System metrics definitions
  *
  * Copyright 1994 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_SYSMETRICS_H
diff --git a/include/tapi.h b/include/tapi.h
index d7cd4483441..ffc8ef56bf3 100644
--- a/include/tapi.h
+++ b/include/tapi.h
@@ -2,6 +2,20 @@
  * TAPI definitions
  * 
  * Copyright (c) 1999 Andreas Mohr
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_TAPI_H
diff --git a/include/task.h b/include/task.h
index df29d976959..686552300c8 100644
--- a/include/task.h
+++ b/include/task.h
@@ -2,6 +2,20 @@
  * Task definitions
  *
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_TASK_H
diff --git a/include/tchar.h b/include/tchar.h
index d5ab549c25d..01de609f776 100644
--- a/include/tchar.h
+++ b/include/tchar.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 1998 Francois Gouget
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_TCHAR_H
 #define __WINE_TCHAR_H
 
diff --git a/include/thread.h b/include/thread.h
index 9e0b2433bd9..18aa4aec3c6 100644
--- a/include/thread.h
+++ b/include/thread.h
@@ -2,6 +2,20 @@
  * Thread definitions
  *
  * Copyright 1996 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_THREAD_H
diff --git a/include/tlhelp32.h b/include/tlhelp32.h
index 355c6c24e23..14633982076 100644
--- a/include/tlhelp32.h
+++ b/include/tlhelp32.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 1998 Patrick Spinler
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_TLHELP32_H
 #define __WINE_TLHELP32_H
 
diff --git a/include/toolhelp.h b/include/toolhelp.h
index 6cba3e24538..663d3e121c5 100644
--- a/include/toolhelp.h
+++ b/include/toolhelp.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_TOOLHELP_H
 #define __WINE_TOOLHELP_H
 
diff --git a/include/unknwn.h b/include/unknwn.h
index 94cc0daab7d..de16a1ce3b7 100644
--- a/include/unknwn.h
+++ b/include/unknwn.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 1999 Francois Gouget
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE__
 #include "rpc.h"
 #include "rpcndr.h"
diff --git a/include/urlmon.h b/include/urlmon.h
index 00b5a1b61a3..c1c5a4beed4 100644
--- a/include/urlmon.h
+++ b/include/urlmon.h
@@ -1,5 +1,19 @@
 /*
- * urlmon.h
+ * Copyright (C) 2000 Ulrich Czekalla
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE__
diff --git a/include/user.h b/include/user.h
index 71d8b361186..7cf9661523d 100644
--- a/include/user.h
+++ b/include/user.h
@@ -2,6 +2,20 @@
  * USER definitions
  *
  * Copyright 1993 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_USER_H
diff --git a/include/uuids.h b/include/uuids.h
index 77934a7c5fd..6e7ef65eaa4 100644
--- a/include/uuids.h
+++ b/include/uuids.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2001 Hidenori Takeshima
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_DSHOW_UUIDS_H
 #define __WINE_DSHOW_UUIDS_H
 
diff --git a/include/ver.h b/include/ver.h
index 350e01d4696..65ebd618606 100644
--- a/include/ver.h
+++ b/include/ver.h
@@ -2,6 +2,20 @@
  * 
  * Copyright 1996 Marcus Meissner
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * Marked as obsolete:  Albert den Haan (Corel Corp) 1999-04-28
  * VER.H obsolete, include winver.h instead
  */
diff --git a/include/vfw.h b/include/vfw.h
index b136b43a43d..4bc7ae0ed45 100644
--- a/include/vfw.h
+++ b/include/vfw.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_VFW_H
 #define __WINE_VFW_H
 
diff --git a/include/vfwmsgs.h b/include/vfwmsgs.h
index 1d4731eb363..b286e176d72 100644
--- a/include/vfwmsgs.h
+++ b/include/vfwmsgs.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2001 Hidenori Takeshima
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef	WINE_DSHOW_VFWMSGS_H
 #define	WINE_DSHOW_VFWMSGS_H
 
diff --git a/include/win.h b/include/win.h
index 7b8cdd6a78b..d41f9d101c0 100644
--- a/include/win.h
+++ b/include/win.h
@@ -2,6 +2,20 @@
  * Window definitions
  *
  * Copyright 1993 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WIN_H
diff --git a/include/win16drv.h b/include/win16drv.h
index 231a738c5d3..66aff8ac2f3 100644
--- a/include/win16drv.h
+++ b/include/win16drv.h
@@ -1,5 +1,21 @@
 /*
  * Win16 printer driver definitions
+ *
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WIN16DRV_H
diff --git a/include/winbase.h b/include/winbase.h
index 12506d3a7a8..6824840d58c 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_WINBASE_H
 #define __WINE_WINBASE_H
 
diff --git a/include/wincon.h b/include/wincon.h
index e98b2c1d0b1..9d2a710ab7a 100644
--- a/include/wincon.h
+++ b/include/wincon.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_WINCON_H
 #define __WINE_WINCON_H
 
diff --git a/include/wincrypt.h b/include/wincrypt.h
index a5723e5ef67..ffbb0f5fb4c 100644
--- a/include/wincrypt.h
+++ b/include/wincrypt.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2002 Travis Michielsen
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_WINCRYPT_H
 #define __WINE_WINCRYPT_H
 
diff --git a/include/windef.h b/include/windef.h
index c7b3650c5e9..d3f0bebd2ef 100644
--- a/include/windef.h
+++ b/include/windef.h
@@ -2,6 +2,20 @@
  * Basic types definitions
  *
  * Copyright 1996 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINDEF_H
diff --git a/include/windows.h b/include/windows.h
index 575dec75934..10ad90d80aa 100644
--- a/include/windows.h
+++ b/include/windows.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_WINDOWS_H
 #define __WINE_WINDOWS_H
 
diff --git a/include/windowsx.h b/include/windowsx.h
index eae33d1e58b..be08c7ac80d 100644
--- a/include/windowsx.h
+++ b/include/windowsx.h
@@ -1,4 +1,19 @@
-/* Copyright (C) 1999 Corel Corporation (Paul Quinn) */
+/* Copyright (C) 1999 Corel Corporation (Paul Quinn)
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef _INC_WINDOWSX
 #define _INC_WINDOWSX
diff --git a/include/wine/debug.h b/include/wine/debug.h
index bac7b33aba9..789fc954321 100644
--- a/include/wine/debug.h
+++ b/include/wine/debug.h
@@ -1,5 +1,21 @@
 /*
  * Wine debugging interface
+ *
+ * Copyright 1999 Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_DEBUG_H
@@ -144,9 +160,6 @@ inline static const char *debugres_w( const WCHAR *s ) { return wine_dbgstr_wn(
 #define ERR_(ch)                   WINE_ERR_(ch)
 #define ERR_ON(ch)                 WINE_ERR_ON(ch)
 
-#define DECLARE_DEBUG_CHANNEL(ch)  WINE_DECLARE_DEBUG_CHANNEL(ch)
-#define DEFAULT_DEBUG_CHANNEL(ch)  WINE_DEFAULT_DEBUG_CHANNEL(ch)
-
 #define DPRINTF                    WINE_DPRINTF
 #define MESSAGE                    WINE_MESSAGE
 
diff --git a/include/wine/exception.h b/include/wine/exception.h
index a88a6cdb913..207a817bba0 100644
--- a/include/wine/exception.h
+++ b/include/wine/exception.h
@@ -2,6 +2,20 @@
  * Wine exception handling
  *
  * Copyright (c) 1999 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_EXCEPTION_H
diff --git a/include/wine/icmpapi.h b/include/wine/icmpapi.h
index aa6225774d8..98cbf132743 100644
--- a/include/wine/icmpapi.h
+++ b/include/wine/icmpapi.h
@@ -5,6 +5,22 @@
  * delivered separately and this is why it is not directly in 'include'.
  *
  * Depends on ipexport.h (there is no include directive in the original)
+ *
+ * Copyright (C) 1999 Francois Gouget
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_ICMPAPI_H
diff --git a/include/wine/ipexport.h b/include/wine/ipexport.h
index c383d7c0803..9df85fb1ca0 100644
--- a/include/wine/ipexport.h
+++ b/include/wine/ipexport.h
@@ -3,6 +3,22 @@
  *
  * This header is not part of the standard headers, it is usually 
  * delivered separately and this is why it is not directly in 'include'.
+ *
+ * Copyright (C) 1999 Francois Gouget
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_IPEXPORT_H
diff --git a/include/wine/library.h b/include/wine/library.h
index 9bcc6750b04..c047d13f49a 100644
--- a/include/wine/library.h
+++ b/include/wine/library.h
@@ -2,6 +2,20 @@
  * Definitions for the Wine library
  *
  * Copyright 2000 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_LIBRARY_H
diff --git a/include/wine/mmsystem16.h b/include/wine/mmsystem16.h
index 41a64aa57d5..2d7e64ebc90 100644
--- a/include/wine/mmsystem16.h
+++ b/include/wine/mmsystem16.h
@@ -1,5 +1,21 @@
-/* 
+/*
  * MMSYSTEM - Multimedia Wine Extension ... :-)
+ *
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_MMSYSTEM16_H
diff --git a/include/wine/obj_base.h b/include/wine/obj_base.h
index ac3089d36e2..817f56d7614 100644
--- a/include/wine/obj_base.h
+++ b/include/wine/obj_base.h
@@ -1,6 +1,22 @@
 /*
  * This file defines the macros and types necessary to define COM interfaces, 
  * and the three most basic COM interfaces: IUnknown, IMalloc and IClassFactory.
+ *
+ * Copyright (C) 1999 Francois Gouget
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_BASE_H
diff --git a/include/wine/obj_cache.h b/include/wine/obj_cache.h
index cca4e1822c2..f29d50f3ff2 100644
--- a/include/wine/obj_cache.h
+++ b/include/wine/obj_cache.h
@@ -2,6 +2,22 @@
  * Defines the COM interfaces and APIs related to structured data storage.
  *
  * Depends on 'obj_base.h'.
+ *
+ * Copyright (C) 1999 Paul Quinn
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_CACHE_H
diff --git a/include/wine/obj_channel.h b/include/wine/obj_channel.h
index b1564305a6b..56f2357a7d5 100644
--- a/include/wine/obj_channel.h
+++ b/include/wine/obj_channel.h
@@ -1,5 +1,22 @@
 /*
- * Defines undocumented Microsoft COM interfaces and APIs seemingly related to some 'channel' notion.
+ * Defines undocumented Microsoft COM interfaces and APIs seemingly
+ * related to some 'channel' notion.
+ *
+ * Copyright (C) 1999 Francois Gouget
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_CHANNEL_H
diff --git a/include/wine/obj_clientserver.h b/include/wine/obj_clientserver.h
index 76c69585139..9a526beb4ee 100644
--- a/include/wine/obj_clientserver.h
+++ b/include/wine/obj_clientserver.h
@@ -1,5 +1,21 @@
 /*
  * Defines the COM interfaces and APIs related to client/server aspects.
+ *
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_CLIENTSERVER_H
diff --git a/include/wine/obj_commdlgbrowser.h b/include/wine/obj_commdlgbrowser.h
index ac3cec110b8..e48567a3b0a 100644
--- a/include/wine/obj_commdlgbrowser.h
+++ b/include/wine/obj_commdlgbrowser.h
@@ -1,5 +1,21 @@
-/************************************************************
+/*
  *    ICommDlgBrowser
+ *
+ * Copyright (C) 1999 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_COMMDLGBROWSER_H
diff --git a/include/wine/obj_connection.h b/include/wine/obj_connection.h
index 0dd92eb60ae..b2f8d858884 100644
--- a/include/wine/obj_connection.h
+++ b/include/wine/obj_connection.h
@@ -2,6 +2,22 @@
  * Defines the COM interfaces and APIs related to structured data storage.
  *
  * Depends on 'obj_base.h'.
+ *
+ * Copyright (C) 1999 Paul Quinn
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_CONNECTION_H
diff --git a/include/wine/obj_contextmenu.h b/include/wine/obj_contextmenu.h
index 30e8538a32e..94931201f0b 100644
--- a/include/wine/obj_contextmenu.h
+++ b/include/wine/obj_contextmenu.h
@@ -1,9 +1,25 @@
-/************************************************************
+/*
  *    IContextMenu
  *
  * Undocumented:
  * word95 gets a IContextMenu Interface and calls HandleMenuMsg()
- * whitch should only a member of IContextMenu2. 
+ * which should only a member of IContextMenu2. 
+ *
+ * Copyright (C) 1999 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_CONTEXTMENU_H
diff --git a/include/wine/obj_control.h b/include/wine/obj_control.h
index e08d307b757..b40c21b3588 100644
--- a/include/wine/obj_control.h
+++ b/include/wine/obj_control.h
@@ -2,6 +2,22 @@
  * Defines the COM interfaces and APIs related to structured data storage.
  *
  * Depends on 'obj_base.h'.
+ *
+ * Copyright (C) 1999 Paul Quinn
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_CONTROL_H
diff --git a/include/wine/obj_dataobject.h b/include/wine/obj_dataobject.h
index bfddfbdd7e6..21b01a1d786 100644
--- a/include/wine/obj_dataobject.h
+++ b/include/wine/obj_dataobject.h
@@ -1,6 +1,21 @@
 /*
  * Defines the COM interfaces and APIs related to IDataObject.
  *
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_DATAOBJECT_H
diff --git a/include/wine/obj_dockingwindowframe.h b/include/wine/obj_dockingwindowframe.h
index da94b8d4057..2302962a796 100644
--- a/include/wine/obj_dockingwindowframe.h
+++ b/include/wine/obj_dockingwindowframe.h
@@ -1,5 +1,21 @@
-/************************************************************
+/*
  *    IDockingWindowFrame
+ *
+ * Copyright (C) 1999 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_DOCKINGWINDOWFRAME_H
diff --git a/include/wine/obj_dragdrop.h b/include/wine/obj_dragdrop.h
index 3410be51239..0cff785cc82 100644
--- a/include/wine/obj_dragdrop.h
+++ b/include/wine/obj_dragdrop.h
@@ -1,5 +1,21 @@
 /*
  * Defines the COM interfaces and APIs related to OLE Drag and Drop.
+ *
+ * Copyright (C) 1999 Francis Beaudet
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_DRAGDROP_H
diff --git a/include/wine/obj_enumidlist.h b/include/wine/obj_enumidlist.h
index d27da2c3859..a0eab628cbf 100644
--- a/include/wine/obj_enumidlist.h
+++ b/include/wine/obj_enumidlist.h
@@ -2,6 +2,22 @@
  * Defines the COM interfaces and APIs related to EnumIDList
  *
  * Depends on 'obj_base.h'.
+ *
+ * Copyright (C) 1999 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_ENUMIDLIST_H
diff --git a/include/wine/obj_errorinfo.h b/include/wine/obj_errorinfo.h
index 2e3e816cd7f..efc37e94fca 100644
--- a/include/wine/obj_errorinfo.h
+++ b/include/wine/obj_errorinfo.h
@@ -1,5 +1,21 @@
 /*
  * Defines the COM interfaces and APIs related to ErrorInfo
+ *
+ * Copyright (C) 2000 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_ERRORINFO_H
diff --git a/include/wine/obj_extracticon.h b/include/wine/obj_extracticon.h
index f8e96a95f1b..a0de77eacb0 100644
--- a/include/wine/obj_extracticon.h
+++ b/include/wine/obj_extracticon.h
@@ -1,5 +1,21 @@
-/************************************************************
+/*
  *    IExtractIconA
+ *
+ * Copyright (C) 1999 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_EXTRACTICON_H
diff --git a/include/wine/obj_inplace.h b/include/wine/obj_inplace.h
index 344238b0fef..fe877c0b444 100644
--- a/include/wine/obj_inplace.h
+++ b/include/wine/obj_inplace.h
@@ -2,6 +2,22 @@
  * Defines the COM interfaces and APIs related to structured data storage.
  * 
  * Depends on 'obj_base.h'.
+ *
+ * Copyright (C) 1999 Paul Quinn
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_INPLACE_H
diff --git a/include/wine/obj_ksproperty.h b/include/wine/obj_ksproperty.h
index ecfbff969bc..c29ef9b799d 100644
--- a/include/wine/obj_ksproperty.h
+++ b/include/wine/obj_ksproperty.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2001 Hidenori Takeshima
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef WINE_WINE_OBJ_KSPROPERTY_H
 #define WINE_WINE_OBJ_KSPROPERTY_H
 
diff --git a/include/wine/obj_marshal.h b/include/wine/obj_marshal.h
index 926fae21b06..4d442ecee78 100644
--- a/include/wine/obj_marshal.h
+++ b/include/wine/obj_marshal.h
@@ -1,6 +1,22 @@
 /*
  * Defines the COM interfaces and APIs that allow an interface to 
  * specify a custom marshaling for its objects.
+ *
+ * Copyright (C) 1999 Francois Gouget
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_MARSHAL_H
diff --git a/include/wine/obj_misc.h b/include/wine/obj_misc.h
index 8e04e0ad943..c79ec324215 100644
--- a/include/wine/obj_misc.h
+++ b/include/wine/obj_misc.h
@@ -3,6 +3,22 @@
  * These did not really fit into the other categories, whould have 
  * required their own specific category or are too rarely used to be 
  * put in 'obj_base.h'.
+ *
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_MISC_H
diff --git a/include/wine/obj_moniker.h b/include/wine/obj_moniker.h
index cb4bfce512b..4bedf9d1b48 100644
--- a/include/wine/obj_moniker.h
+++ b/include/wine/obj_moniker.h
@@ -1,6 +1,23 @@
 /*
  * Defines the COM interfaces and APIs related to the moniker functionality.
+ *
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 #ifndef __WINE_WINE_OBJ_MONIKER_H
 #define __WINE_WINE_OBJ_MONIKER_H
 
diff --git a/include/wine/obj_oleaut.h b/include/wine/obj_oleaut.h
index 1174c161791..dc2921b3b03 100644
--- a/include/wine/obj_oleaut.h
+++ b/include/wine/obj_oleaut.h
@@ -1,5 +1,21 @@
 /*
  * Defines the COM interfaces and APIs related to OLE automation support.
+ *
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_OLEAUT_H
diff --git a/include/wine/obj_olefont.h b/include/wine/obj_olefont.h
index c0edcf448a9..2761d120562 100644
--- a/include/wine/obj_olefont.h
+++ b/include/wine/obj_olefont.h
@@ -2,6 +2,22 @@
  * Defines the COM interfaces and APIs related to OLE font support.
  *
  * Depends on 'obj_base.h'.
+ *
+ * Copyright (C) 1999 Francis Beaudet
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_OLEFONT_H
diff --git a/include/wine/obj_oleobj.h b/include/wine/obj_oleobj.h
index fa6df7e86db..5727142a731 100644
--- a/include/wine/obj_oleobj.h
+++ b/include/wine/obj_oleobj.h
@@ -2,6 +2,22 @@
  * Defines IOleObject COM and other oleidl.h interfaces
  * 
  * Depends on 'obj_base.h'.
+ *
+ * Copyright (C) 1999 Paul Quinn
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_OLEOBJ_H
diff --git a/include/wine/obj_oleundo.h b/include/wine/obj_oleundo.h
index b52fbe2ef60..db82f827ee0 100644
--- a/include/wine/obj_oleundo.h
+++ b/include/wine/obj_oleundo.h
@@ -2,6 +2,22 @@
  * Defines the COM interfaces and APIs from ocidl.h which pertain to Undo/Redo
  *
  * Depends on 'obj_base.h'.
+ *
+ * Copyright (C) 1999 Paul Quinn
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_OLEUNDO_H
diff --git a/include/wine/obj_oleview.h b/include/wine/obj_oleview.h
index 21d633dc5b8..7efda2b1a4f 100644
--- a/include/wine/obj_oleview.h
+++ b/include/wine/obj_oleview.h
@@ -1,6 +1,21 @@
 /*
  * Defines the COM interfaces and APIs related to ViewObject
  *
+ * Copyright (C) 1999 Paul Quinn
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_OLEVIEW_H
diff --git a/include/wine/obj_picture.h b/include/wine/obj_picture.h
index 73f5c60bd1a..a55562450b2 100644
--- a/include/wine/obj_picture.h
+++ b/include/wine/obj_picture.h
@@ -2,6 +2,22 @@
  * Defines the COM interfaces and APIs related to OLE picture support.
  *
  * Depends on 'obj_base.h'.
+ *
+ * Copyright (C) 1999 Paul Quinn
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_PICTURE_H
diff --git a/include/wine/obj_property.h b/include/wine/obj_property.h
index 35e5fa8d198..4dfc8837768 100644
--- a/include/wine/obj_property.h
+++ b/include/wine/obj_property.h
@@ -2,6 +2,22 @@
  * Defines the COM interfaces and APIs from ocidl.h related to property
  *
  * Depends on 'obj_base.h'.
+ *
+ * Copyright (C) 1999 Paul Quinn
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_PROPERTY_H
diff --git a/include/wine/obj_propertystorage.h b/include/wine/obj_propertystorage.h
index 5236ff9ae3c..451e8bd5cb9 100644
--- a/include/wine/obj_propertystorage.h
+++ b/include/wine/obj_propertystorage.h
@@ -1,5 +1,21 @@
 /*
  * Defines the COM interfaces and APIs related to saving properties to file.
+ *
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_PROPERTYSTORAGE_H
diff --git a/include/wine/obj_queryassociations.h b/include/wine/obj_queryassociations.h
index 257d9f231e5..4b660489101 100644
--- a/include/wine/obj_queryassociations.h
+++ b/include/wine/obj_queryassociations.h
@@ -1,5 +1,21 @@
-/************************************************************
+/*
  *    IQueryAssociations
+ *
+ * Copyright (C) 2000 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_QUERYASSOCIATIONS_H
diff --git a/include/wine/obj_serviceprovider.h b/include/wine/obj_serviceprovider.h
index 0aef481fbe0..bd11c0df10d 100644
--- a/include/wine/obj_serviceprovider.h
+++ b/include/wine/obj_serviceprovider.h
@@ -2,6 +2,22 @@
  * Defines the COM interfaces and APIs related to IServiceProvider
  *
  * Depends on 'obj_base.h'.
+ *
+ * Copyright (C) 2000 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_SERVICEPROVIDER_H
diff --git a/include/wine/obj_shellbrowser.h b/include/wine/obj_shellbrowser.h
index d3f902f618b..f32db81030e 100644
--- a/include/wine/obj_shellbrowser.h
+++ b/include/wine/obj_shellbrowser.h
@@ -1,5 +1,21 @@
-/************************************************************
+/*
  *    IShellBrowser
+ *
+ * Copyright (C) 1999 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_SHELLBROWSER_H
diff --git a/include/wine/obj_shellextinit.h b/include/wine/obj_shellextinit.h
index 3bac3a1cd3d..f7f462d4367 100644
--- a/include/wine/obj_shellextinit.h
+++ b/include/wine/obj_shellextinit.h
@@ -1,5 +1,21 @@
-/************************************************************
+/*
  *    IShellExtInit
+ *
+ * Copyright (C) 1999 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_SHELLEXTINIT_H
diff --git a/include/wine/obj_shellfolder.h b/include/wine/obj_shellfolder.h
index 0a2540321ac..320857a93d0 100644
--- a/include/wine/obj_shellfolder.h
+++ b/include/wine/obj_shellfolder.h
@@ -2,6 +2,22 @@
  * Defines the COM interfaces and APIs related to IShellFolder
  *
  * Depends on 'obj_base.h'.
+ *
+ * Copyright (C) 1999 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_SHELLFOLDER_H
diff --git a/include/wine/obj_shelllink.h b/include/wine/obj_shelllink.h
index 79bf29f3344..4129e978170 100644
--- a/include/wine/obj_shelllink.h
+++ b/include/wine/obj_shelllink.h
@@ -2,6 +2,22 @@
  * Defines the COM interfaces and APIs related to IShellLink.
  *
  * Depends on 'obj_base.h'.
+ *
+ * Copyright (C) 1999 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_SHELLLINK_H
diff --git a/include/wine/obj_shellview.h b/include/wine/obj_shellview.h
index a593f73b6e5..f6a92409d84 100644
--- a/include/wine/obj_shellview.h
+++ b/include/wine/obj_shellview.h
@@ -1,5 +1,21 @@
-/************************************************************
+/*
  *    IShellView
+ *
+ * Copyright (C) 1999 Juergen Schmied
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_SHELLVIEW_H
diff --git a/include/wine/obj_storage.h b/include/wine/obj_storage.h
index 4ff658d7a6f..c1a0e7aaef3 100644
--- a/include/wine/obj_storage.h
+++ b/include/wine/obj_storage.h
@@ -1,5 +1,21 @@
 /*
  * Defines the COM interfaces and APIs related to structured data storage.
+ *
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_STORAGE_H
diff --git a/include/wine/obj_webbrowser.h b/include/wine/obj_webbrowser.h
index fb9f3d6ce8d..4fa5fcd0133 100644
--- a/include/wine/obj_webbrowser.h
+++ b/include/wine/obj_webbrowser.h
@@ -1,7 +1,21 @@
 /*
  * Defines the COM interfaces and APIs related to the IE Web browser control
  *
- * 2001 John R. Sheets (for CodeWeavers)
+ * Copyright 2001 John R. Sheets (for CodeWeavers)
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_OBJ_WEBBROWSER_H
diff --git a/include/wine/port.h b/include/wine/port.h
index 57f9ca49fed..aa238cc254c 100644
--- a/include/wine/port.h
+++ b/include/wine/port.h
@@ -1,6 +1,21 @@
 /*
  * Wine porting definitions
  *
+ * Copyright 1996 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_PORT_H
diff --git a/include/wine/server.h b/include/wine/server.h
index b6d8cdbb163..1280a62a509 100644
--- a/include/wine/server.h
+++ b/include/wine/server.h
@@ -2,6 +2,20 @@
  * Definitions for the client side of the Wine server communication
  *
  * Copyright (C) 1998 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINE_SERVER_H
diff --git a/include/wine/test.h b/include/wine/test.h
index 7ce654390e3..184400968c3 100644
--- a/include/wine/test.h
+++ b/include/wine/test.h
@@ -2,6 +2,20 @@
  * Definitions for Wine C unit tests.
  *
  * Copyright (C) 2002 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_TEST_H
diff --git a/include/wine/unicode.h b/include/wine/unicode.h
index 678447f57e3..7fa9afa090f 100644
--- a/include/wine/unicode.h
+++ b/include/wine/unicode.h
@@ -2,6 +2,20 @@
  * Wine internal Unicode definitions
  *
  * Copyright 2000 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_UNICODE_H
diff --git a/include/wine/winaspi.h b/include/wine/winaspi.h
index 086deff0959..71e07541207 100644
--- a/include/wine/winaspi.h
+++ b/include/wine/winaspi.h
@@ -1,7 +1,22 @@
-/**************************************************************************
- * WINE winaspi.h
+/*
  * This file should be source compatible with the Adaptec winaspi.h
  * All DOS ASPI structures are the same as WINASPI
+ *
+ * Copyright (C) 2000 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINASPI_H__
diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h
index e9c2d082835..55d8e09cbc4 100644
--- a/include/wine/winbase16.h
+++ b/include/wine/winbase16.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_WINE_WINBASE16_H
 #define __WINE_WINE_WINBASE16_H
 
diff --git a/include/wine/windef16.h b/include/wine/windef16.h
index 171f9eb24b3..4870c9b06be 100644
--- a/include/wine/windef16.h
+++ b/include/wine/windef16.h
@@ -2,6 +2,22 @@
  * Basic type definitions for 16 bit variations on Windows types.
  * These types are provided mostly to insure compatibility with
  * 16 bit windows code.
+ *
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINDEF16_H
diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc
index fd0cab6d1fa..42178d25fc8 100644
--- a/include/wine/wine_common_ver.rc
+++ b/include/wine/wine_common_ver.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2001 Dmitry Timoshkov
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include "winver.h"
 
 /*
diff --git a/include/wine/wingdi16.h b/include/wine/wingdi16.h
index 11a47a2b92c..91d7c8400b6 100644
--- a/include/wine/wingdi16.h
+++ b/include/wine/wingdi16.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_WINE_WINGDI16_H
 #define __WINE_WINE_WINGDI16_H
 
diff --git a/include/wine/winnet16.h b/include/wine/winnet16.h
index e6b52c9d03e..f882451975c 100644
--- a/include/wine/winnet16.h
+++ b/include/wine/winnet16.h
@@ -3,6 +3,20 @@
  *
  * Copyright 1997 Andreas Mohr
  * Copyright 1999 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINNET16_H
diff --git a/include/wine/winsock16.h b/include/wine/winsock16.h
index 9306771d703..ceed17b23a2 100644
--- a/include/wine/winsock16.h
+++ b/include/wine/winsock16.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_WINE_WINSOCK16_H
 #define __WINE_WINE_WINSOCK16_H
 
diff --git a/include/wine/winuser16.h b/include/wine/winuser16.h
index 05ad22e003d..794a0358eaa 100644
--- a/include/wine/winuser16.h
+++ b/include/wine/winuser16.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_WINE_WINUSER16_H
 #define __WINE_WINE_WINUSER16_H
 
diff --git a/include/wine_gl.h b/include/wine_gl.h
index 368124ecc3b..c2b2c405158 100644
--- a/include/wine_gl.h
+++ b/include/wine_gl.h
@@ -1,8 +1,23 @@
 /* Wrapper for OpenGL includes...
-     Copyright 1998 - Lionel Ulmer
-
-   This wrapper is needed because Mesa uses also the CALLBACK / WINAPI
-   constants. */
+ * Copyright 1998 - Lionel Ulmer
+ *
+ * This wrapper is needed because Mesa uses also the CALLBACK / WINAPI
+ * constants.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef __WINE_WINE_GL_H
 #define __WINE_WINE_GL_H
diff --git a/include/winerror.h b/include/winerror.h
index da545465c51..270fa0a752a 100644
--- a/include/winerror.h
+++ b/include/winerror.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_WINERROR_H
 #define __WINE_WINERROR_H
 
diff --git a/include/wingdi.h b/include/wingdi.h
index 85b8ecbfd5a..5624c7854d8 100644
--- a/include/wingdi.h
+++ b/include/wingdi.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef _WINGDI_
 #define _WINGDI_
 #ifndef NOGDI
diff --git a/include/wininet.h b/include/wininet.h
index 9afbf6cc773..5cb4992f82d 100644
--- a/include/wininet.h
+++ b/include/wininet.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2000 Ulrich Czekalla
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef _WINE_WININET_H_
 #define _WINE_WININET_H_
 
diff --git a/include/winioctl.h b/include/winioctl.h
index 8ac269fd51d..51aa6effc38 100644
--- a/include/winioctl.h
+++ b/include/winioctl.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_WINIOCTL_H
 #define __WINE_WINIOCTL_H
 
diff --git a/include/winnetwk.h b/include/winnetwk.h
index 01fb231b197..d1d42827a4a 100644
--- a/include/winnetwk.h
+++ b/include/winnetwk.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 
 #ifndef _WINNETWK_H_
 #define _WINNETWK_H_
diff --git a/include/winnls.h b/include/winnls.h
index 2d108216329..6af967fcc57 100644
--- a/include/winnls.h
+++ b/include/winnls.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_WINNLS_H
 #define __WINE_WINNLS_H
 #ifndef NONLS
diff --git a/include/winnt.h b/include/winnt.h
index 23d33aa29d3..a8d9a80b497 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -2,6 +2,20 @@
  * Win32 definitions for Windows NT
  *
  * Copyright 1996 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINNT_H
diff --git a/include/winpos.h b/include/winpos.h
index 6db57230801..3b052286933 100644
--- a/include/winpos.h
+++ b/include/winpos.h
@@ -2,6 +2,20 @@
  * *DeferWindowPos() structure and definitions
  *
  * Copyright 1994 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINPOS_H
diff --git a/include/winproc.h b/include/winproc.h
index 3ad4934f4c7..a8bc080ee1f 100644
--- a/include/winproc.h
+++ b/include/winproc.h
@@ -2,6 +2,20 @@
  * Window procedure callbacks definitions
  *
  * Copyright 1996 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINPROC_H
diff --git a/include/winreg.h b/include/winreg.h
index c30da7712ae..098cb556616 100644
--- a/include/winreg.h
+++ b/include/winreg.h
@@ -1,6 +1,23 @@
 /*
- * 		Win32 registry defines (see also winnt.h)
+ * Win32 registry defines (see also winnt.h)
+ *
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 #ifndef __WINE_WINREG_H
 #define __WINE_WINREG_H
 
diff --git a/include/winres.h b/include/winres.h
index 38b3508b153..4ee7982d851 100644
--- a/include/winres.h
+++ b/include/winres.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2000 Francois Gouget
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include "winresrc.h"
 
 #ifdef IDC_STATIC
diff --git a/include/winresrc.h b/include/winresrc.h
index ad667954aa3..cf906820d40 100644
--- a/include/winresrc.h
+++ b/include/winresrc.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2000 Hidenori Takeshima
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef _WINRESRC_
 #define _WINRESRC_
 
diff --git a/include/winsock.h b/include/winsock.h
index 99ffb854f97..23fd5856dd2 100644
--- a/include/winsock.h
+++ b/include/winsock.h
@@ -2,6 +2,22 @@
  *
  * This header file corresponds to version 1.1 of the Windows Sockets
  * specification.
+ *
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifdef __WINE__
diff --git a/include/winsock2.h b/include/winsock2.h
index 482f5706aaa..5f5eae636ef 100644
--- a/include/winsock2.h
+++ b/include/winsock2.h
@@ -1,6 +1,23 @@
 /*
  * Winsock 2 definitions - used for ws2_32.dll
  *
+ * Copyright (C) 1999 Ove Kaaven
+ * Copyright (C) 2001 Francois Gouget
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * FIXME: Still missing required Winsock 2 definitions.
  */
 
diff --git a/include/winspool.h b/include/winspool.h
index ceb15610b4f..1fece024ae0 100644
--- a/include/winspool.h
+++ b/include/winspool.h
@@ -4,6 +4,20 @@
  *
  * Portions Copyright (c) 1999 Corel Corporation 
  *                             (Paul Quinn, Albert Den Haan)
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #ifndef __WINE_WINSPOOL_H
 #define __WINE_WINSPOOL_H
diff --git a/include/winsvc.h b/include/winsvc.h
index 24fa932370f..b4375d7c0dd 100644
--- a/include/winsvc.h
+++ b/include/winsvc.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_WINSVC_H
 #define __WINE_WINSVC_H
 
diff --git a/include/winuser.h b/include/winuser.h
index c12879a6801..c3b83540d7d 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef _WINUSER_
 #define _WINUSER_
 
diff --git a/include/winver.h b/include/winver.h
index abcadfa7c3f..e0cca0188ac 100644
--- a/include/winver.h
+++ b/include/winver.h
@@ -1,6 +1,20 @@
 /* Definitions for the VERsion infolibrary (VER.DLL)
  * 
  * Copyright 1996 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WINVER_H
diff --git a/include/wnaspi32.h b/include/wnaspi32.h
index 386569d5f62..55327a571a2 100644
--- a/include/wnaspi32.h
+++ b/include/wnaspi32.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WNASPI32_H__
 #define __WNASPI32_H__
 
diff --git a/include/wownt32.h b/include/wownt32.h
index 924439c7bb3..305b9eafe83 100644
--- a/include/wownt32.h
+++ b/include/wownt32.h
@@ -1,5 +1,21 @@
 /*
  * WOW Generic Thunk API 
+ *
+ * Copyright (C) 1999 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef _WOWNT32_H_
diff --git a/include/wrc_rsc.h b/include/wrc_rsc.h
index 59e6135a0df..a950ae3af00 100644
--- a/include/wrc_rsc.h
+++ b/include/wrc_rsc.h
@@ -3,6 +3,19 @@
  *
  * Copyright 1998 Bertho A. Stultiens
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WRC_RSC_H
diff --git a/include/ws2spi.h b/include/ws2spi.h
index 04770110842..50aa723cfee 100644
--- a/include/ws2spi.h
+++ b/include/ws2spi.h
@@ -1,4 +1,22 @@
-/* WS2SPI.H -- definitions to be used with the WinSock service provider. */
+/*
+ * WS2SPI.H -- definitions to be used with the WinSock service provider.
+ *
+ * Copyright (C) 2001 Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef _WINSOCK2SPI_
 #define _WINSOCK2SPI_
diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h
index 3ef49a4c9bf..3c20f327080 100644
--- a/include/ws2tcpip.h
+++ b/include/ws2tcpip.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2001 Francois Gouget
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WS2TCPIP__
 #define __WS2TCPIP__
 
diff --git a/include/wshisotp.h b/include/wshisotp.h
index 1387c78d0b4..c13c328176d 100644
--- a/include/wshisotp.h
+++ b/include/wshisotp.h
@@ -1,4 +1,19 @@
-/* WSHISOTP.H
+/*
+ * Copyright (C) 2001 Stefan Leichter
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef _WINE_WSHISOTP_
diff --git a/include/wsipx.h b/include/wsipx.h
index aa18538d59d..687152a4ee2 100644
--- a/include/wsipx.h
+++ b/include/wsipx.h
@@ -1,4 +1,19 @@
-/* WSIPX.H
+/*
+ * Copyright (C) 2001 Stefan Leichter
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef _WINE_WSIPX_
diff --git a/include/wtypes.h b/include/wtypes.h
index fdcf1806c18..bc2dc4d4eef 100644
--- a/include/wtypes.h
+++ b/include/wtypes.h
@@ -1,5 +1,21 @@
 /*
  * Defines the basic types used by COM interfaces.
+ *
+ * Copyright (C) the Wine project
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_WTYPES_H
diff --git a/include/x11drv.h b/include/x11drv.h
index f4cefdfe28e..4ba45cc1b46 100644
--- a/include/x11drv.h
+++ b/include/x11drv.h
@@ -1,5 +1,22 @@
 /*
  * X11 driver definitions
+ *
+ * Copyright 1996 Alexandre Julliard
+ * Copyright 1999 Patrik Stridvall
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_X11DRV_H
diff --git a/include/x11font.h b/include/x11font.h
index cde280e4b34..17e02a0457f 100644
--- a/include/x11font.h
+++ b/include/x11font.h
@@ -2,6 +2,20 @@
  * X11 physical font definitions
  *
  * Copyright 1997 Alex Korobka
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_X11FONT_H
diff --git a/include/zmouse.h b/include/zmouse.h
index 0e7288b60ac..3f38770e0ff 100644
--- a/include/zmouse.h
+++ b/include/zmouse.h
@@ -2,6 +2,20 @@
  * Scroll wheel mouse definitions
  *
  * Copyright (C) 2000 CodeWeavers
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_ZMOUSE_H
diff --git a/library/debug.c b/library/debug.c
index 3da33c12931..0d9f7da0ae4 100644
--- a/library/debug.c
+++ b/library/debug.c
@@ -2,6 +2,20 @@
  * Management of the debugging channels
  *
  * Copyright 2000 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
diff --git a/library/errno.c b/library/errno.c
index 63951e86268..21d4735e8e8 100644
--- a/library/errno.c
+++ b/library/errno.c
@@ -2,6 +2,20 @@
  * Wine library reentrant errno support
  *
  * Copyright 1998 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* Get pointers to the static errno and h_errno variables used by Xlib. This
diff --git a/library/ldt.c b/library/ldt.c
index 45f155eb863..94c4c5a19d0 100644
--- a/library/ldt.c
+++ b/library/ldt.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1993 Robert J. Amstadt
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/library/loader.c b/library/loader.c
index 93095462640..9f89c72afef 100644
--- a/library/loader.c
+++ b/library/loader.c
@@ -2,6 +2,20 @@
  * Win32 builtin dlls support
  *
  * Copyright 2000 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/library/port.c b/library/port.c
index 7763081fddd..26f1770b4aa 100644
--- a/library/port.c
+++ b/library/port.c
@@ -2,6 +2,20 @@
  * Misc. functions for systems that don't have them
  *
  * Copyright 1996 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/libtest/expand.c b/libtest/expand.c
index 07fd1b3f6c5..f1daf8cf715 100644
--- a/libtest/expand.c
+++ b/libtest/expand.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1997 Victor Schneider
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/libtest/guitest.c b/libtest/guitest.c
index 78e50478c18..fe76211fa01 100644
--- a/libtest/guitest.c
+++ b/libtest/guitest.c
@@ -1,5 +1,21 @@
-/* Windows GUI Behaviour Tester */
-/* by Ove Kåven */
+/* Windows GUI Behaviour Tester
+ *
+ * Copyright 1999 Ove Kåven
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include <stdio.h>
 #include <string.h>
diff --git a/libtest/guitest.rc b/libtest/guitest.rc
index 95e454e0233..9b284fdbead 100644
--- a/libtest/guitest.rc
+++ b/libtest/guitest.rc
@@ -1,12 +1,24 @@
 /****************************************************************************
-
-
-GUITEST.RC
-
-produced by Borland Resource Workshop
-
-
-*****************************************************************************/
+ * GUITEST.RC
+ *
+ * produced by Borland Resource Workshop
+ *
+ * Copyright 1999 Ove Kåven
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *****************************************************************************/
 
 #include "guitest.rh"
 
diff --git a/libtest/guitest.rh b/libtest/guitest.rh
index a151c74b0d3..d28351918df 100644
--- a/libtest/guitest.rh
+++ b/libtest/guitest.rh
@@ -1,12 +1,24 @@
 /****************************************************************************
-
-
-guitest.rh
-
-produced by Borland Resource Workshop
-
-
-*****************************************************************************/
+ * guitest.rh
+ *
+ * produced by Borland Resource Workshop
+ *
+ * Copyright 1999 Ove Kåven
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *****************************************************************************/
 
 #define IDC_CHECKBOX1	104
 #define IDC_CHECKBOX2	105
diff --git a/libtest/hello.c b/libtest/hello.c
index 41036cb4a51..618dd3fb5de 100644
--- a/libtest/hello.c
+++ b/libtest/hello.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1994 Miguel de Icaza
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <windows.h>
 
 char szAppName[] = "Hello";
diff --git a/libtest/hello2.c b/libtest/hello2.c
index 166eec4daa7..a3b443738fc 100644
--- a/libtest/hello2.c
+++ b/libtest/hello2.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1994 Miguel de Icaza
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include "windows.h"
 
 int PASCAL WinMain (HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
diff --git a/libtest/hello3.c b/libtest/hello3.c
index 80e077bf988..f71c25c5d8f 100644
--- a/libtest/hello3.c
+++ b/libtest/hello3.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1995 Martin von Loewis
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <windows.h>
 #include <commdlg.h>
 
diff --git a/libtest/hello3res.rc b/libtest/hello3res.rc
index 3e9110599f0..9978bcba7bc 100644
--- a/libtest/hello3res.rc
+++ b/libtest/hello3res.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1995 Martin von Loewis
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <windows.h>
 
 MAIN MENU 
diff --git a/libtest/hello4.c b/libtest/hello4.c
index a633db29b39..485e417b842 100644
--- a/libtest/hello4.c
+++ b/libtest/hello4.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1996 Jim Peterson
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <stdio.h>
 #include <windows.h>
 /* Win32 counterpart for CalcChildScroll16 is not implemented */
diff --git a/libtest/hello5.c b/libtest/hello5.c
index bbcaaf23607..c96350c8069 100644
--- a/libtest/hello5.c
+++ b/libtest/hello5.c
@@ -1,6 +1,23 @@
 /*
  * This example demonstrates dynamical loading of (internal) Win32 DLLS.
+ *
+ * Copyright 1998 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 #include <stdio.h>
 #include <windows.h>
 
diff --git a/libtest/new.c b/libtest/new.c
index dc0b5076f11..85f816528b2 100644
--- a/libtest/new.c
+++ b/libtest/new.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1996 Jim Peterson
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <windows.h>
 
 HANDLE ghInstance;
diff --git a/libtest/rolex.c b/libtest/rolex.c
index 4881600eda3..a3afdad2295 100644
--- a/libtest/rolex.c
+++ b/libtest/rolex.c
@@ -8,7 +8,22 @@
  *  compile with a standard Win32 C compiler.                        *
  *                                                                   *
  *  To try it out, type 'make rolex'.                                *
- *                                                                   *
+ *
+ * Copyright Jim Peterson
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *********************************************************************/
 
 #include <math.h>
diff --git a/libtest/vartest.c b/libtest/vartest.c
index 6839f42dc4d..6ed11421135 100644
--- a/libtest/vartest.c
+++ b/libtest/vartest.c
@@ -17,6 +17,19 @@
  * from Windows and Wine it is written so that with a simple
  * define it can be compiled either in Windows or Linux.
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * NOTES
  *	 - The Variant structure in Windows has a non-named union. This means
diff --git a/libtest/volinfo.c b/libtest/volinfo.c
index bc639d1fdd5..5d0a7703e52 100644
--- a/libtest/volinfo.c
+++ b/libtest/volinfo.c
@@ -1,6 +1,23 @@
 /*
  * This test program was copied from the former file documentation/cdrom-label
+ *
+ * Copyright 1998 Petter Reinholdtsen
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 #include <windows.h>
 #include <stdio.h>
 #include <string.h> /* for strcat() */
diff --git a/loader/elf.c b/loader/elf.c
index 378a7fed120..8dabd901a10 100644
--- a/loader/elf.c
+++ b/loader/elf.c
@@ -5,6 +5,20 @@
  *
  * Copyright 1998 Marcus Meissner
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * FIXME: 	Small reentrancy problem.
  * IDEA(s):	could be used to split up shell32,comctl32... 
  */
@@ -20,10 +34,10 @@
 #include "snoop.h"
 #include "file.h"
 #include "module.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winerror.h"
 
-DEFAULT_DEBUG_CHANNEL(win32);
+WINE_DEFAULT_DEBUG_CHANNEL(win32);
 
 typedef struct {
 	WORD	popl	WINE_PACKED;	/* 0x8f 0x05 */
diff --git a/loader/loadorder.c b/loader/loadorder.c
index 7d6dc13ca94..997f1146e30 100644
--- a/loader/loadorder.c
+++ b/loader/loadorder.c
@@ -2,6 +2,20 @@
  * Module/Library loadorder
  *
  * Copyright 1999 Bertho Stultiens
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -16,9 +30,9 @@
 #include "options.h"
 #include "file.h"
 #include "module.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(module);
+WINE_DEFAULT_DEBUG_CHANNEL(module);
 
 #define LOADORDER_ALLOC_CLUSTER	32	/* Allocate with 32 entries at a time */
 
diff --git a/loader/main.c b/loader/main.c
index 5e46c46fd0f..95531bef802 100644
--- a/loader/main.c
+++ b/loader/main.c
@@ -1,5 +1,21 @@
 /*
  * Main initialization code
+ *
+ * Copyright 1998 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <locale.h>
@@ -19,10 +35,10 @@
 #include "file.h"
 #include "options.h"
 #include "module.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "wine/server.h"
 
-DEFAULT_DEBUG_CHANNEL(server);
+WINE_DEFAULT_DEBUG_CHANNEL(server);
 
 extern void SHELL_LoadRegistry(void);
 
diff --git a/loader/module.c b/loader/module.c
index 455f005d0ce..1ce960cce4d 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -2,6 +2,20 @@
  * Modules
  *
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
@@ -16,12 +30,12 @@
 #include "heap.h"
 #include "file.h"
 #include "module.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "wine/server.h"
 
-DEFAULT_DEBUG_CHANNEL(module);
-DECLARE_DEBUG_CHANNEL(win32);
-DECLARE_DEBUG_CHANNEL(loaddll);
+WINE_DEFAULT_DEBUG_CHANNEL(module);
+WINE_DECLARE_DEBUG_CHANNEL(win32);
+WINE_DECLARE_DEBUG_CHANNEL(loaddll);
 
 WINE_MODREF *MODULE_modref_list = NULL;
 
diff --git a/loader/ne/convert.c b/loader/ne/convert.c
index 3a27eff68ce..13391bc3d5c 100644
--- a/loader/ne/convert.c
+++ b/loader/ne/convert.c
@@ -2,6 +2,20 @@
  * PE->NE resource conversion functions
  *
  * Copyright 1998 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -10,9 +24,9 @@
 #include "wine/winuser16.h"
 #include "wine/unicode.h"
 #include "module.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(resource);
+WINE_DEFAULT_DEBUG_CHANNEL(resource);
 
 /**********************************************************************
  *	    ConvertDialog32To16   (KERNEL.615)
diff --git a/loader/ne/module.c b/loader/ne/module.c
index a2ed4a0ac35..a4e4ad81d57 100644
--- a/loader/ne/module.c
+++ b/loader/ne/module.c
@@ -2,6 +2,20 @@
  * NE modules
  *
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -24,10 +38,10 @@
 #include "snoop.h"
 #include "builtin16.h"
 #include "stackframe.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(module);
-DECLARE_DEBUG_CHANNEL(loaddll);
+WINE_DEFAULT_DEBUG_CHANNEL(module);
+WINE_DECLARE_DEBUG_CHANNEL(loaddll);
 
 /*
  * Segment table entry
diff --git a/loader/ne/resource.c b/loader/ne/resource.c
index e636af75fc3..75ff39e1a0c 100644
--- a/loader/ne/resource.c
+++ b/loader/ne/resource.c
@@ -4,6 +4,20 @@
  * Copyright 1993 Robert J. Amstadt
  * Copyright 1995 Alexandre Julliard
  * Copyright 1997 Alex Korobka
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -20,9 +34,9 @@
 #include "wine/winbase16.h"
 #include "wine/library.h"
 #include "module.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(resource);
+WINE_DEFAULT_DEBUG_CHANNEL(resource);
 
 #define NEXT_TYPEINFO(pTypeInfo) ((NE_TYPEINFO *)((char*)((pTypeInfo) + 1) + \
                                    (pTypeInfo)->count * sizeof(NE_NAMEINFO)))
diff --git a/loader/ne/segment.c b/loader/ne/segment.c
index 2edb970c776..c0e0af9eab5 100644
--- a/loader/ne/segment.c
+++ b/loader/ne/segment.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1993 Robert J. Amstadt
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
@@ -22,12 +36,12 @@
 #include "module.h"
 #include "stackframe.h"
 #include "builtin16.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DECLARE_DEBUG_CHANNEL(dll);
-DECLARE_DEBUG_CHANNEL(fixup);
-DECLARE_DEBUG_CHANNEL(module);
-DECLARE_DEBUG_CHANNEL(segment);
+WINE_DECLARE_DEBUG_CHANNEL(dll);
+WINE_DECLARE_DEBUG_CHANNEL(fixup);
+WINE_DECLARE_DEBUG_CHANNEL(module);
+WINE_DECLARE_DEBUG_CHANNEL(segment);
 
 /*
  * Relocation table entry
diff --git a/loader/pe_image.c b/loader/pe_image.c
index 4de3f20fd9a..2684f5bccb3 100644
--- a/loader/pe_image.c
+++ b/loader/pe_image.c
@@ -4,10 +4,21 @@
  *  Copyright   1996-98 Marcus Meissner
  *
  *	based on Eric Youndale's pe-test and:
- *
- *	ftp.microsoft.com:/pub/developer/MSDN/CD8/PEFILE.ZIP
- * make that:
  *	ftp.microsoft.com:/developr/MSDN/OctCD/PEFILE.ZIP
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 /* Notes:
  * Before you start changing something in this file be aware of the following:
@@ -34,14 +45,14 @@
 #include "winerror.h"
 #include "snoop.h"
 #include "wine/server.h"
-#include "debugtools.h"
-
-DEFAULT_DEBUG_CHANNEL(win32);
-DECLARE_DEBUG_CHANNEL(delayhlp);
-DECLARE_DEBUG_CHANNEL(fixup);
-DECLARE_DEBUG_CHANNEL(module);
-DECLARE_DEBUG_CHANNEL(relay);
-DECLARE_DEBUG_CHANNEL(segment);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(win32);
+WINE_DECLARE_DEBUG_CHANNEL(delayhlp);
+WINE_DECLARE_DEBUG_CHANNEL(fixup);
+WINE_DECLARE_DEBUG_CHANNEL(module);
+WINE_DECLARE_DEBUG_CHANNEL(relay);
+WINE_DECLARE_DEBUG_CHANNEL(segment);
 
 
 static IMAGE_EXPORT_DIRECTORY *get_exports( HMODULE hmod )
diff --git a/loader/pe_resource.c b/loader/pe_resource.c
index a14a9bcddf0..0f06b621371 100644
--- a/loader/pe_resource.c
+++ b/loader/pe_resource.c
@@ -8,6 +8,20 @@
  * Copyright 1993 Robert J. Amstadt
  * Copyright 1995 Alexandre Julliard
  * Copyright 1997 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -21,9 +35,9 @@
 #include "winerror.h"
 #include "module.h"
 #include "stackframe.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(resource);
+WINE_DEFAULT_DEBUG_CHANNEL(resource);
 
 
 /**********************************************************************
diff --git a/loader/resource.c b/loader/resource.c
index 4967843fdfc..26ee26f63e4 100644
--- a/loader/resource.c
+++ b/loader/resource.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1993 Robert J. Amstadt
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
@@ -20,12 +34,12 @@
 #include "cursoricon.h"
 #include "module.h"
 #include "file.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winerror.h"
 #include "winnls.h"
 #include "msvcrt/excpt.h"
 
-DEFAULT_DEBUG_CHANNEL(resource);
+WINE_DEFAULT_DEBUG_CHANNEL(resource);
 
 #define HRSRC_MAP_BLOCKSIZE 16
 
diff --git a/loader/task.c b/loader/task.c
index 679efba1af1..005827f2da7 100644
--- a/loader/task.c
+++ b/loader/task.c
@@ -2,6 +2,20 @@
  * Task functions
  *
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -34,11 +48,11 @@
 #include "thread.h"
 #include "toolhelp.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(task);
-DECLARE_DEBUG_CHANNEL(relay);
-DECLARE_DEBUG_CHANNEL(toolhelp);
+WINE_DEFAULT_DEBUG_CHANNEL(task);
+WINE_DECLARE_DEBUG_CHANNEL(relay);
+WINE_DECLARE_DEBUG_CHANNEL(toolhelp);
 
   /* Min. number of thunks allocated when creating a new segment */
 #define MIN_THUNKS  32
diff --git a/memory/atom.c b/memory/atom.c
index 033eb4c4167..f64055bc7d1 100644
--- a/memory/atom.c
+++ b/memory/atom.c
@@ -2,6 +2,20 @@
  * Atom table functions
  *
  * Copyright 1993, 1994, 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /*
@@ -29,9 +43,9 @@
 #include "instance.h"
 #include "stackframe.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(atom);
+WINE_DEFAULT_DEBUG_CHANNEL(atom);
 
 #define DEFAULT_ATOMTABLE_SIZE    37
 #define MAX_ATOM_LEN              255
diff --git a/memory/codepage.c b/memory/codepage.c
index f0bfb20ca1a..21915ad1d54 100644
--- a/memory/codepage.c
+++ b/memory/codepage.c
@@ -2,6 +2,20 @@
  * Code page functions
  *
  * Copyright 2000 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
@@ -13,9 +27,9 @@
 #include "winerror.h"
 #include "winnls.h"
 #include "wine/unicode.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(string);
+WINE_DEFAULT_DEBUG_CHANNEL(string);
 
 /* current code pages */
 static const union cptable *ansi_cptable;
diff --git a/memory/environ.c b/memory/environ.c
index c4d87069da0..2e4aec58f81 100644
--- a/memory/environ.c
+++ b/memory/environ.c
@@ -2,6 +2,20 @@
  * Process environment management
  *
  * Copyright 1996, 1998 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/memory/global.c b/memory/global.c
index 90dc2c7e768..2431bd6b381 100644
--- a/memory/global.c
+++ b/memory/global.c
@@ -2,6 +2,20 @@
  * Global heap functions
  *
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 /* 0xffff sometimes seems to mean: CURRENT_DS */
 
@@ -23,11 +37,11 @@
 #include "miscemu.h"
 #include "stackframe.h"
 #include "module.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winerror.h"
 #include "msvcrt/excpt.h"
 
-DEFAULT_DEBUG_CHANNEL(global);
+WINE_DEFAULT_DEBUG_CHANNEL(global);
 
   /* Global arena block */
 typedef struct
diff --git a/memory/heap.c b/memory/heap.c
index 61548983662..c3fbd5be70a 100644
--- a/memory/heap.c
+++ b/memory/heap.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1996 Alexandre Julliard
  * Copyright 1998 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -22,9 +36,9 @@
 #include "global.h"
 #include "thread.h"
 #include "toolhelp.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(heap);
+WINE_DEFAULT_DEBUG_CHANNEL(heap);
 
 /* address where we try to map the system heap */
 #define SYSTEM_HEAP_BASE  ((void*)0x65430000)
diff --git a/memory/instr.c b/memory/instr.c
index c7f20dcb667..30d04d1bcef 100644
--- a/memory/instr.c
+++ b/memory/instr.c
@@ -2,6 +2,20 @@
  * Emulation of privileged instructions
  *
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
@@ -10,10 +24,10 @@
 #include "module.h"
 #include "miscemu.h"
 #include "selectors.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(int);
-DECLARE_DEBUG_CHANNEL(io);
+WINE_DEFAULT_DEBUG_CHANNEL(int);
+WINE_DECLARE_DEBUG_CHANNEL(io);
 
 #ifdef __i386__
 
diff --git a/memory/local.c b/memory/local.c
index 0ffee00da73..4041ea38093 100644
--- a/memory/local.c
+++ b/memory/local.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1995 Alexandre Julliard
  * Copyright 1996 Huw Davies
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /*
@@ -22,10 +36,10 @@
 #include "module.h"
 #include "stackframe.h"
 #include "toolhelp.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(local);
-DECLARE_DEBUG_CHANNEL(heap);
+WINE_DEFAULT_DEBUG_CHANNEL(local);
+WINE_DECLARE_DEBUG_CHANNEL(heap);
 
 typedef struct
 {
diff --git a/memory/registry.c b/memory/registry.c
index 2d1be8ed38e..9bd7024713f 100644
--- a/memory/registry.c
+++ b/memory/registry.c
@@ -10,6 +10,20 @@
  *
  * This file is concerned about handle management and interaction with the Wine server.
  * Registry file I/O is in misc/registry.c.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -22,9 +36,9 @@
 #include "wine/winbase16.h"
 #include "wine/unicode.h"
 #include "wine/server.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(reg);
+WINE_DEFAULT_DEBUG_CHANNEL(reg);
 
 
 /* check if value type needs string conversion (Ansi<->Unicode) */
diff --git a/memory/selector.c b/memory/selector.c
index 57af3ff4f07..132ba4c1091 100644
--- a/memory/selector.c
+++ b/memory/selector.c
@@ -2,6 +2,20 @@
  * Selector manipulation functions
  *
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -14,10 +28,10 @@
 #include "selectors.h"
 #include "stackframe.h"
 #include "wine/server.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "toolhelp.h"
 
-DEFAULT_DEBUG_CHANNEL(selector);
+WINE_DEFAULT_DEBUG_CHANNEL(selector);
 
 #define LDT_SIZE 8192
 
diff --git a/memory/string.c b/memory/string.c
index b2ac9e15773..6d4bbae1f90 100644
--- a/memory/string.c
+++ b/memory/string.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1993 Yngvi Sigurjonsson
  * Copyright 1996 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <ctype.h>
@@ -16,9 +30,9 @@
 #include "winerror.h"
 #include "winnls.h"
 #include "msvcrt/excpt.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(string);
+WINE_DEFAULT_DEBUG_CHANNEL(string);
 
 /* filter for page-fault exceptions */
 static WINE_EXCEPTION_FILTER(page_fault)
diff --git a/memory/virtual.c b/memory/virtual.c
index e83c5266073..7960f9101e6 100644
--- a/memory/virtual.c
+++ b/memory/virtual.c
@@ -2,6 +2,20 @@
  * Win32 virtual memory functions
  *
  * Copyright 1997 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -31,10 +45,10 @@
 #include "global.h"
 #include "wine/server.h"
 #include "msvcrt/excpt.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(virtual);
-DECLARE_DEBUG_CHANNEL(module);
+WINE_DEFAULT_DEBUG_CHANNEL(virtual);
+WINE_DECLARE_DEBUG_CHANNEL(module);
 
 #ifndef MS_SYNC
 #define MS_SYNC 0
diff --git a/misc/cpu.c b/misc/cpu.c
index 5b6fa1ff353..2f169f41390 100644
--- a/misc/cpu.c
+++ b/misc/cpu.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1995,1997 Morten Welinder
  * Copyright 1997-1998 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -16,9 +30,9 @@
 #include "winreg.h"
 #include "winnt.h"
 #include "winerror.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(reg);
+WINE_DEFAULT_DEBUG_CHANNEL(reg);
 
 static BYTE PF[64] = {0,};
 
diff --git a/misc/error.c b/misc/error.c
index a5254a587cb..6fe2e95a742 100644
--- a/misc/error.c
+++ b/misc/error.c
@@ -2,6 +2,20 @@
  * Log internal errors 
  *
  * Copyright 1997 Andrew Taylor
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -11,7 +25,7 @@
 #include "winbase.h"
 #include "windef.h"
 #include "stackframe.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 
 /* LogParamError and LogError values */
diff --git a/misc/main.c b/misc/main.c
index ef247c74086..93aed08ddb5 100644
--- a/misc/main.c
+++ b/misc/main.c
@@ -2,6 +2,20 @@
  * Main function.
  *
  * Copyright 1994 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -22,9 +36,9 @@
 #include "winnls.h"
 #include "winerror.h"
 #include "options.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DECLARE_DEBUG_CHANNEL(file);
+WINE_DECLARE_DEBUG_CHANNEL(file);
 
 
 /***********************************************************************
diff --git a/misc/options.c b/misc/options.c
index 4a9cac87202..c1e82abdd7b 100644
--- a/misc/options.c
+++ b/misc/options.c
@@ -2,6 +2,20 @@
  * Option parsing
  *
  * Copyright 2000 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -15,7 +29,7 @@
 #include "wine/version.h"
 #include "options.h"
 #include "module.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 struct option_descr
 {
diff --git a/misc/registry.c b/misc/registry.c
index c89de50ee36..378c7a64950 100644
--- a/misc/registry.c
+++ b/misc/registry.c
@@ -9,6 +9,20 @@
  * Fixed bugs in the _w95_loadreg() function. Added extra information
  * regarding the format of the Windows '95 registry files.
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * NOTES
  *    When changing this file, please re-run the regtest program to ensure
  *    the conditions are handled properly.
@@ -43,9 +57,9 @@
 #include "file.h"
 #include "options.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(reg);
+WINE_DEFAULT_DEBUG_CHANNEL(reg);
 
 /* FIXME: following defines should be configured global */
 #define SAVE_GLOBAL_REGBRANCH_USER_DEFAULT  ETCDIR"/wine.userreg"
diff --git a/misc/system.c b/misc/system.c
index b6f089d42c2..57d3660b0e9 100644
--- a/misc/system.c
+++ b/misc/system.c
@@ -2,6 +2,20 @@
  * SYSTEM DLL routines
  *
  * Copyright 1996 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
@@ -10,9 +24,9 @@
 #include "wine/winuser16.h"
 #include "services.h"
 #include "stackframe.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(system);
+WINE_DEFAULT_DEBUG_CHANNEL(system);
 
 typedef struct
 {
diff --git a/misc/version.c b/misc/version.c
index 085912a808c..0925d74197f 100644
--- a/misc/version.c
+++ b/misc/version.c
@@ -5,6 +5,20 @@
  * Copyright 1997 Marcus Meissner
  * Copyright 1998 Patrik Stridvall
  * Copyright 1998 Andreas Mohr
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -17,10 +31,10 @@
 #include "wine/winbase16.h"
 #include "module.h"
 #include "options.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winerror.h"
 
-DEFAULT_DEBUG_CHANNEL(ver);
+WINE_DEFAULT_DEBUG_CHANNEL(ver);
 
 typedef enum
 {
diff --git a/miscemu/main.c b/miscemu/main.c
index ececb2e900c..e248d8ab2cc 100644
--- a/miscemu/main.c
+++ b/miscemu/main.c
@@ -1,6 +1,21 @@
 /*
  * Emulator initialisation code
  *
+ * Copyright 2000 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "winbase.h"
@@ -11,7 +26,7 @@
 #include "miscemu.h"
 #include "callback.h"
 #include "options.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 static char main_exe_name[MAX_PATH];
 static HANDLE main_exe_file;
diff --git a/msdos/dosconf.c b/msdos/dosconf.c
index 1f6c18b0966..9192967ca5e 100644
--- a/msdos/dosconf.c
+++ b/msdos/dosconf.c
@@ -3,6 +3,19 @@
  *
  * Copyright 1998 Andreas Mohr 
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -20,9 +33,9 @@
 #include "msdos.h"
 #include "options.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(profile);
+WINE_DEFAULT_DEBUG_CHANNEL(profile);
 
 
 static int DOSCONF_Device(char **confline);
diff --git a/msdos/dosmem.c b/msdos/dosmem.c
index 5708a4d280a..84e1735aa31 100644
--- a/msdos/dosmem.c
+++ b/msdos/dosmem.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1995 Alexandre Julliard
  * Copyright 1996 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -22,10 +36,10 @@
 #include "global.h"
 #include "selectors.h"
 #include "miscemu.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(dosmem);
-DECLARE_DEBUG_CHANNEL(selector);
+WINE_DEFAULT_DEBUG_CHANNEL(dosmem);
+WINE_DECLARE_DEBUG_CHANNEL(selector);
 
 WORD DOSMEM_0000H;        /* segment at 0:0 */
 WORD DOSMEM_BiosDataSeg;  /* BIOS data segment at 0x40:0 */
diff --git a/msdos/dpmi.c b/msdos/dpmi.c
index 13d18b9e79f..021c94d273a 100644
--- a/msdos/dpmi.c
+++ b/msdos/dpmi.c
@@ -2,6 +2,20 @@
  * DPMI 0.9 emulation
  *
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -18,9 +32,9 @@
 #include "toolhelp.h"
 #include "selectors.h"
 #include "callback.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(int31);
+WINE_DEFAULT_DEBUG_CHANNEL(int31);
 
 #define DOS_GET_DRIVE(reg) ((reg) ? (reg) - 1 : DRIVE_GetCurrentDrive())
 
diff --git a/msdos/int11.c b/msdos/int11.c
index 22fe894f7e1..5a2811ada29 100644
--- a/msdos/int11.c
+++ b/msdos/int11.c
@@ -1,5 +1,21 @@
 /*
  * BIOS interrupt 11h handler
+ *
+ * Copyright 1996 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -11,7 +27,7 @@
 #include "windef.h"
 #include "miscemu.h"
 #include "msdos.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "options.h"
 
 /**********************************************************************
diff --git a/msdos/int13.c b/msdos/int13.c
index dd5fe89d47b..31a2bbda641 100644
--- a/msdos/int13.c
+++ b/msdos/int13.c
@@ -1,5 +1,21 @@
 /*
  * BIOS interrupt 13h handler
+ *
+ * Copyright 1997 Andreas Mohr
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -12,10 +28,10 @@
 #endif
 #include "miscemu.h"
 /* #define DEBUG_INT */
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "drive.h"
 
-DEFAULT_DEBUG_CHANNEL(int);
+WINE_DEFAULT_DEBUG_CHANNEL(int);
 
 /**********************************************************************
  *	    INT_Int13Handler (WPROCS.119)
diff --git a/msdos/int15.c b/msdos/int15.c
index 9e7468c4ff0..c0d5c58bfa7 100644
--- a/msdos/int15.c
+++ b/msdos/int15.c
@@ -1,12 +1,28 @@
 /*
  * BIOS interrupt 15h handler
+ *
+ * Copyright 1997 Jan Willamowius
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
 #include "miscemu.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(int);
+WINE_DEFAULT_DEBUG_CHANNEL(int);
 
 
 /**********************************************************************
diff --git a/msdos/int1a.c b/msdos/int1a.c
index 278874a49ca..233f378ebef 100644
--- a/msdos/int1a.c
+++ b/msdos/int1a.c
@@ -1,5 +1,21 @@
 /*
  * BIOS interrupt 1ah handler
+ *
+ * Copyright 1993 Erik Bos
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <time.h>
@@ -7,9 +23,9 @@
 #include <stdlib.h>
 #include "options.h"
 #include "miscemu.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(int);
+WINE_DEFAULT_DEBUG_CHANNEL(int);
 
 #define	BCD_TO_BIN(x) ((x&15) + (x>>4)*10)
 #define BIN_TO_BCD(x) ((x%10) + ((x/10)<<4))
diff --git a/msdos/int20.c b/msdos/int20.c
index e98c4384fcb..038653a3feb 100644
--- a/msdos/int20.c
+++ b/msdos/int20.c
@@ -1,5 +1,21 @@
 /*
  * DOS interrupt 20h handler (TERMINATE PROGRAM)
+ *
+ * Copyright 1997 Andreas Mohr
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
diff --git a/msdos/int21.c b/msdos/int21.c
index 4578aaca93d..36232074cf2 100644
--- a/msdos/int21.c
+++ b/msdos/int21.c
@@ -1,5 +1,25 @@
 /*
  * DOS interrupt 21h handler
+ *
+ * Copyright 1993, 1994 Erik Bos
+ * Copyright 1996 Alexandre Julliard
+ * Copyright 1997 Andreas Mohr
+ * Copyright 1998 Uwe Bonnes
+ * Copyright 1998, 1999 Ove Kaaven
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -32,9 +52,9 @@
 #include "options.h"
 #include "miscemu.h"
 #include "task.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(int21);
+WINE_DEFAULT_DEBUG_CHANNEL(int21);
 #if defined(__svr4__) || defined(_SCO_DS)
 /* SVR4 DOESNT do locking the same way must implement properly */
 #define LOCK_EX 0
diff --git a/msdos/int25.c b/msdos/int25.c
index 6e99073c82c..82c54c18644 100644
--- a/msdos/int25.c
+++ b/msdos/int25.c
@@ -1,5 +1,21 @@
 /*
  * DOS interrupt 25h handler
+ *
+ * Copyright 1997 Andreas Mohr
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -9,9 +25,9 @@
 #include "msdos.h"
 #include "miscemu.h"
 #include "drive.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(int);
+WINE_DEFAULT_DEBUG_CHANNEL(int);
 
 
 /**********************************************************************
diff --git a/msdos/int26.c b/msdos/int26.c
index 1643276668a..31fc7961b15 100644
--- a/msdos/int26.c
+++ b/msdos/int26.c
@@ -1,5 +1,21 @@
 /*
  * DOS interrupt 26h handler
+ *
+ * Copyright 1997 Andreas Mohr
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -8,9 +24,9 @@
 #include "msdos.h"
 #include "miscemu.h"
 #include "drive.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(int);
+WINE_DEFAULT_DEBUG_CHANNEL(int);
 
 /**********************************************************************
  *	    INT_Int26Handler (WPROCS.138)
diff --git a/msdos/int2a.c b/msdos/int2a.c
index fe8e5ce877f..c9a1efa839d 100644
--- a/msdos/int2a.c
+++ b/msdos/int2a.c
@@ -5,9 +5,9 @@
 #include <stdlib.h>
 #include "msdos.h"
 #include "miscemu.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(int);
+WINE_DEFAULT_DEBUG_CHANNEL(int);
 
 /**********************************************************************
  *	    INT_Int2aHandler (WPROCS.142)
diff --git a/msdos/int2f.c b/msdos/int2f.c
index 0a44ac36c39..4585c667aa3 100644
--- a/msdos/int2f.c
+++ b/msdos/int2f.c
@@ -3,8 +3,22 @@
  * DOS interrupt 2fh handler
  *
  *  Cdrom - device driver emulation - Audio features.
- * 	(c) 1998 Petr Tomasek <tomasek@etf.cuni.cz>
- *	(c) 1999,2002 Eric Pouech
+ *     Copyright (c) 1998 Petr Tomasek <tomasek@etf.cuni.cz>
+ *     Copyright (c) 1999,2002 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -14,12 +28,12 @@
 #include "miscemu.h"
 #include "module.h"
 /* #define DEBUG_INT */
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winioctl.h"
 #include "ntddstor.h"
 #include "ntddcdrm.h"
 
-DEFAULT_DEBUG_CHANNEL(int);
+WINE_DEFAULT_DEBUG_CHANNEL(int);
 
 /* base WPROCS.DLL ordinal number for VxDs */
 #define VXD_BASE 400
diff --git a/msdos/int3d.c b/msdos/int3d.c
index 90420d92600..6f39fe35ea7 100644
--- a/msdos/int3d.c
+++ b/msdos/int3d.c
@@ -1,14 +1,28 @@
 /*
  * DOS interrupt 3d handler.
  * Copyright 1997 Len White
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
 #include "msdos.h"
 #include "miscemu.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(int);
+WINE_DEFAULT_DEBUG_CHANNEL(int);
 
 /**********************************************************************
  *          INT_Int3dHandler (WPROCS.161)
diff --git a/msdos/int41.c b/msdos/int41.c
index cba733754cd..c9ac67f8f4a 100644
--- a/msdos/int41.c
+++ b/msdos/int41.c
@@ -2,13 +2,29 @@
  * DOS interrupt 41h handler  -- Windows Kernel Debugger
  * 
  * Check debugsys.inc from the DDK for docu.
+ *
+ * Copyright 1998 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
 #include "miscemu.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(int);
+WINE_DEFAULT_DEBUG_CHANNEL(int);
 
 /***********************************************************************
  *           INT_Int41Handler (WPROCS.165)
diff --git a/msdos/int4b.c b/msdos/int4b.c
index 09432243269..1056ea9536a 100644
--- a/msdos/int4b.c
+++ b/msdos/int4b.c
@@ -4,9 +4,9 @@
 
 #include <stdio.h>
 #include "miscemu.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(int);
+WINE_DEFAULT_DEBUG_CHANNEL(int);
 
 /***********************************************************************
  *           INT_Int4bHandler (WPROCS.175)
diff --git a/msdos/int5c.c b/msdos/int5c.c
index 19672720611..3c30d751b72 100644
--- a/msdos/int5c.c
+++ b/msdos/int5c.c
@@ -2,12 +2,26 @@
  * NetBIOS interrupt handling
  *
  * Copyright 1995 Alexandre Julliard, Alex Korobka
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "miscemu.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(int);
+WINE_DEFAULT_DEBUG_CHANNEL(int);
 
 
 /***********************************************************************
diff --git a/msdos/interrupts.c b/msdos/interrupts.c
index 4abf2e13b9d..27e75c6edd1 100644
--- a/msdos/interrupts.c
+++ b/msdos/interrupts.c
@@ -2,6 +2,20 @@
  * Interrupt vectors emulation
  *
  * Copyright 1995 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <sys/types.h>
@@ -10,9 +24,9 @@
 #include "miscemu.h"
 #include "msdos.h"
 #include "module.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(int);
+WINE_DEFAULT_DEBUG_CHANNEL(int);
 
 static FARPROC16 INT_Vectors[256];
 
diff --git a/msdos/ioports.c b/msdos/ioports.c
index 235b1e1f5e3..2cae99edf65 100644
--- a/msdos/ioports.c
+++ b/msdos/ioports.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1995 Morten Welinder
  * Copyright 1998 Andreas Mohr, Ove Kaaven
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* Known problems:
@@ -23,9 +37,9 @@
 #include "callback.h"
 #include "options.h"
 #include "miscemu.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(int);
+WINE_DEFAULT_DEBUG_CHANNEL(int);
 
 static struct {
     WORD	countmax;
diff --git a/msdos/ppdev.c b/msdos/ppdev.c
index 78a102a11c2..b413eb78d85 100644
--- a/msdos/ppdev.c
+++ b/msdos/ppdev.c
@@ -1,5 +1,21 @@
 /*
  * Parallel-port device support
+ *
+ * Copyright 2001 Uwe Bonnes
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -19,9 +35,9 @@
 
 #include "miscemu.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(int);
+WINE_DEFAULT_DEBUG_CHANNEL(int);
 
 typedef struct _PPDEVICESTRUCT{
   int fd; /* NULL if device not available */
diff --git a/msdos/vxd.c b/msdos/vxd.c
index 2bbf5483848..5816b284296 100644
--- a/msdos/vxd.c
+++ b/msdos/vxd.c
@@ -2,6 +2,20 @@
  * VxD emulation
  *
  * Copyright 1995 Anand Kumria
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <fcntl.h>
@@ -20,9 +34,9 @@
 #include "selectors.h"
 #include "task.h"
 #include "file.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(vxd);
+WINE_DEFAULT_DEBUG_CHANNEL(vxd);
 
 
 #define VXD_BARF(context,name) \
diff --git a/objects/bitmap.c b/objects/bitmap.c
index 80dc0a2c16d..41a1248551e 100644
--- a/objects/bitmap.c
+++ b/objects/bitmap.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1993 Alexandre Julliard
  *           1998 Huw D M Davies
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -11,10 +25,10 @@
 #include "wine/winbase16.h"
 #include "gdi.h"
 #include "bitmap.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "wine/winuser16.h"
 
-DEFAULT_DEBUG_CHANNEL(bitmap);
+WINE_DEFAULT_DEBUG_CHANNEL(bitmap);
 
 BITMAP_DRIVER *BITMAP_Driver = NULL;
 
diff --git a/objects/brush.c b/objects/brush.c
index cef8f523c86..ac747f7274b 100644
--- a/objects/brush.c
+++ b/objects/brush.c
@@ -2,6 +2,20 @@
  * GDI brush objects
  *
  * Copyright 1993, 1994  Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -15,9 +29,9 @@
 #include "bitmap.h"
 #include "brush.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(gdi);
+WINE_DEFAULT_DEBUG_CHANNEL(gdi);
 
 static HGLOBAL16 dib_copy(BITMAPINFO *info, UINT coloruse)
 {
diff --git a/objects/clipping.c b/objects/clipping.c
index e6e58144a74..ccf695be6df 100644
--- a/objects/clipping.c
+++ b/objects/clipping.c
@@ -2,6 +2,20 @@
  * DC clipping functions
  *
  * Copyright 1993 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -10,9 +24,9 @@
 #include "wine/winuser16.h"
 #include "gdi.h"
 #include "region.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(clipping);
+WINE_DEFAULT_DEBUG_CHANNEL(clipping);
 
 
 /***********************************************************************
diff --git a/objects/color.c b/objects/color.c
index 5ee3a06afe8..e6c4f9e89b5 100644
--- a/objects/color.c
+++ b/objects/color.c
@@ -3,14 +3,28 @@
  *
  * Copyright 1993 Alexandre Julliard
  * Copyright 1996 Alex Korobka
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "color.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "palette.h"
 #include "windef.h"
 
-DEFAULT_DEBUG_CHANNEL(palette);
+WINE_DEFAULT_DEBUG_CHANNEL(palette);
 
 
 /***********************************************************************
diff --git a/objects/dc.c b/objects/dc.c
index 267bb0115d7..d49bc3d3af5 100644
--- a/objects/dc.c
+++ b/objects/dc.c
@@ -3,6 +3,19 @@
  *
  * Copyright 1993 Alexandre Julliard
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -11,14 +24,14 @@
 #include <string.h>
 #include "gdi.h"
 #include "heap.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "font.h"
 #include "winerror.h"
 #include "windef.h"
 #include "wingdi.h"
 #include "wine/winuser16.h"
 
-DEFAULT_DEBUG_CHANNEL(dc);
+WINE_DEFAULT_DEBUG_CHANNEL(dc);
 
 /* ### start build ### */
 extern WORD CALLBACK GDI_CallTo16_word_wwll(FARPROC16,WORD,WORD,LONG,LONG);
diff --git a/objects/dcvalues.c b/objects/dcvalues.c
index a25c01cadd8..331649ca5c8 100644
--- a/objects/dcvalues.c
+++ b/objects/dcvalues.c
@@ -3,6 +3,19 @@
  *
  * Copyright 1993 Alexandre Julliard
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/objects/dib.c b/objects/dib.c
index f14cd05c557..bbd16ce6fc2 100644
--- a/objects/dib.c
+++ b/objects/dib.c
@@ -3,6 +3,19 @@
  *
  * Copyright 1993,1994  Alexandre Julliard
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -12,10 +25,10 @@
 #include "bitmap.h"
 #include "selectors.h"
 #include "gdi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "palette.h"
 
-DEFAULT_DEBUG_CHANNEL(bitmap);
+WINE_DEFAULT_DEBUG_CHANNEL(bitmap);
 
 /***********************************************************************
  *           DIB_GetDIBWidthBytes
diff --git a/objects/enhmetafile.c b/objects/enhmetafile.c
index 4aa38b0e754..03203d6f725 100644
--- a/objects/enhmetafile.c
+++ b/objects/enhmetafile.c
@@ -3,7 +3,22 @@
  * Copyright 1998 Douglas Ridgway
  *           1999 Huw D M Davies 
  *
- * 
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * NOTES:
+ *
  * The enhanced format consists of the following elements: 
  *
  *    A header 
@@ -22,10 +37,10 @@
 #include "winbase.h"
 #include "wingdi.h"
 #include "winerror.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "metafile.h"
 
-DEFAULT_DEBUG_CHANNEL(enhmetafile);
+WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile);
 
 typedef struct
 {
diff --git a/objects/font.c b/objects/font.c
index acad7106ccc..ad0add9e68c 100644
--- a/objects/font.c
+++ b/objects/font.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1993 Alexandre Julliard
  *           1997 Alex Korobka
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -13,11 +27,11 @@
 #include "wine/unicode.h"
 #include "font.h"
 #include "options.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "gdi.h"
 
-DEFAULT_DEBUG_CHANNEL(font);
-DECLARE_DEBUG_CHANNEL(gdi);
+WINE_DEFAULT_DEBUG_CHANNEL(font);
+WINE_DECLARE_DEBUG_CHANNEL(gdi);
 
 #define ENUM_UNICODE	0x00000001
 
diff --git a/objects/gdiobj.c b/objects/gdiobj.c
index 0b1c5dc3ac5..1057c1c16d4 100644
--- a/objects/gdiobj.c
+++ b/objects/gdiobj.c
@@ -2,6 +2,20 @@
  * GDI functions
  *
  * Copyright 1993 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -23,10 +37,10 @@
 #include "palette.h"
 #include "pen.h"
 #include "region.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "gdi.h"
 
-DEFAULT_DEBUG_CHANNEL(gdi);
+WINE_DEFAULT_DEBUG_CHANNEL(gdi);
 
 /* ### start build ### */
 extern WORD CALLBACK GDI_CallTo16_word_ll(GOBJENUMPROC16,LONG,LONG);
diff --git a/objects/linedda.c b/objects/linedda.c
index f02531677f8..aae98bfa465 100644
--- a/objects/linedda.c
+++ b/objects/linedda.c
@@ -2,6 +2,20 @@
  * LineDDA
  *
  * Copyright 1993 Bob Amstadt
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
diff --git a/objects/metafile.c b/objects/metafile.c
index dfa5e300c15..c6ac28aac4e 100644
--- a/objects/metafile.c
+++ b/objects/metafile.c
@@ -4,6 +4,19 @@
  * Copyright  David W. Metcalfe, 1994
  *            Niels de Carpentier, Albrecht Kleine, Huw Davies 1996
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /*
@@ -41,9 +54,9 @@
 #include "global.h"
 #include "metafile.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(metafile);
+WINE_DEFAULT_DEBUG_CHANNEL(metafile);
 
 #include "pshpack1.h"
 typedef struct
diff --git a/objects/palette.c b/objects/palette.c
index 9339e32517b..f789e8d21c3 100644
--- a/objects/palette.c
+++ b/objects/palette.c
@@ -4,6 +4,21 @@
  * Copyright 1993,1994 Alexandre Julliard
  * Copyright 1996 Alex Korobka
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * NOTES:
  * PALETTEOBJ is documented in the Dr. Dobbs Journal May 1993.
  * Information in the "Undocumented Windows" is incorrect.
  */
@@ -18,10 +33,10 @@
 #include "gdi.h"
 #include "color.h"
 #include "palette.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winerror.h"
 
-DEFAULT_DEBUG_CHANNEL(palette);
+WINE_DEFAULT_DEBUG_CHANNEL(palette);
 
 PALETTE_DRIVER *PALETTE_Driver = NULL;
 
diff --git a/objects/pen.c b/objects/pen.c
index ae55d64a9e4..fe5be3ce5d7 100644
--- a/objects/pen.c
+++ b/objects/pen.c
@@ -2,6 +2,20 @@
  * GDI pen objects
  *
  * Copyright 1993 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -14,9 +28,9 @@
 #include "wine/wingdi16.h"
 #include "pen.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(gdi);
+WINE_DEFAULT_DEBUG_CHANNEL(gdi);
 
 
 
diff --git a/objects/region.c b/objects/region.c
index 125118026ff..94696f76f29 100644
--- a/objects/region.c
+++ b/objects/region.c
@@ -6,6 +6,19 @@
  * Modifications and additions: Copyright 1998 Huw Davies
  *					  1999 Alex Korobka
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /************************************************************************
@@ -85,11 +98,11 @@ SOFTWARE.
 #include <string.h>
 #include "windef.h"
 #include "wingdi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "region.h"
 #include "gdi.h"
 
-DEFAULT_DEBUG_CHANNEL(region);
+WINE_DEFAULT_DEBUG_CHANNEL(region);
 
 /*  1 if two RECTs overlap.
  *  0 if two RECTs do not overlap.
diff --git a/objects/text.c b/objects/text.c
index d28ec0fe221..26e3cd3dec7 100644
--- a/objects/text.c
+++ b/objects/text.c
@@ -3,6 +3,19 @@
  *
  * Copyright 1993, 1994 Alexandre Julliard
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -13,10 +26,10 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "gdi.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winnls.h"
 
-DEFAULT_DEBUG_CHANNEL(text);
+WINE_DEFAULT_DEBUG_CHANNEL(text);
 
 /***********************************************************************
  *           FONT_mbtowc
diff --git a/ole/ole2nls.c b/ole/ole2nls.c
index 45d4aa23fa0..213b5cbc694 100644
--- a/ole/ole2nls.c
+++ b/ole/ole2nls.c
@@ -4,6 +4,20 @@
  *	Copyright 1995	Martin von Loewis
  *      Copyright 1998  David Lee Lambert
  *      Copyright 2000  Julio César Gázquez
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -22,9 +36,9 @@
 #include "winnls.h"
 #include "winreg.h"
 #include "winerror.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(string);
+WINE_DEFAULT_DEBUG_CHANNEL(string);
 
 /* Locale name to id map. used by EnumSystemLocales, GetLocaleInfoA 
  * MUST contain all #defines from winnls.h
diff --git a/ole/uuid.c b/ole/uuid.c
index 8d98ef193d0..8f879c38870 100644
--- a/ole/uuid.c
+++ b/ole/uuid.c
@@ -1,5 +1,22 @@
 /*
  * GUID definitions
+ *
+ * Copyright 2000 Alexandre Julliard
+ * Copyright 2000 Francois Gouget
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "initguid.h"
diff --git a/programs/avitools/aviinfo.c b/programs/avitools/aviinfo.c
index 074b972e006..ca0d9cdce2c 100644
--- a/programs/avitools/aviinfo.c
+++ b/programs/avitools/aviinfo.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1999 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <stdio.h>
 #include <assert.h>
 #include <string.h>
diff --git a/programs/avitools/aviplay.c b/programs/avitools/aviplay.c
index a3c40b21b3f..140eb1deda5 100644
--- a/programs/avitools/aviplay.c
+++ b/programs/avitools/aviplay.c
@@ -2,6 +2,20 @@
  * Very simple AVIPLAYER
  * 
  * Copyright 1999 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  * 
  * Status:
  * 	- plays .avi streams, video only
diff --git a/programs/avitools/icinfo.c b/programs/avitools/icinfo.c
index 77e54a62a53..64b9b7e594c 100644
--- a/programs/avitools/icinfo.c
+++ b/programs/avitools/icinfo.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1999 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <stdio.h>
 #include <string.h>
 #include "windows.h"
diff --git a/programs/clock/Da.rc b/programs/clock/Da.rc
index 8f3243326c0..e9e563ebf14 100644
--- a/programs/clock/Da.rc
+++ b/programs/clock/Da.rc
@@ -2,6 +2,20 @@
  * Clock (Danish resources)
  *
  * Copyright 1998 Henrik Olsen <henrik@iaeste.dk>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                  Da
diff --git a/programs/clock/De.rc b/programs/clock/De.rc
index 0cbbdbf5bb4..f1ab5bd5f2d 100644
--- a/programs/clock/De.rc
+++ b/programs/clock/De.rc
@@ -3,6 +3,19 @@
  *
  * Copyright 1997 Marcel Baur <mbaur@g26.ethz.ch>
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                  De
diff --git a/programs/clock/En.rc b/programs/clock/En.rc
index 443e97476a0..eb63131b85f 100644
--- a/programs/clock/En.rc
+++ b/programs/clock/En.rc
@@ -3,6 +3,20 @@
  *
  * Copyright 1998 Marcel Baur <mbaur@g26.ethz.ch>
  * FIXME: Weak translation !
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                  En
diff --git a/programs/clock/Es.rc b/programs/clock/Es.rc
index d087a22df5a..f4174bd97b2 100644
--- a/programs/clock/Es.rc
+++ b/programs/clock/Es.rc
@@ -4,6 +4,19 @@
  * Copyright 1998 Marcel Baur <mbaur@g26.ethz.ch>
  * Spanish translation by Pablo Saratxaga <srtxg@chanae.alphanet.ch>
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                  Es
diff --git a/programs/clock/Fi.rc b/programs/clock/Fi.rc
index b3b8d9440d5..eaa1243e19c 100644
--- a/programs/clock/Fi.rc
+++ b/programs/clock/Fi.rc
@@ -2,6 +2,20 @@
  * Clock (Finnish resources)
  *
  * Copyright 1999 Jukka Iivonen
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                  Fi
diff --git a/programs/clock/Fr.rc b/programs/clock/Fr.rc
index 805641d06a3..151875a1dda 100644
--- a/programs/clock/Fr.rc
+++ b/programs/clock/Fr.rc
@@ -2,6 +2,20 @@
  * Clock (French resources)
  *
  * Copyright 1998 Robert Pouliot <krynos@clic.net>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                  Fr
diff --git a/programs/clock/License_En.c b/programs/clock/License_En.c
index 511bce40a7a..654d5234ddd 100644
--- a/programs/clock/License_En.c
+++ b/programs/clock/License_En.c
@@ -2,46 +2,27 @@
 #include "license.h"
 
 static CHAR LicenseCaption_En[] = "LICENSE";
-static CHAR License_En[] = "\
-You may without charge, royalty or other payment, copy and\
- distribute copies of this work and derivative works of this work\
- in source or binary form provided that: (1)\
- you appropriately publish on each copy an appropriate copyright\
- notice; (2) faithfully reproduce all prior copyright notices\
- included in the original work (you may also add your own\
- copyright notice); and (3) agree to indemnify and hold all prior\
- authors, copyright holders and licensors of the work harmless\
- from and against all damages arising from use of the work.\
-\n\
-You may distribute sources of derivative works of the work\
- provided that (1) (a) all source files of the original work that\
- have been modified, (b) all source files of the derivative work\
- that contain any party of the original work, and (c) all source\
- files of the derivative work that are necessary to compile, link\
- and run the derivative work without unresolved external calls and\
- with the same functionality of the original work (\"Necessary\
- Sources\") carry a prominent notice explaining the nature and date\
- of the modification and/or creation.  You are encouraged to make\
- the Necessary Sources available under this license in order to\
- further the development and acceptance of the work.\
-\n\
-EXCEPT AS OTHERWISE RESTRICTED BY LAW, THIS WORK IS PROVIDED\
- WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES OF ANY KIND, INCLUDING\
- BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF FITNESS FOR A\
- PARTICULAR PURPOSE, MERCHANTABILITY OR TITLE.  EXCEPT AS\
- OTHERWISE PROVIDED BY LAW, NO AUTHOR, COPYRIGHT HOLDER OR\
- LICENSOR SHALL BE LIABLE TO YOU FOR DAMAGES OF ANY KIND, EVEN IF\
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.";
+static CHAR License_En[] =
+"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.\n"
+
+"This library is distributed in the hope that it will be useful, "
+"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.\n"
+
+"You should 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";
 
 static CHAR NoWarrantyCaption_En[] = "NO WARRANTY";
-static CHAR NoWarranty_En[] = "\
-EXCEPT AS OTHERWISE RESTRICTED BY LAW, THIS WORK IS PROVIDED\
- WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES OF ANY KIND, INCLUDING\
- BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF FITNESS FOR A\
- PARTICULAR PURPOSE, MERCHANTABILITY OR TITLE.  EXCEPT AS\
- OTHERWISE PROVIDED BY LAW, NO AUTHOR, COPYRIGHT HOLDER OR\
- LICENSOR SHALL BE LIABLE TO YOU FOR DAMAGES OF ANY KIND, EVEN IF\
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.";
+static CHAR NoWarranty_En[] =
+"This library is distributed in the hope that it will be useful, "
+"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.";
 
 LICENSE WineLicense_En = {License_En, LicenseCaption_En,
                           NoWarranty_En, NoWarrantyCaption_En};
diff --git a/programs/clock/Pt.rc b/programs/clock/Pt.rc
index 087a8c51b8c..fb768524060 100644
--- a/programs/clock/Pt.rc
+++ b/programs/clock/Pt.rc
@@ -3,6 +3,20 @@
  *
  * Copyright 1999 Gustavo Junior Alves <alves@correionet.com.br>
  * FIXME: Weak translation !
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                  Pt
diff --git a/programs/clock/Sk.rc b/programs/clock/Sk.rc
index 7b75b05c6f3..8dbbc205ee9 100644
--- a/programs/clock/Sk.rc
+++ b/programs/clock/Sk.rc
@@ -3,6 +3,20 @@
  *
  * Copyright 1998 Marcel Baur <mbaur@g26.ethz.ch>
  * FIXME: Weak translation !
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                  Sk
diff --git a/programs/clock/Sw.rc b/programs/clock/Sw.rc
index 02fbf503f9f..7c8b817c452 100644
--- a/programs/clock/Sw.rc
+++ b/programs/clock/Sw.rc
@@ -3,6 +3,20 @@
  *
  * Copyright 1998 Marcel Baur <mbaur@g26.ethz.ch>
  * Translated into Swedish by Karl Backström <karl_b@geocities.com> 
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                  Sw
diff --git a/programs/clock/Wa.rc b/programs/clock/Wa.rc
index 1ef7bdb6696..b8a74e5d4f5 100644
--- a/programs/clock/Wa.rc
+++ b/programs/clock/Wa.rc
@@ -1,6 +1,22 @@
 /*
  * Clock (Walloon resources)
  *
+ * Copyright 1999 Pablo Saratxaga
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * Si vos voloz aider avou li ratoûrnaedje des libes programes è walon,
  * vos poloz scrîre a l' adresse emile <linux-wa@chanae.alphanet.ch>
  *
diff --git a/programs/clock/clock.rc b/programs/clock/clock.rc
index cd1198af283..68dcd378b0a 100644
--- a/programs/clock/clock.rc
+++ b/programs/clock/clock.rc
@@ -2,6 +2,20 @@
  * Clock (clock.rc)
  *
  * Copyright 1998 Marcel Baur <mbaur@g26.ethz.ch>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 
diff --git a/programs/clock/language.c b/programs/clock/language.c
index d2129858279..7fbfcc10194 100644
--- a/programs/clock/language.c
+++ b/programs/clock/language.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1998 Marcel Baur <mbaur@g26.ethz.ch>
  * Copyright 1998 Karl Backström <karl_b@geocities.com>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
diff --git a/programs/clock/language.h b/programs/clock/language.h
index 9171846427e..b525001c32a 100644
--- a/programs/clock/language.h
+++ b/programs/clock/language.h
@@ -3,6 +3,20 @@
  *
  * Copyright 1998 Marcel Baur <mbaur@g26.ethz.ch>
  * Copyright 1998 Karl Backström <karl_b@geocities.com>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 VOID LANGUAGE_UpdateWindowCaption(VOID);
diff --git a/programs/clock/license.c b/programs/clock/license.c
index 263086397ce..6de507b238d 100644
--- a/programs/clock/license.c
+++ b/programs/clock/license.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1998 by Marcel Baur <mbaur@g26.ethz.ch>
  * Adapted from Program Manager (Original by Ulrich Schmied)
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windows.h"
diff --git a/programs/clock/license.h b/programs/clock/license.h
index c65a6a6f09a..6dac3b2979f 100644
--- a/programs/clock/license.h
+++ b/programs/clock/license.h
@@ -3,6 +3,20 @@
  *
  * Copyright 1998 by Marcel Baur <mbaur@g26.ethz.ch>
  * Adapted from Program Manager (Original by Ulrich Schmied)
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 
diff --git a/programs/clock/main.c b/programs/clock/main.c
index 3d9954490db..ec4270a9232 100644
--- a/programs/clock/main.c
+++ b/programs/clock/main.c
@@ -7,6 +7,20 @@
  * - Program Manager by Ulrich Schmied
  * - rolex.c by Jim Peterson
  *
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
diff --git a/programs/clock/main.h b/programs/clock/main.h
index 00c4abc02b5..a32ae371339 100644
--- a/programs/clock/main.h
+++ b/programs/clock/main.h
@@ -2,6 +2,20 @@
  * Clock (main.h)
  *
  * Copyright 1998 Marcel Baur <mbaur@g26.ethz.ch>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define MAX_STRING_LEN      255
diff --git a/programs/clock/rsrc.rc b/programs/clock/rsrc.rc
index f57353d1cbe..25cb900932d 100644
--- a/programs/clock/rsrc.rc
+++ b/programs/clock/rsrc.rc
@@ -1,3 +1,22 @@
+/*
+ * Clock resources
+ *
+ * Copyright 1998 Marcel Baur <mbaur@g26.ethz.ch>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include "windows.h"
 #include "main.h"
diff --git a/programs/clock/winclock.c b/programs/clock/winclock.c
index 6aa8464040d..b96839b01ba 100644
--- a/programs/clock/winclock.c
+++ b/programs/clock/winclock.c
@@ -9,18 +9,19 @@
  *  and made it look like the original Windows one. You can find the original
  *  rolex.c in the wine /libtest directory.
  *
- *  Original file header:
- *  >
- *  > rolex.c: Windows clock application for WINE (by Jim Peterson)    
- *  >                                                                 
- *  > This is a translation of a Turbo Pascal OWL application I made   
- *  > once, so it's a little flaky (tons of globals, functions that    
- *  > could have been in-lined, etc.).  The source code should easily  
- *  > compile with a standard Win32 C compiler.                        
- *  >                                                                 
- *  > To try it out, type 'make rolex'.                               
- *  >
+ * 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.
  *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <math.h>
diff --git a/programs/clock/winclock.h b/programs/clock/winclock.h
index c5f51174ff7..199b9abeac7 100644
--- a/programs/clock/winclock.h
+++ b/programs/clock/winclock.h
@@ -5,6 +5,20 @@
  *  This file is essentially rolex.c by Jim Peterson.
  *  Please see my winclock.c and/or his rolex.c for references.
  *
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
  #include <windows.h>
diff --git a/programs/cmdlgtst/cmdlgr.rc b/programs/cmdlgtst/cmdlgr.rc
index 0123a879e4a..ceaef4cb201 100644
--- a/programs/cmdlgtst/cmdlgr.rc
+++ b/programs/cmdlgtst/cmdlgr.rc
@@ -1,11 +1,23 @@
 /****************************************************************************
-
-
-CMDLGR.RC
-
-originally produced by Borland Resource Workshop, and then heavily edited
-
-
+ * CMDLGR.RC
+ *
+ * originally produced by Borland Resource Workshop, and then heavily edited
+ *
+ * Copyright (c) 1999 Eric Williams.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *****************************************************************************/
 
 #include <windows.h>
diff --git a/programs/cmdlgtst/cmdlgtst.c b/programs/cmdlgtst/cmdlgtst.c
index 864f30db023..e5d85b0f712 100644
--- a/programs/cmdlgtst/cmdlgtst.c
+++ b/programs/cmdlgtst/cmdlgtst.c
@@ -1,8 +1,21 @@
 /*
- * (c) 1999-2000 Eric Williams.  Rights as specified under the WINE
- * License.  Don't hoard code; share it!
+ * Copyright (c) 1999-2000 Eric Williams.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
- 
+
 /*
  * One might call this a Commdlg test jig.  Its sole function in life
  * is to call the Commdlg Common Dialogs.  The results of a call to
diff --git a/programs/cmdlgtst/cmdlgtst.h b/programs/cmdlgtst/cmdlgtst.h
index b4fdc708b49..5f0cf6b24a6 100644
--- a/programs/cmdlgtst/cmdlgtst.h
+++ b/programs/cmdlgtst/cmdlgtst.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 1999-2000 Eric Williams.
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #define CM_U_COLOR	105
 #define CM_U_SAVE	104
 #define CM_U_OPEN	101
diff --git a/programs/control/control.c b/programs/control/control.c
index c55cded883a..e4de1444642 100644
--- a/programs/control/control.c
+++ b/programs/control/control.c
@@ -1,7 +1,20 @@
 /* 
  *   Control
  *   Copyright (C) 1998 by Marcel Baur <mbaur@g26.ethz.ch>
- *   To be distributed under the Wine license
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
diff --git a/programs/control/params.h b/programs/control/params.h
index 0d4866110dd..e7213574723 100644
--- a/programs/control/params.h
+++ b/programs/control/params.h
@@ -1,7 +1,20 @@
 /* 
  *   Control
  *   Copyright (C) 1998 by Marcel Baur <mbaur@g26.ethz.ch>
- *   To be distributed under the Wine license
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* alphabetical list of recognized optional command line parameters */
diff --git a/programs/notepad/Da.rc b/programs/notepad/Da.rc
index 6ddc58191bc..ed0532e72f3 100644
--- a/programs/notepad/Da.rc
+++ b/programs/notepad/Da.rc
@@ -2,6 +2,20 @@
  *  Notepad (Danish resources)
  *
  *  Copyright 1998 Henrik Olsen <henrik@iaeste.dk>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                     Da
diff --git a/programs/notepad/De.rc b/programs/notepad/De.rc
index b0108ae5de3..2de58ea296a 100644
--- a/programs/notepad/De.rc
+++ b/programs/notepad/De.rc
@@ -2,7 +2,20 @@
  *  Notepad (German resources)
  *
  *  Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
- *  To be distributed under the Wine License
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                     De
diff --git a/programs/notepad/En.rc b/programs/notepad/En.rc
index 2a56c224f47..4f0168c1a79 100644
--- a/programs/notepad/En.rc
+++ b/programs/notepad/En.rc
@@ -3,6 +3,20 @@
  *
  *  Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
  *  Proofread 1998 by David Lee Lambert <lamber45@egr.msu.edu>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                     En
diff --git a/programs/notepad/Es.rc b/programs/notepad/Es.rc
index 79d7fb41709..2268abd39a8 100644
--- a/programs/notepad/Es.rc
+++ b/programs/notepad/Es.rc
@@ -4,6 +4,20 @@
  *  Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
  *  Proofread 1998 by David Lee Lambert <lamber45@egr.msu.edu>
  *  Proofread 1999 by Jose Marcos Lopez <jose.lopez@upcnet.upc.es>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                     Es
diff --git a/programs/notepad/Fi.rc b/programs/notepad/Fi.rc
index 8dfaf1bae70..fb278b9e5ec 100644
--- a/programs/notepad/Fi.rc
+++ b/programs/notepad/Fi.rc
@@ -2,6 +2,20 @@
  *  Notepad (Finnish resources)
  *
  *  Copyright 1999 by Jukka Iivonen <iivonen@iki.fi>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                     Fi
diff --git a/programs/notepad/Fr.rc b/programs/notepad/Fr.rc
index 61b4166262f..4cf5028f131 100644
--- a/programs/notepad/Fr.rc
+++ b/programs/notepad/Fr.rc
@@ -3,6 +3,20 @@
  *
  *  Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
  *  Translation by Laurent Buffler <laurent@bluewin.ch>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                     Fr
diff --git a/programs/notepad/License_En.c b/programs/notepad/License_En.c
index 511bce40a7a..654d5234ddd 100644
--- a/programs/notepad/License_En.c
+++ b/programs/notepad/License_En.c
@@ -2,46 +2,27 @@
 #include "license.h"
 
 static CHAR LicenseCaption_En[] = "LICENSE";
-static CHAR License_En[] = "\
-You may without charge, royalty or other payment, copy and\
- distribute copies of this work and derivative works of this work\
- in source or binary form provided that: (1)\
- you appropriately publish on each copy an appropriate copyright\
- notice; (2) faithfully reproduce all prior copyright notices\
- included in the original work (you may also add your own\
- copyright notice); and (3) agree to indemnify and hold all prior\
- authors, copyright holders and licensors of the work harmless\
- from and against all damages arising from use of the work.\
-\n\
-You may distribute sources of derivative works of the work\
- provided that (1) (a) all source files of the original work that\
- have been modified, (b) all source files of the derivative work\
- that contain any party of the original work, and (c) all source\
- files of the derivative work that are necessary to compile, link\
- and run the derivative work without unresolved external calls and\
- with the same functionality of the original work (\"Necessary\
- Sources\") carry a prominent notice explaining the nature and date\
- of the modification and/or creation.  You are encouraged to make\
- the Necessary Sources available under this license in order to\
- further the development and acceptance of the work.\
-\n\
-EXCEPT AS OTHERWISE RESTRICTED BY LAW, THIS WORK IS PROVIDED\
- WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES OF ANY KIND, INCLUDING\
- BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF FITNESS FOR A\
- PARTICULAR PURPOSE, MERCHANTABILITY OR TITLE.  EXCEPT AS\
- OTHERWISE PROVIDED BY LAW, NO AUTHOR, COPYRIGHT HOLDER OR\
- LICENSOR SHALL BE LIABLE TO YOU FOR DAMAGES OF ANY KIND, EVEN IF\
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.";
+static CHAR License_En[] =
+"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.\n"
+
+"This library is distributed in the hope that it will be useful, "
+"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.\n"
+
+"You should 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";
 
 static CHAR NoWarrantyCaption_En[] = "NO WARRANTY";
-static CHAR NoWarranty_En[] = "\
-EXCEPT AS OTHERWISE RESTRICTED BY LAW, THIS WORK IS PROVIDED\
- WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES OF ANY KIND, INCLUDING\
- BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF FITNESS FOR A\
- PARTICULAR PURPOSE, MERCHANTABILITY OR TITLE.  EXCEPT AS\
- OTHERWISE PROVIDED BY LAW, NO AUTHOR, COPYRIGHT HOLDER OR\
- LICENSOR SHALL BE LIABLE TO YOU FOR DAMAGES OF ANY KIND, EVEN IF\
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.";
+static CHAR NoWarranty_En[] =
+"This library is distributed in the hope that it will be useful, "
+"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.";
 
 LICENSE WineLicense_En = {License_En, LicenseCaption_En,
                           NoWarranty_En, NoWarrantyCaption_En};
diff --git a/programs/notepad/Pt.rc b/programs/notepad/Pt.rc
index 176e35dd54e..05d0a368178 100644
--- a/programs/notepad/Pt.rc
+++ b/programs/notepad/Pt.rc
@@ -2,6 +2,20 @@
  *  Notepad (English resources)
  *
  *  Copyright 1999 Marcel Baur <alves@correionet.com.br>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                     Pt
diff --git a/programs/notepad/Sk.rc b/programs/notepad/Sk.rc
index 59acd593138..3ceefbb94e2 100644
--- a/programs/notepad/Sk.rc
+++ b/programs/notepad/Sk.rc
@@ -3,6 +3,20 @@
  *
  *  Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
  *  Proofread 1998 by David Lee Lambert <lamber45@egr.msu.edu>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                     Sk
diff --git a/programs/notepad/Sw.rc b/programs/notepad/Sw.rc
index 615ca333d8d..fd532be35c3 100644
--- a/programs/notepad/Sw.rc
+++ b/programs/notepad/Sw.rc
@@ -3,6 +3,20 @@
  *
  *  Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
  *  Swedish language by Karl Backström <karl_b@geocities.com>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                     Sw
diff --git a/programs/notepad/Wa.rc b/programs/notepad/Wa.rc
index ddfd1d4b38e..b6f79e3c371 100644
--- a/programs/notepad/Wa.rc
+++ b/programs/notepad/Wa.rc
@@ -1,6 +1,22 @@
 /*
  *  Notepad (Walloon resources)
  *
+ * Copyright 1999 Pablo Saratxaga
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * Si vos voloz aider avou li ratoûrnaedje des libes programes è walon,
  * vos poloz scrîre a l' adresse emile <linux-wa@chanae.alphanet.ch>
  */
diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c
index 0c7864fa6b3..6b1cdcbe259 100644
--- a/programs/notepad/dialog.c
+++ b/programs/notepad/dialog.c
@@ -2,7 +2,20 @@
  *  Notepad (dialog.c)
  *
  *  Copyright 1998,99 Marcel Baur <mbaur@g26.ethz.ch>
- *  To be distributed under the Wine License
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
diff --git a/programs/notepad/dialog.h b/programs/notepad/dialog.h
index 3c1cb6cf771..45f61a3e59e 100644
--- a/programs/notepad/dialog.h
+++ b/programs/notepad/dialog.h
@@ -2,6 +2,20 @@
  *  Notepad (dialog.h)
  *
  *  Copyright 1998 Marcel Baur <mbaur@g26.ethz.ch>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windows.h"
diff --git a/programs/notepad/language.c b/programs/notepad/language.c
index 7c1b0143980..5054db42fd3 100644
--- a/programs/notepad/language.c
+++ b/programs/notepad/language.c
@@ -3,6 +3,20 @@
  *
  *  Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
  *  Copyright 1998 Karl Backstr”m <karl_b@geocities.com>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
diff --git a/programs/notepad/language.h b/programs/notepad/language.h
index 0ee51c3f9fc..45bcc43cfef 100644
--- a/programs/notepad/language.h
+++ b/programs/notepad/language.h
@@ -3,6 +3,20 @@
  *
  *  Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
  *  Copyright 1998 Karl Backstr”m <karl_b@geocities.com>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 VOID LANGUAGE_UpdateWindowCaption(VOID);
diff --git a/programs/notepad/license.c b/programs/notepad/license.c
index fad6880e4cc..849374dd14a 100644
--- a/programs/notepad/license.c
+++ b/programs/notepad/license.c
@@ -2,7 +2,20 @@
  *  Notepad (license.h)
  *
  *  Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
- *  To be distributed under the Wine License
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windows.h"
diff --git a/programs/notepad/license.h b/programs/notepad/license.h
index 4b9a203b6fd..adbed7abe6d 100644
--- a/programs/notepad/license.h
+++ b/programs/notepad/license.h
@@ -2,7 +2,20 @@
  *  Notepad (license.h)
  *
  *  Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
- *  To be distributed under the Wine License
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 VOID WineLicense(HWND hWnd);
diff --git a/programs/notepad/main.c b/programs/notepad/main.c
index ae9b6456c4d..95663a46eba 100644
--- a/programs/notepad/main.c
+++ b/programs/notepad/main.c
@@ -3,7 +3,20 @@
  *
  *  Copyright 2000 Mike McCormack <Mike_McCormack@looksmart.com.au>
  *  Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
- *  To be distributed under the Wine License
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  *  FIXME,TODO list:
  *  - Use wine Heap instead of malloc/free (done)
diff --git a/programs/notepad/main.h b/programs/notepad/main.h
index 99a9015ac08..0c695bcead4 100644
--- a/programs/notepad/main.h
+++ b/programs/notepad/main.h
@@ -2,7 +2,20 @@
  *  Notepad (notepad.h)
  *
  *  Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
- *  To be distributed under the Wine License
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define MAX_STRING_LEN      255
diff --git a/programs/notepad/notepad.rc b/programs/notepad/notepad.rc
index 8d6d1f08cb0..b9f62eda14d 100644
--- a/programs/notepad/notepad.rc
+++ b/programs/notepad/notepad.rc
@@ -2,7 +2,20 @@
  *  Notepad (notepad.rc)
  *
  *  Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
- *  To be distributed under the Wine License
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* Main Menu */
diff --git a/programs/notepad/rsrc.rc b/programs/notepad/rsrc.rc
index f57353d1cbe..7a45deb19cb 100644
--- a/programs/notepad/rsrc.rc
+++ b/programs/notepad/rsrc.rc
@@ -1,3 +1,20 @@
+/*
+ *  Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include "windows.h"
 #include "main.h"
diff --git a/programs/notepad/search.c b/programs/notepad/search.c
index 3be3fbfde84..75d41b0a738 100644
--- a/programs/notepad/search.c
+++ b/programs/notepad/search.c
@@ -1,7 +1,20 @@
 /*
  *  Notepad (search.c)
  *  Copyright (C) 1999 by Marcel Baur
- *  To be distributed under the Wine license
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  *  This file features Heuristic Boyer-Moore Text Search
  *
diff --git a/programs/osversioncheck/osversioncheck.c b/programs/osversioncheck/osversioncheck.c
index ac779a55281..9092f5c5698 100644
--- a/programs/osversioncheck/osversioncheck.c
+++ b/programs/osversioncheck/osversioncheck.c
@@ -5,6 +5,20 @@
  *
  * Copyright 1999 by Morten Eriksen <mailto:mortene@sim.no>
  *
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <windows.h>
diff --git a/programs/progman/Da.rc b/programs/progman/Da.rc
index 1516d53dd24..5e6ba93e2cb 100644
--- a/programs/progman/Da.rc
+++ b/programs/progman/Da.rc
@@ -2,6 +2,20 @@
  * Program Manager
  *
  * Copyright 1997 Henrik Olsen <henrik@iaeste.dk>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                  Da
diff --git a/programs/progman/De.rc b/programs/progman/De.rc
index 5420f90a0d7..054e39e07c1 100644
--- a/programs/progman/De.rc
+++ b/programs/progman/De.rc
@@ -2,6 +2,20 @@
  * Program Manager
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                  De
diff --git a/programs/progman/En.rc b/programs/progman/En.rc
index c8fe792de54..90a4144395b 100644
--- a/programs/progman/En.rc
+++ b/programs/progman/En.rc
@@ -2,6 +2,20 @@
  * Program Manager
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                  En
diff --git a/programs/progman/Es.rc b/programs/progman/Es.rc
index ef83d19b82a..0a0b6fda796 100644
--- a/programs/progman/Es.rc
+++ b/programs/progman/Es.rc
@@ -2,6 +2,20 @@
  * Program Manager
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                  Es
diff --git a/programs/progman/Fi.rc b/programs/progman/Fi.rc
index a38379c0459..434da95a7a7 100644
--- a/programs/progman/Fi.rc
+++ b/programs/progman/Fi.rc
@@ -3,6 +3,20 @@
  *
  * Copyright 1996 Ulrich Schmid
  * Finnish language by Jussi Tirkkonen <jt@modeemi.cs.tut.fi>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                  Fi
diff --git a/programs/progman/Fr.rc b/programs/progman/Fr.rc
index b0b35c29767..127df40526f 100644
--- a/programs/progman/Fr.rc
+++ b/programs/progman/Fr.rc
@@ -3,6 +3,20 @@
  *
  * Copyright 1996 Ulrich Schmid
  * French Fr.rc by Pablo Saratxaga <srtxg@chanae.alphanet.ch>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                  Fr
diff --git a/programs/progman/Hu.rc b/programs/progman/Hu.rc
index 26c567ade5d..eeb053b3f99 100644
--- a/programs/progman/Hu.rc
+++ b/programs/progman/Hu.rc
@@ -2,6 +2,20 @@
  * Program Manager
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                  Hu
diff --git a/programs/progman/It.rc b/programs/progman/It.rc
index 6c6d9629385..12f519ce132 100644
--- a/programs/progman/It.rc
+++ b/programs/progman/It.rc
@@ -2,6 +2,20 @@
  * Program Manager
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                  It
diff --git a/programs/progman/Ko.rc b/programs/progman/Ko.rc
index 4073b3a122a..f31436d8d4f 100644
--- a/programs/progman/Ko.rc
+++ b/programs/progman/Ko.rc
@@ -2,6 +2,20 @@
  * Program Manager
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                  Ko
diff --git a/programs/progman/License_En.c b/programs/progman/License_En.c
index 60c11283e50..c4e1bfe99ac 100644
--- a/programs/progman/License_En.c
+++ b/programs/progman/License_En.c
@@ -2,46 +2,27 @@
 #include "license.h"
 
 static CHAR LicenseCaption_En[] = "LICENSE";
-static CHAR License_En[] = "\
-You may without charge, royalty or other payment, copy and\
- distribute copies of this work and derivative works of this work\
- in source or binary form provided that: (1)\
- you appropriately publish on each copy an appropriate copyright\
- notice; (2) faithfully reproduce all prior copyright notices\
- included in the original work (you may also add your own\
- copyright notice); and (3) agree to indemnify and hold all prior\
- authors, copyright holders and licensors of the work harmless\
- from and against all damages arising from use of the work.\
-\n\
-You may distribute sources of derivative works of the work\
- provided that (1) (a) all source files of the original work that\
- have been modified, (b) all source files of the derivative work\
- that contain any party of the original work, and (c) all source\
- files of the derivative work that are necessary to compile, link\
- and run the derivative work without unresolved external calls and\
- with the same functionality of the original work (\"Necessary\
- Sources\") carry a prominent notice explaining the nature and date\
- of the modification and/or creation.  You are encouraged to make\
- the Necessary Sources available under this license in order to\
- further the development and acceptance of the work.\
-\n\
-EXCEPT AS OTHERWISE RESTRICTED BY LAW, THIS WORK IS PROVIDED\
- WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES OF ANY KIND, INCLUDING\
- BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF FITNESS FOR A\
- PARTICULAR PURPOSE, MERCHANTABILITY OR TITLE.  EXCEPT AS\
- OTHERWISE PROVIDED BY LAW, NO AUTHOR, COPYRIGHT HOLDER OR\
- LICENSOR SHALL BE LIABLE TO YOU FOR DAMAGES OF ANY KIND, EVEN IF\
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.";
+static CHAR License_En[] =
+"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.\n"
+
+"This library is distributed in the hope that it will be useful, "
+"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.\n"
+
+"You should 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";
 
 static CHAR NoWarrantyCaption_En[] = "NO WARRANTY";
-static CHAR NoWarranty_En[] = "\
-EXCEPT AS OTHERWISE RESTRICTED BY LAW, THIS WORK IS PROVIDED\
- WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES OF ANY KIND, INCLUDING\
- BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF FITNESS FOR A\
- PARTICULAR PURPOSE, MERCHANTABILITY OR TITLE.  EXCEPT AS\
- OTHERWISE PROVIDED BY LAW, NO AUTHOR, COPYRIGHT HOLDER OR\
- LICENSOR SHALL BE LIABLE TO YOU FOR DAMAGES OF ANY KIND, EVEN IF\
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.";
+static CHAR NoWarranty_En[] =
+"This library is distributed in the hope that it will be useful, "
+"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.";
 
 LICENSE WineLicense_En = {License_En, LicenseCaption_En,
 			  NoWarranty_En, NoWarrantyCaption_En};
diff --git a/programs/progman/Pt.rc b/programs/progman/Pt.rc
index 1df4fa3fed1..197ea1fc436 100644
--- a/programs/progman/Pt.rc
+++ b/programs/progman/Pt.rc
@@ -2,6 +2,20 @@
  * Program Manager
  *
  * Copyright 1999 Gustavo Junior Alves <alves@correionet.com.br>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                  Pt
diff --git a/programs/progman/Ru.rc b/programs/progman/Ru.rc
index 15eccb5b16b..6811054f624 100644
--- a/programs/progman/Ru.rc
+++ b/programs/progman/Ru.rc
@@ -2,6 +2,20 @@
  * Program Manager
  *
  * Copyright 2000 Vasily Volchenko
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 /* There is a difficulty to use correct codepage for messages, menus etc... So I have added the following line. 
 May be, such line should be present in EVERY ??.rc file, but... I can't test any language except Russian and English :-) 
diff --git a/programs/progman/Sk.rc b/programs/progman/Sk.rc
index f1eff992cba..b17f62dae8f 100644
--- a/programs/progman/Sk.rc
+++ b/programs/progman/Sk.rc
@@ -2,6 +2,20 @@
  * Program Manager
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                  Sk
diff --git a/programs/progman/Sw.rc b/programs/progman/Sw.rc
index ed0e32ae0f1..320c3f58508 100644
--- a/programs/progman/Sw.rc
+++ b/programs/progman/Sw.rc
@@ -2,6 +2,20 @@
  * Program Manager
  *
  * Copyright 1998 Karl Backström
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                  Sw
diff --git a/programs/progman/Va.rc b/programs/progman/Va.rc
index b1a8d0bd05a..b1ebb67b600 100644
--- a/programs/progman/Va.rc
+++ b/programs/progman/Va.rc
@@ -5,6 +5,19 @@
  *
  * Rumantsch Ladin (Vallader) added by Marcel Baur <mbaur@g26.ethz.ch>
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define LANGUAGE_ID                  Va
diff --git a/programs/progman/Wa.rc b/programs/progman/Wa.rc
index bb0e7aaf98a..b7cbec37a46 100644
--- a/programs/progman/Wa.rc
+++ b/programs/progman/Wa.rc
@@ -1,6 +1,22 @@
 /*
  * Program Manager
  *
+ * Copyright 1999 Pablo Saratxaga
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * Si vos voloz aider avou li ratoûrnaedje des libes programes è walon,
  * vos poloz scrîre a l' adresse emile <linux-wa@chanae.alphanet.ch>
  */
diff --git a/programs/progman/Xx.rc b/programs/progman/Xx.rc
index 42d8fc1788b..0f6379de431 100644
--- a/programs/progman/Xx.rc
+++ b/programs/progman/Xx.rc
@@ -2,6 +2,20 @@
  * Program Manager
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* Menu */
diff --git a/programs/progman/accel.rc b/programs/progman/accel.rc
index ac19baf28de..dd599f0d99d 100644
--- a/programs/progman/accel.rc
+++ b/programs/progman/accel.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 ACCEL ACCELERATORS
 {
 VK_RETURN, PM_EXECUTE, VIRTKEY, ALT
diff --git a/programs/progman/dialog.c b/programs/progman/dialog.c
index 565b451f8ef..0739c55c00f 100644
--- a/programs/progman/dialog.c
+++ b/programs/progman/dialog.c
@@ -2,6 +2,20 @@
  * Program Manager
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windows.h"
diff --git a/programs/progman/group.c b/programs/progman/group.c
index 0a623a78fa8..211776d8cb0 100644
--- a/programs/progman/group.c
+++ b/programs/progman/group.c
@@ -2,6 +2,20 @@
  * Program Manager
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
diff --git a/programs/progman/grpfile.c b/programs/progman/grpfile.c
index dbcbecb78c2..6594e4f41fa 100644
--- a/programs/progman/grpfile.c
+++ b/programs/progman/grpfile.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1996 Ulrich Schmid
  *           1997 Peter Schlaile
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windows.h"
diff --git a/programs/progman/license.c b/programs/progman/license.c
index b781b653c28..0ba00535244 100644
--- a/programs/progman/license.c
+++ b/programs/progman/license.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include "windows.h"
 #include "license.h"
 
diff --git a/programs/progman/license.h b/programs/progman/license.h
index 112e38faf21..35649e63f29 100644
--- a/programs/progman/license.h
+++ b/programs/progman/license.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 VOID WineLicense(HWND hWnd, LPCSTR lpszLanguage);
 VOID WineWarranty(HWND hWnd, LPCSTR language);
 
diff --git a/programs/progman/main.c b/programs/progman/main.c
index e859908c343..ac7b57f2c66 100644
--- a/programs/progman/main.c
+++ b/programs/progman/main.c
@@ -2,6 +2,20 @@
  * Program Manager
  *
  * Copyright 1996 Ulrich Schmid <uschmid@mail.hh.provi.de>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
diff --git a/programs/progman/progman.h b/programs/progman/progman.h
index ce5f19bd196..3dd37d93ed7 100644
--- a/programs/progman/progman.h
+++ b/programs/progman/progman.h
@@ -2,6 +2,20 @@
  * Program Manager
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef PROGMAN_H
diff --git a/programs/progman/program.c b/programs/progman/program.c
index 3937237d3f2..8ac63629eac 100644
--- a/programs/progman/program.c
+++ b/programs/progman/program.c
@@ -2,6 +2,20 @@
  * Program Manager
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
diff --git a/programs/progman/rsrc.rc b/programs/progman/rsrc.rc
index 2f60b3f5b9d..037d8ff92b3 100644
--- a/programs/progman/rsrc.rc
+++ b/programs/progman/rsrc.rc
@@ -1,3 +1,20 @@
+/*
+ * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include "windows.h"
 #include "progman.h"
diff --git a/programs/progman/string.c b/programs/progman/string.c
index ec96c2d9d39..46dca242b0d 100644
--- a/programs/progman/string.c
+++ b/programs/progman/string.c
@@ -2,6 +2,20 @@
  * Program Manager
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windows.h"
diff --git a/programs/regapi/regFixer.pl b/programs/regapi/regFixer.pl
index c20735e6c7b..2c0b7b8e0fb 100755
--- a/programs/regapi/regFixer.pl
+++ b/programs/regapi/regFixer.pl
@@ -5,7 +5,21 @@
 # pair by their hkey,key data member
 #
 # Copyright 1999 Sylvain St-Germain
-# 
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 
 ${prefix} = "";
 
diff --git a/programs/regapi/regRestorer.pl b/programs/regapi/regRestorer.pl
index f8491cefa65..24d2fbb30ca 100755
--- a/programs/regapi/regRestorer.pl
+++ b/programs/regapi/regRestorer.pl
@@ -5,7 +5,21 @@
 # in the "REGEDIT4" format.
 #
 # Copyright 1999 Sylvain St-Germain
-# 
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 
 ${newkey} = "";
 ${key}    = "";   
diff --git a/programs/regapi/regSet.sh b/programs/regapi/regSet.sh
index 3b56b1f95f6..d98d72f5ff6 100755
--- a/programs/regapi/regSet.sh
+++ b/programs/regapi/regSet.sh
@@ -7,6 +7,20 @@
 #
 # Copyright 1999 Sylvain St-Germain
 #
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 
 if [ $# -ne 2 ]; then
   echo "$0 Usage: "
diff --git a/programs/regapi/regapi.c b/programs/regapi/regapi.c
index 8479e67c55e..79aa54fb542 100644
--- a/programs/regapi/regapi.c
+++ b/programs/regapi/regapi.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1999 Sylvain St-Germain
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * Note: Please consult the README file for more information.
  *
  */
diff --git a/programs/regapi/tests/regapi.pl b/programs/regapi/tests/regapi.pl
index ec0255b2771..69d6538b5d4 100644
--- a/programs/regapi/tests/regapi.pl
+++ b/programs/regapi/tests/regapi.pl
@@ -1,5 +1,22 @@
 #!/usr/bin/perl -w
-#This script tests regapi functionality
+# This script tests regapi functionality
+#
+# Copyright 2002 Andriy Palamarchuk
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 
 use strict;
 use diagnostics;
diff --git a/programs/regtest/regtest.c b/programs/regtest/regtest.c
index 321451c9aaa..30accb1a025 100644
--- a/programs/regtest/regtest.c
+++ b/programs/regtest/regtest.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1998 Matthew Becker
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * The return codes were generated in an NT40 environment, using lcc-win32
  *
  * NOTES
diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c
index c3ff2a0347b..71327edf374 100644
--- a/programs/uninstaller/main.c
+++ b/programs/uninstaller/main.c
@@ -2,7 +2,20 @@
  * Q&D Uninstaller (main.c)
  * 
  * Copyright 2000 Andreas Mohr <andi@lisas.de>
- * To be distributed under the Wine License
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 
diff --git a/programs/uninstaller/main.h b/programs/uninstaller/main.h
index 6b1471131f5..1f2fb234aff 100644
--- a/programs/uninstaller/main.h
+++ b/programs/uninstaller/main.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000 Andreas Mohr <andi@lisas.de>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <windows.h>
 
 #define IDS_APPNAME	1101
diff --git a/programs/uninstaller/rsrc.rc b/programs/uninstaller/rsrc.rc
index 72c4f9f4689..5495813450b 100644
--- a/programs/uninstaller/rsrc.rc
+++ b/programs/uninstaller/rsrc.rc
@@ -2,7 +2,20 @@
  * Uninstaller (rsrc.rc)
  * 
  * Copyright 2000 Andreas Mohr <andi@lisas.de>
- * To be distributed under the Wine License
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <windows.h>
diff --git a/programs/view/globals.h b/programs/view/globals.h
index 186bc753579..17edfc70512 100644
--- a/programs/view/globals.h
+++ b/programs/view/globals.h
@@ -1,3 +1,20 @@
+/*
+ * Copyright 1998 Douglas Ridgway
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 /* for SMALL_RECT */
 #include "wincon.h" 
diff --git a/programs/view/init.c b/programs/view/init.c
index e5105508682..92585e56dc1 100644
--- a/programs/view/init.c
+++ b/programs/view/init.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Douglas Ridgway
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <windows.h>
 #include "globals.h"
 #include "resource.h"
diff --git a/programs/view/resource.h b/programs/view/resource.h
index d11da049d1b..74751242675 100644
--- a/programs/view/resource.h
+++ b/programs/view/resource.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Douglas Ridgway
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #define IDS_APPNAME                     1
 #define IDS_DESCRIPTION                 2
 #define IDI_APPICON                     101
diff --git a/programs/view/view.c b/programs/view/view.c
index b4a03d1ed0c..d8c5fc82ae5 100644
--- a/programs/view/view.c
+++ b/programs/view/view.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Douglas Ridgway
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <windows.h>
 #include "resource.h"
 
diff --git a/programs/view/viewrc.rc b/programs/view/viewrc.rc
index d9782a45d2e..9822b85bba4 100644
--- a/programs/view/viewrc.rc
+++ b/programs/view/viewrc.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Douglas Ridgway
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include "windows.h"
 #include "resource.h"
 
diff --git a/programs/view/winmain.c b/programs/view/winmain.c
index 70e4b8cb408..7024c6d85a2 100644
--- a/programs/view/winmain.c
+++ b/programs/view/winmain.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1998 Douglas Ridgway
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <windows.h>            /* required for all Windows applications */ 
 #include "globals.h"            /* prototypes specific to this application */
 
diff --git a/programs/wcmd/batch.c b/programs/wcmd/batch.c
index 15929a95718..b73e3efe05d 100644
--- a/programs/wcmd/batch.c
+++ b/programs/wcmd/batch.c
@@ -1,11 +1,23 @@
 /*
  * WCMD - Wine-compatible command line interface - batch interface.
  *
- * (C) 1999 D A Pickles
+ * Copyright (C) 1999 D A Pickles
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-
 #include "wcmd.h"
 
 void WCMD_batch_command (char *line);
diff --git a/programs/wcmd/builtins.c b/programs/wcmd/builtins.c
index 153a270ac02..d9504b919fe 100644
--- a/programs/wcmd/builtins.c
+++ b/programs/wcmd/builtins.c
@@ -1,8 +1,25 @@
 /*
  * WCMD - Wine-compatible command line interface - built-in functions.
  *
- * (C) 1999 D A Pickles
+ * Copyright (C) 1999 D A Pickles
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/*
+ * NOTES:
  * On entry to each function, global variables quals, param1, param2 contain
  * the qualifiers (uppercased and concatenated) and parameters entered, with
  * environment-variable and batch parameter substitution already done.
diff --git a/programs/wcmd/directory.c b/programs/wcmd/directory.c
index f097f331032..9da2cc87ba9 100644
--- a/programs/wcmd/directory.c
+++ b/programs/wcmd/directory.c
@@ -1,8 +1,25 @@
 /*
  * WCMD - Wine-compatible command line interface - Directory functions.
  *
- * (C) 1999 D A Pickles
+ * Copyright (C) 1999 D A Pickles
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/*
+ * NOTES:
  * On entry, global variables quals, param1, param2 contain
  * the qualifiers (uppercased and concatenated) and parameters entered, with
  * environment-variable and batch parameter substitution already done.
diff --git a/programs/wcmd/wcmd.h b/programs/wcmd/wcmd.h
index 41062474b24..175580d8ab4 100644
--- a/programs/wcmd/wcmd.h
+++ b/programs/wcmd/wcmd.h
@@ -1,10 +1,23 @@
 /*
  * WCMD - Wine-compatible command line interface. 
  *
- * (C) 1999 D A Pickles
+ * Copyright (C) 1999 D A Pickles
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-
 #define IDI_ICON1	1
 #include <windows.h>
 #ifndef RC_INVOKED
diff --git a/programs/wcmd/wcmdmain.c b/programs/wcmd/wcmdmain.c
index 45efc7f39c9..e764f75df0f 100644
--- a/programs/wcmd/wcmdmain.c
+++ b/programs/wcmd/wcmdmain.c
@@ -1,7 +1,21 @@
 /*
  * WCMD - Wine-compatible command line interface. 
  *
- * (C) 1999 - 2001 D A Pickles
+ * Copyright (C) 1999 - 2001 D A Pickles
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /*
diff --git a/programs/wcmd/wcmdrc.rc b/programs/wcmd/wcmdrc.rc
index 33343e0b9fa..b3883e2b145 100644
--- a/programs/wcmd/wcmdrc.rc
+++ b/programs/wcmd/wcmdrc.rc
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 1999 D A Pickles
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include "wcmd.h"
 
diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c
index 7c46ea9f919..f448d9316ed 100644
--- a/programs/wineconsole/dialog.c
+++ b/programs/wineconsole/dialog.c
@@ -1,6 +1,20 @@
 /* dialog management for wineconsole
  * USER32 backend
- * (c) 2001 Eric Pouech
+ * Copyright (c) 2001 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
diff --git a/programs/wineconsole/registry.c b/programs/wineconsole/registry.c
index 45b4d6e32ee..c36b8b244f1 100644
--- a/programs/wineconsole/registry.c
+++ b/programs/wineconsole/registry.c
@@ -3,6 +3,20 @@
  *      registry and init functions
  *
  * Copyright 2001 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "winbase.h"
diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c
index 61e6ef09f78..badf23bff78 100644
--- a/programs/wineconsole/user.c
+++ b/programs/wineconsole/user.c
@@ -2,6 +2,20 @@
  * a GUI application for displaying a console
  *	USER32 back end
  * Copyright 2001 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h
index 90299f35587..bbd968156cc 100644
--- a/programs/wineconsole/winecon_private.h
+++ b/programs/wineconsole/winecon_private.h
@@ -2,6 +2,20 @@
  * an application for displaying Win32 console
  *
  * Copyright 2001 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <winbase.h>
diff --git a/programs/wineconsole/winecon_user.h b/programs/wineconsole/winecon_user.h
index bf8d90b468f..03375dc669e 100644
--- a/programs/wineconsole/winecon_user.h
+++ b/programs/wineconsole/winecon_user.h
@@ -3,6 +3,20 @@
  * USER32 backend
  *
  * Copyright 2001 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <winbase.h>
diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c
index e4e5551c3dc..b9d79718482 100644
--- a/programs/wineconsole/wineconsole.c
+++ b/programs/wineconsole/wineconsole.c
@@ -2,6 +2,20 @@
  * an application for displaying Win32 console
  *
  * Copyright 2001 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
diff --git a/programs/wineconsole/wineconsole_En.rc b/programs/wineconsole/wineconsole_En.rc
index fc975914f40..4b3e48a791f 100644
--- a/programs/wineconsole/wineconsole_En.rc
+++ b/programs/wineconsole/wineconsole_En.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2001 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
diff --git a/programs/wineconsole/wineconsole_Fr.rc b/programs/wineconsole/wineconsole_Fr.rc
index 7c679a16964..73ec199dae7 100644
--- a/programs/wineconsole/wineconsole_Fr.rc
+++ b/programs/wineconsole/wineconsole_Fr.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2001 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
diff --git a/programs/wineconsole/wineconsole_res.h b/programs/wineconsole/wineconsole_res.h
index c021dd5238a..b9cafb7c0c2 100644
--- a/programs/wineconsole/wineconsole_res.h
+++ b/programs/wineconsole/wineconsole_res.h
@@ -1,4 +1,22 @@
-/* wineconsole resource definitions */
+/*
+ * wineconsole resource definitions
+ *
+ * Copyright 2001 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 /* strings */
 #define IDS_EDIT		0x100
diff --git a/programs/wineconsole/wineconsole_res.rc b/programs/wineconsole/wineconsole_res.rc
index 6ebc40c8add..d01a87e6c5b 100644
--- a/programs/wineconsole/wineconsole_res.rc
+++ b/programs/wineconsole/wineconsole_res.rc
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2001 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include "windef.h"
 #include "winuser.h"
 #include "winnls.h"
diff --git a/programs/winemine/dialog.c b/programs/winemine/dialog.c
index eba82973b47..5525efbcd3d 100644
--- a/programs/winemine/dialog.c
+++ b/programs/winemine/dialog.c
@@ -2,10 +2,22 @@
  * WineMine (dialog.c)
  * 
  * Copyright 2000 Joshua Thielen <jt85296@ltu.edu>
- * To be distributed under the Wine License
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-
 #include <windows.h>
 #include "main.h"
 #include "dialog.h"
diff --git a/programs/winemine/dialog.h b/programs/winemine/dialog.h
index b74e567ca4d..e40bf644e07 100644
--- a/programs/winemine/dialog.h
+++ b/programs/winemine/dialog.h
@@ -2,7 +2,20 @@
  * WineMine (dialog.h)
  * 
  * Copyright 2000 Joshua Thielen <jt85296@ltu.edu>
- * To be distributed under the Wine License
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 
diff --git a/programs/winemine/main.c b/programs/winemine/main.c
index 448093f192d..62c253ad5d9 100644
--- a/programs/winemine/main.c
+++ b/programs/winemine/main.c
@@ -2,10 +2,22 @@
  * WineMine (main.c)
  * 
  * Copyright 2000 Joshua Thielen <jt85296@ltu.edu>
- * To be distributed under the Wine License
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
diff --git a/programs/winemine/main.h b/programs/winemine/main.h
index d32c57a0b80..41741b317ed 100644
--- a/programs/winemine/main.h
+++ b/programs/winemine/main.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000 Joshua Thielen <jt85296@ltu.edu>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <windows.h>
 
 #define BEGINNER_MINES        10
diff --git a/programs/winemine/resource.h b/programs/winemine/resource.h
index 17bb4d63221..56ea59e9b94 100644
--- a/programs/winemine/resource.h
+++ b/programs/winemine/resource.h
@@ -2,7 +2,20 @@
  * WineMine (resource.h)
  * 
  * Copyright 2000 Joshua Thielen <jt85296@ltu.edu>
- * To be distributed under the Wine License
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 
diff --git a/programs/winemine/rsrc.rc b/programs/winemine/rsrc.rc
index f6ddf842927..605b2049aeb 100644
--- a/programs/winemine/rsrc.rc
+++ b/programs/winemine/rsrc.rc
@@ -2,7 +2,20 @@
  * WineMine (rsrc.rc)
  * 
  * Copyright 2000 Joshua Thielen <jt85296@ltu.edu>
- * To be distributed under the Wine License
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <windows.h>
diff --git a/programs/winetest/include/wine.pm b/programs/winetest/include/wine.pm
index 305828b58c9..54cea000b1d 100644
--- a/programs/winetest/include/wine.pm
+++ b/programs/winetest/include/wine.pm
@@ -3,6 +3,22 @@
 #
 # Purpose: Module to supply wrapper around and support for gateway to
 #          Windows API functions
+#
+# Copyright 2001 John F Sturtz for Codeweavers
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 # --------------------------------------------------------------------
 
 package wine;
diff --git a/programs/winetest/make_ctests b/programs/winetest/make_ctests
index ddda0674119..2bd735e84c9 100755
--- a/programs/winetest/make_ctests
+++ b/programs/winetest/make_ctests
@@ -1,4 +1,23 @@
 #!/usr/bin/perl
+#
+# Script to generate a C file containing a list of tests
+#
+# Copyright 2002 Alexandre Julliard
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 
 use strict;
 
diff --git a/programs/winetest/make_symbols b/programs/winetest/make_symbols
index eb083d259b7..2385929cb35 100755
--- a/programs/winetest/make_symbols
+++ b/programs/winetest/make_symbols
@@ -4,6 +4,20 @@
 #
 # Copyright 2002 Alexandre Julliard
 #
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 
 # list of symbols (regexps) to skip for each header
 %skip_list =
diff --git a/programs/winetest/runtest b/programs/winetest/runtest
index fefdd7130ed..a1db00fb651 100755
--- a/programs/winetest/runtest
+++ b/programs/winetest/runtest
@@ -4,6 +4,22 @@
 #
 # Usage: runtest [options] input_file [perl_args...]
 #
+# Copyright 2002 Alexandre Julliard
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 
 use strict;
 
diff --git a/programs/winetest/tests/wine.pl b/programs/winetest/tests/wine.pl
index 41b6b0c27fa..17e5d9fecf3 100644
--- a/programs/winetest/tests/wine.pl
+++ b/programs/winetest/tests/wine.pl
@@ -1,6 +1,22 @@
 ################################################################
 # Tests for wine.pm module functions
 #
+# Copyright 2001 Alexandre Julliard
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 
 use wine;
 
diff --git a/programs/winetest/wine.xs b/programs/winetest/wine.xs
index b63ac0732ff..bfd063dbf10 100644
--- a/programs/winetest/wine.xs
+++ b/programs/winetest/wine.xs
@@ -1,9 +1,22 @@
-/* -*-C-*- -------------------------------------------------------------
-| Module:      wine.xs                                                 |
-| -------------------------------------------------------------------- |
-| Purpose:     Perl gateway to wine API calls                          |
-|                                                                      |
-----------------------------------------------------------------------*/
+/* -*-C-*-
+ * Perl gateway to wine API calls
+ *
+ * Copyright 2001 John F Sturtz for Codeweavers
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include "config.h"
 
diff --git a/programs/winetest/winetest.c b/programs/winetest/winetest.c
index f58d6d884ea..04074e058af 100644
--- a/programs/winetest/winetest.c
+++ b/programs/winetest/winetest.c
@@ -1,5 +1,21 @@
 /*
  * Perl interpreter for running Wine tests
+ *
+ * Copyright 2001 John F Sturtz for Codeweavers
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
diff --git a/programs/winetest/wtmain.c b/programs/winetest/wtmain.c
index 52898e80966..d105042f0bf 100644
--- a/programs/winetest/wtmain.c
+++ b/programs/winetest/wtmain.c
@@ -3,6 +3,20 @@
  *
  * Copyright 2002 Alexandre Julliard
  * Copyright 2002 Andriy Palamarchuk
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
diff --git a/programs/winhelp/Da.rc b/programs/winhelp/Da.rc
index 1ebaa4c375f..3ea0a94bafc 100644
--- a/programs/winhelp/Da.rc
+++ b/programs/winhelp/Da.rc
@@ -2,6 +2,20 @@
  * Help Viewer
  *
  * Copyright 1997 Henrik Olsen
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* This file is not yet complete !! */
diff --git a/programs/winhelp/De.rc b/programs/winhelp/De.rc
index 38a0c17b692..3d8453b1ec1 100644
--- a/programs/winhelp/De.rc
+++ b/programs/winhelp/De.rc
@@ -2,6 +2,20 @@
  * Help Viewer
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* This file is not yet complete !! */
diff --git a/programs/winhelp/En.rc b/programs/winhelp/En.rc
index b14389b7ef4..18e4e47360c 100644
--- a/programs/winhelp/En.rc
+++ b/programs/winhelp/En.rc
@@ -2,6 +2,20 @@
  * Help Viewer
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* This file is not yet complete !! */
diff --git a/programs/winhelp/Es.rc b/programs/winhelp/Es.rc
index 2dd66f9149a..d84abd25e71 100644
--- a/programs/winhelp/Es.rc
+++ b/programs/winhelp/Es.rc
@@ -2,6 +2,20 @@
  * Help Viewer
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* This file is not yet complete !! */
diff --git a/programs/winhelp/Fi.rc b/programs/winhelp/Fi.rc
index 8d929f3b9e0..2195655ed78 100644
--- a/programs/winhelp/Fi.rc
+++ b/programs/winhelp/Fi.rc
@@ -3,6 +3,20 @@
  *
  * Copyright 1996 Ulrich Schmid
  * Finnish language by Jussi Tirkkonen <jt@modeemi.cs.tut.fi>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* This file is not yet complete !! */
diff --git a/programs/winhelp/Fr.rc b/programs/winhelp/Fr.rc
index d7c22595afd..1b620ed97bb 100644
--- a/programs/winhelp/Fr.rc
+++ b/programs/winhelp/Fr.rc
@@ -3,6 +3,20 @@
  *
  * Copyright 1996 Ulrich Schmid
  * French language by Pablo Saratxaga <srtxg@f2219.n293.z2.fidonet.org>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* This file is not yet complete !! */
diff --git a/programs/winhelp/Hu.rc b/programs/winhelp/Hu.rc
index 1c98a7a6034..e4205ddf319 100644
--- a/programs/winhelp/Hu.rc
+++ b/programs/winhelp/Hu.rc
@@ -2,6 +2,20 @@
  * Help Viewer
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* This file is not yet complete !! */
diff --git a/programs/winhelp/It.rc b/programs/winhelp/It.rc
index 1655d7a97a4..f806177857c 100644
--- a/programs/winhelp/It.rc
+++ b/programs/winhelp/It.rc
@@ -2,6 +2,20 @@
  * Help Viewer
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* This file is not yet complete !! */
diff --git a/programs/winhelp/Ko.rc b/programs/winhelp/Ko.rc
index f12b59ae36f..04c7c2d9991 100644
--- a/programs/winhelp/Ko.rc
+++ b/programs/winhelp/Ko.rc
@@ -2,6 +2,20 @@
  * Help Viewer
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* This file is not yet complete !! */
diff --git a/programs/winhelp/Pt.rc b/programs/winhelp/Pt.rc
index 76fb0d3fa3b..82116a6549d 100644
--- a/programs/winhelp/Pt.rc
+++ b/programs/winhelp/Pt.rc
@@ -3,6 +3,20 @@
  *
  * Copyright 1996 Ulrich Schmid
  * Portuguese translation by Gustavo Junior Alves <alves@correionet.com.br>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* This file is not yet complete !! */
diff --git a/programs/winhelp/Sk.rc b/programs/winhelp/Sk.rc
index 1bb8be83384..31fff4ee6a7 100644
--- a/programs/winhelp/Sk.rc
+++ b/programs/winhelp/Sk.rc
@@ -2,6 +2,20 @@
  * Help Viewer
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* This file is not yet complete !! */
diff --git a/programs/winhelp/Sw.rc b/programs/winhelp/Sw.rc
index 8228db8f8be..3a0c7150939 100644
--- a/programs/winhelp/Sw.rc
+++ b/programs/winhelp/Sw.rc
@@ -3,6 +3,20 @@
  *
  * Copyright 1996 Ulrich Schmid
  * Swedish language by Karl Backström <karl_b@geocities.com>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* This file is not yet complete !! */
diff --git a/programs/winhelp/Va.rc b/programs/winhelp/Va.rc
index 62d04241ddf..23f9dabeb0f 100644
--- a/programs/winhelp/Va.rc
+++ b/programs/winhelp/Va.rc
@@ -5,6 +5,19 @@
  *
  * Rumantsch Ladin (Vallader) by mbaur@g26.ethz.ch
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* This file is not yet complete !! */
diff --git a/programs/winhelp/Wa.rc b/programs/winhelp/Wa.rc
index 16a38106600..9eda1f2955e 100644
--- a/programs/winhelp/Wa.rc
+++ b/programs/winhelp/Wa.rc
@@ -1,6 +1,22 @@
 /*
  * Help Viewer
  *
+ * Copyright 1999 Pablo Saratxaga
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * Si vos voloz aider avou li ratoûrnaedje des libes programes è walon,
  * vos poloz scrîre a l' adresse emile <linux-wa@chanae.alphanet.ch>
  */
diff --git a/programs/winhelp/Xx.rc b/programs/winhelp/Xx.rc
index bf5f4952175..9e2a8aedb0d 100644
--- a/programs/winhelp/Xx.rc
+++ b/programs/winhelp/Xx.rc
@@ -2,6 +2,20 @@
  * Help Viewer
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* Menu */
diff --git a/programs/winhelp/hlp2sgml.c b/programs/winhelp/hlp2sgml.c
index 8c1992395c9..452c5e56ea4 100644
--- a/programs/winhelp/hlp2sgml.c
+++ b/programs/winhelp/hlp2sgml.c
@@ -1,5 +1,19 @@
 /*
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c
index c30621d1a9d..a52afacaad1 100644
--- a/programs/winhelp/hlpfile.c
+++ b/programs/winhelp/hlpfile.c
@@ -2,6 +2,20 @@
  * Help Viewer
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
diff --git a/programs/winhelp/hlpfile.h b/programs/winhelp/hlpfile.h
index fb525dba75d..86ff922c30c 100644
--- a/programs/winhelp/hlpfile.h
+++ b/programs/winhelp/hlpfile.h
@@ -2,6 +2,20 @@
  * Help Viewer
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 struct tagHelpFile;
diff --git a/programs/winhelp/macro.c b/programs/winhelp/macro.c
index e3c293a64d8..5d0051a16d7 100644
--- a/programs/winhelp/macro.c
+++ b/programs/winhelp/macro.c
@@ -2,6 +2,20 @@
  * Help Viewer
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
diff --git a/programs/winhelp/macro.h b/programs/winhelp/macro.h
index 1afe5199290..d18dfe01f95 100644
--- a/programs/winhelp/macro.h
+++ b/programs/winhelp/macro.h
@@ -2,6 +2,20 @@
  * Help Viewer
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "winnt.h"
diff --git a/programs/winhelp/macro.lex.l b/programs/winhelp/macro.lex.l
index eee33aae161..42ae505d8eb 100644
--- a/programs/winhelp/macro.lex.l
+++ b/programs/winhelp/macro.lex.l
@@ -3,6 +3,20 @@
  * Help Viewer
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 %}
 %x quote dquote
diff --git a/programs/winhelp/macro.yacc.y b/programs/winhelp/macro.yacc.y
index b26eb3b7434..84f022afde3 100644
--- a/programs/winhelp/macro.yacc.y
+++ b/programs/winhelp/macro.yacc.y
@@ -3,6 +3,20 @@
  * Help Viewer
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
diff --git a/programs/winhelp/rsrc.rc b/programs/winhelp/rsrc.rc
index 10ab1919a4d..bf51f6079ba 100644
--- a/programs/winhelp/rsrc.rc
+++ b/programs/winhelp/rsrc.rc
@@ -1,3 +1,22 @@
+/*
+ * Help Viewer
+ *
+ * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include "windows.h"
 #include "winhelp.h"
diff --git a/programs/winhelp/string.c b/programs/winhelp/string.c
index b404e928f76..494d93d7bc1 100644
--- a/programs/winhelp/string.c
+++ b/programs/winhelp/string.c
@@ -2,6 +2,20 @@
  * Help Viewer
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windows.h"
diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c
index cd9943b6032..3177182597d 100644
--- a/programs/winhelp/winhelp.c
+++ b/programs/winhelp/winhelp.c
@@ -2,6 +2,20 @@
  * Help Viewer
  *
  * Copyright 1996 Ulrich Schmid <uschmid@mail.hh.provi.de>
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
diff --git a/programs/winhelp/winhelp.h b/programs/winhelp/winhelp.h
index 3cbb2b1e9c2..2ec313498fd 100644
--- a/programs/winhelp/winhelp.h
+++ b/programs/winhelp/winhelp.h
@@ -2,6 +2,20 @@
  * Help Viewer
  *
  * Copyright 1996 Ulrich Schmid
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define MAX_LANGUAGE_NUMBER 255
diff --git a/programs/winver/winver.c b/programs/winver/winver.c
index 7c408cae042..e22ee2e6bff 100644
--- a/programs/winver/winver.c
+++ b/programs/winver/winver.c
@@ -3,7 +3,20 @@
  *
  * Copyright 1997 by Marcel Baur (mbaur@g26.ethz.ch)
  *
-*/
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include "windows.h"
 #include "wine/version.h"
diff --git a/relay32/builtin32.c b/relay32/builtin32.c
index 9e67f6f51a4..740180b6088 100644
--- a/relay32/builtin32.c
+++ b/relay32/builtin32.c
@@ -2,6 +2,20 @@
  * Win32 builtin functions
  *
  * Copyright 1997 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -22,10 +36,10 @@
 #include "file.h"
 #include "winerror.h"
 #include "wine/server.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(module);
-DECLARE_DEBUG_CHANNEL(relay);
+WINE_DEFAULT_DEBUG_CHANNEL(module);
+WINE_DECLARE_DEBUG_CHANNEL(relay);
 
 extern void RELAY_SetupDLL( const char *module );
 
diff --git a/relay32/relay386.c b/relay32/relay386.c
index d524879344b..03f5f28da1c 100644
--- a/relay32/relay386.c
+++ b/relay32/relay386.c
@@ -2,6 +2,20 @@
  * 386-specific Win32 relay functions
  *
  * Copyright 1997 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 
@@ -14,9 +28,9 @@
 #include "winnt.h"
 #include "stackframe.h"
 #include "module.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(relay);
+WINE_DEFAULT_DEBUG_CHANNEL(relay);
 
 char **debug_relay_excludelist = NULL, **debug_relay_includelist = NULL;
 
diff --git a/relay32/snoop.c b/relay32/snoop.c
index ebe1c0f9eb0..464de10c20e 100644
--- a/relay32/snoop.c
+++ b/relay32/snoop.c
@@ -2,6 +2,20 @@
  * 386-specific Win32 dll<->dll snooping functions
  *
  * Copyright 1998 Marcus Meissner
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -13,11 +27,11 @@
 #include "winnt.h"
 #include "snoop.h"
 #include "stackframe.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "wine/exception.h"
 #include "msvcrt/excpt.h"
 
-DEFAULT_DEBUG_CHANNEL(snoop);
+WINE_DEFAULT_DEBUG_CHANNEL(snoop);
 
 static WINE_EXCEPTION_FILTER(page_fault)
 {
diff --git a/scheduler/client.c b/scheduler/client.c
index 0aeb9f0a615..0da699a23e5 100644
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -2,6 +2,20 @@
  * Client part of the client/server communication
  *
  * Copyright (C) 1998 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/scheduler/critsection.c b/scheduler/critsection.c
index 7086a8bd80f..617e18eebc9 100644
--- a/scheduler/critsection.c
+++ b/scheduler/critsection.c
@@ -2,6 +2,20 @@
  * Win32 critical sections
  *
  * Copyright 1998 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -14,11 +28,11 @@
 #include "winerror.h"
 #include "winbase.h"
 #include "ntddk.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "thread.h"
 
-DEFAULT_DEBUG_CHANNEL(win32);
-DECLARE_DEBUG_CHANNEL(relay);
+WINE_DEFAULT_DEBUG_CHANNEL(win32);
+WINE_DECLARE_DEBUG_CHANNEL(relay);
 
 /***********************************************************************
  *           InitializeCriticalSection   (KERNEL32.@)
diff --git a/scheduler/handle.c b/scheduler/handle.c
index a9f7aa99d73..b19db57a875 100644
--- a/scheduler/handle.c
+++ b/scheduler/handle.c
@@ -2,6 +2,20 @@
  * Win32 process handles
  *
  * Copyright 1998 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
@@ -10,9 +24,9 @@
 #include "winbase.h"
 #include "wine/server.h"
 #include "winerror.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(win32);
+WINE_DEFAULT_DEBUG_CHANNEL(win32);
 
 /*********************************************************************
  *           CloseW32Handle (KERNEL.474)
diff --git a/scheduler/pipe.c b/scheduler/pipe.c
index 1332460dd88..cca5a1d2b5d 100644
--- a/scheduler/pipe.c
+++ b/scheduler/pipe.c
@@ -2,6 +2,20 @@
  * Win32 pipes
  *
  * Copyright 1998 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
diff --git a/scheduler/process.c b/scheduler/process.c
index 57c20bb9df1..38ba38a16c3 100644
--- a/scheduler/process.c
+++ b/scheduler/process.c
@@ -2,6 +2,20 @@
  * Win32 processes
  *
  * Copyright 1996, 1998 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
@@ -24,11 +38,11 @@
 #include "wincon.h"
 #include "wine/server.h"
 #include "options.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(process);
-DECLARE_DEBUG_CHANNEL(relay);
-DECLARE_DEBUG_CHANNEL(win32);
+WINE_DEFAULT_DEBUG_CHANNEL(process);
+WINE_DECLARE_DEBUG_CHANNEL(relay);
+WINE_DECLARE_DEBUG_CHANNEL(win32);
 
 struct _ENVDB;
 
diff --git a/scheduler/pthread.c b/scheduler/pthread.c
index a87c0d2a847..a81ab2703da 100644
--- a/scheduler/pthread.c
+++ b/scheduler/pthread.c
@@ -5,6 +5,20 @@
  * that want pthreads use Wine's own threading instead...
  *
  * Copyright 1999 Ove Kåven
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/scheduler/services.c b/scheduler/services.c
index fd156dd0da5..e29a137ee71 100644
--- a/scheduler/services.c
+++ b/scheduler/services.c
@@ -2,15 +2,29 @@
  * Kernel Services Thread
  *
  * Copyright 1999 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <sys/time.h>
 #include <unistd.h>
 
 #include "services.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(timer);
+WINE_DEFAULT_DEBUG_CHANNEL(timer);
 
 typedef struct _SERVICE
 {
diff --git a/scheduler/synchro.c b/scheduler/synchro.c
index 5446ce283fc..065620b68f7 100644
--- a/scheduler/synchro.c
+++ b/scheduler/synchro.c
@@ -2,6 +2,20 @@
  * Win32 process and thread synchronisation
  *
  * Copyright 1997 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
diff --git a/scheduler/sysdeps.c b/scheduler/sysdeps.c
index c02fb6a29e8..246dcf34b75 100644
--- a/scheduler/sysdeps.c
+++ b/scheduler/sysdeps.c
@@ -2,6 +2,20 @@
  * System-dependent scheduler support
  *
  * Copyright 1998 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -29,9 +43,9 @@
 #include "winbase.h"
 #include "wine/winbase16.h"
 #include "wine/exception.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(thread);
+WINE_DEFAULT_DEBUG_CHANNEL(thread);
 
 #if defined(linux) || defined(HAVE_CLONE)
 # ifdef HAVE_SCHED_H
diff --git a/scheduler/syslevel.c b/scheduler/syslevel.c
index 9d849e837f7..b25f63e68e3 100644
--- a/scheduler/syslevel.c
+++ b/scheduler/syslevel.c
@@ -2,6 +2,20 @@
  * Win32 'syslevel' routines
  *
  * Copyright 1998 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <unistd.h>
@@ -9,9 +23,9 @@
 #include "ntddk.h"
 #include "syslevel.h"
 #include "stackframe.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(win32);
+WINE_DEFAULT_DEBUG_CHANNEL(win32);
 
 static SYSLEVEL Win16Mutex = { CRITICAL_SECTION_INIT("Win16Mutex"), 1 };
 
diff --git a/scheduler/thread.c b/scheduler/thread.c
index c3de583c740..aabee1053c5 100644
--- a/scheduler/thread.c
+++ b/scheduler/thread.c
@@ -2,6 +2,20 @@
  * Win32 threads
  *
  * Copyright 1996 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -23,11 +37,11 @@
 #include "winnt.h"
 #include "wine/server.h"
 #include "stackframe.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winnls.h"
 
-DEFAULT_DEBUG_CHANNEL(thread);
-DECLARE_DEBUG_CHANNEL(relay);
+WINE_DEFAULT_DEBUG_CHANNEL(thread);
+WINE_DECLARE_DEBUG_CHANNEL(relay);
 
 /* TEB of the initial thread */
 static TEB initial_teb;
diff --git a/scheduler/timer.c b/scheduler/timer.c
index 2763f934ac8..578c0e9a6ef 100644
--- a/scheduler/timer.c
+++ b/scheduler/timer.c
@@ -2,6 +2,20 @@
  * Win32 waitable timers
  *
  * Copyright 1999 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
diff --git a/server/async.c b/server/async.c
index 567631ee6d9..5cbbcc59791 100644
--- a/server/async.c
+++ b/server/async.c
@@ -4,6 +4,19 @@
  * Copyright (C) 1998 Alexandre Julliard
  * Copyright (C) 2000 Mike McCormack
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/server/async.h b/server/async.h
index b0225245dd2..ec752b5cb22 100644
--- a/server/async.h
+++ b/server/async.h
@@ -1,3 +1,22 @@
+/*
+ * Async i/o definitions
+ *
+ * Copyright (C) 2000 Mike McCormack
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef _SERVER_ASYNC_
 #define _SERVER_ASYNC_
diff --git a/server/atom.c b/server/atom.c
index 005c84c8f08..90669cb1176 100644
--- a/server/atom.c
+++ b/server/atom.c
@@ -3,6 +3,20 @@
  *
  * Copyright (C) 1999, 2000 Alexandre Julliard
  * Copyright (C) 2000 Turchanov Sergei
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
diff --git a/server/change.c b/server/change.c
index 8d3a37c3f5c..daa0cadb3ba 100644
--- a/server/change.c
+++ b/server/change.c
@@ -2,6 +2,20 @@
  * Server-side change notification management
  *
  * Copyright (C) 1998 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
diff --git a/server/console.c b/server/console.c
index 29f76e57770..d8b2a3c1257 100644
--- a/server/console.c
+++ b/server/console.c
@@ -4,6 +4,20 @@
  * Copyright (C) 1998 Alexandre Julliard
  *               2001 Eric Pouech
  *
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/server/console.h b/server/console.h
index 9daed7198ef..69b4c1ca0b9 100644
--- a/server/console.h
+++ b/server/console.h
@@ -2,6 +2,20 @@
  * Wine server consoles
  *
  * Copyright (C) 2001 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_SERVER_CONSOLE_H
diff --git a/server/context_i386.c b/server/context_i386.c
index d72c89d8729..df4dc453218 100644
--- a/server/context_i386.c
+++ b/server/context_i386.c
@@ -2,6 +2,20 @@
  * i386 register context support
  *
  * Copyright (C) 1999 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/server/context_sparc.c b/server/context_sparc.c
index d8de535f590..15ef4cf7f9a 100644
--- a/server/context_sparc.c
+++ b/server/context_sparc.c
@@ -2,6 +2,20 @@
  * Sparc register context support
  *
  * Copyright (C) 2000 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/server/debugger.c b/server/debugger.c
index 60e406bc956..a0d7ac66886 100644
--- a/server/debugger.c
+++ b/server/debugger.c
@@ -2,6 +2,20 @@
  * Server-side debugger functions
  *
  * Copyright (C) 1999 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
diff --git a/server/device.c b/server/device.c
index 872c243b895..61ead6cb7d1 100644
--- a/server/device.c
+++ b/server/device.c
@@ -2,6 +2,20 @@
  * Server-side device management
  *
  * Copyright (C) 1999 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /*
diff --git a/server/event.c b/server/event.c
index 727b8ed794e..08f9b88ee9d 100644
--- a/server/event.c
+++ b/server/event.c
@@ -2,6 +2,20 @@
  * Server-side event management
  *
  * Copyright (C) 1998 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
diff --git a/server/file.c b/server/file.c
index 32c248710bb..9b1df3e9ace 100644
--- a/server/file.c
+++ b/server/file.c
@@ -2,6 +2,20 @@
  * Server-side file management
  *
  * Copyright (C) 1998 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/server/handle.c b/server/handle.c
index 96790920770..a0e72b4a343 100644
--- a/server/handle.c
+++ b/server/handle.c
@@ -2,6 +2,20 @@
  * Server-side handle management
  *
  * Copyright (C) 1998 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
diff --git a/server/handle.h b/server/handle.h
index 31538f50bb1..d63c89be28d 100644
--- a/server/handle.h
+++ b/server/handle.h
@@ -2,6 +2,20 @@
  * Server-side handle definitions
  *
  * Copyright (C) 1999 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_SERVER_HANDLE_H
diff --git a/server/main.c b/server/main.c
index 03123b9ae44..c6ecfd34995 100644
--- a/server/main.c
+++ b/server/main.c
@@ -2,6 +2,20 @@
  * Server main function
  *
  * Copyright (C) 1998 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
diff --git a/server/mapping.c b/server/mapping.c
index 2d63cc52aab..2d872f1e1c1 100644
--- a/server/mapping.c
+++ b/server/mapping.c
@@ -2,6 +2,20 @@
  * Server-side file mapping management
  *
  * Copyright (C) 1999 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/server/mutex.c b/server/mutex.c
index e27ccc19326..5b9ea212866 100644
--- a/server/mutex.c
+++ b/server/mutex.c
@@ -2,6 +2,20 @@
  * Server-side mutex management
  *
  * Copyright (C) 1998 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
diff --git a/server/named_pipe.c b/server/named_pipe.c
index 6bf4dcd969f..86c37aa5454 100644
--- a/server/named_pipe.c
+++ b/server/named_pipe.c
@@ -4,6 +4,20 @@
  * Copyright (C) 1998 Alexandre Julliard
  * Copyright (C) 2001 Mike McCormack
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * TODO:
  *   improve error handling
  */
diff --git a/server/object.c b/server/object.c
index 2411eff5667..eb6065a49d5 100644
--- a/server/object.c
+++ b/server/object.c
@@ -3,6 +3,20 @@
  * These are the server equivalent of K32OBJ
  *
  * Copyright (C) 1998 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
diff --git a/server/object.h b/server/object.h
index 851c4462863..378a1aec88e 100644
--- a/server/object.h
+++ b/server/object.h
@@ -2,6 +2,20 @@
  * Wine server objects
  *
  * Copyright (C) 1998 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_SERVER_OBJECT_H
diff --git a/server/pipe.c b/server/pipe.c
index 5dccae2b8f8..d0f6bf8344d 100644
--- a/server/pipe.c
+++ b/server/pipe.c
@@ -2,6 +2,20 @@
  * Server-side pipe management
  *
  * Copyright (C) 1998 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/server/process.c b/server/process.c
index 43b5555e7ce..a08c1c71973 100644
--- a/server/process.c
+++ b/server/process.c
@@ -2,6 +2,20 @@
  * Server-side process management
  *
  * Copyright (C) 1998 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/server/process.h b/server/process.h
index 93b4354fc0a..247325c1440 100644
--- a/server/process.h
+++ b/server/process.h
@@ -2,6 +2,20 @@
  * Wine server processes
  *
  * Copyright (C) 1999 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_SERVER_PROCESS_H
diff --git a/server/protocol.def b/server/protocol.def
index 72b10538d3b..ad8292e2a5d 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -6,6 +6,20 @@
  *
  * This file is used by tools/make_requests to build the
  * protocol structures in include/wine/server_protocol.h
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 @HEADER  /* start of C declarations */
diff --git a/server/ptrace.c b/server/ptrace.c
index 8eaaa6d4e4d..b66f02a57c7 100644
--- a/server/ptrace.c
+++ b/server/ptrace.c
@@ -2,6 +2,20 @@
  * Server-side ptrace support
  *
  * Copyright (C) 1999 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/server/queue.c b/server/queue.c
index 150a213defb..4c3efd3d24f 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -2,6 +2,20 @@
  * Server-side message queues
  *
  * Copyright (C) 2000 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
diff --git a/server/registry.c b/server/registry.c
index 902d065437d..b2c5aa46477 100644
--- a/server/registry.c
+++ b/server/registry.c
@@ -2,6 +2,20 @@
  * Server-side registry management
  *
  * Copyright (C) 1999 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* To do:
diff --git a/server/request.c b/server/request.c
index 0c79dc278a5..f563aa567c8 100644
--- a/server/request.c
+++ b/server/request.c
@@ -2,6 +2,20 @@
  * Server-side request handling
  *
  * Copyright (C) 1998 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/server/request.h b/server/request.h
index 6acabfedd4f..07aed4082b3 100644
--- a/server/request.h
+++ b/server/request.h
@@ -2,6 +2,20 @@
  * Wine server requests
  *
  * Copyright (C) 1999 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_SERVER_REQUEST_H
diff --git a/server/select.c b/server/select.c
index bbd8d2e92c6..065c456f48f 100644
--- a/server/select.c
+++ b/server/select.c
@@ -2,6 +2,20 @@
  * Server main select() loop
  *
  * Copyright (C) 1998 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
diff --git a/server/semaphore.c b/server/semaphore.c
index 1ccaeea03eb..b8eb9b73199 100644
--- a/server/semaphore.c
+++ b/server/semaphore.c
@@ -2,6 +2,20 @@
  * Server-side semaphore management
  *
  * Copyright (C) 1998 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
diff --git a/server/serial.c b/server/serial.c
index 59118768ff2..bd016633020 100644
--- a/server/serial.c
+++ b/server/serial.c
@@ -4,6 +4,20 @@
  * Copyright (C) 1998 Alexandre Julliard
  * Copyright (C) 2000,2001 Mike McCormack
  *
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/server/snapshot.c b/server/snapshot.c
index 9bd05dfa120..f15d43305b5 100644
--- a/server/snapshot.c
+++ b/server/snapshot.c
@@ -3,6 +3,20 @@
  *
  * Copyright (C) 1999 Alexandre Julliard
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * FIXME: heap snapshots not implemented
  */
 
diff --git a/server/sock.c b/server/sock.c
index 69a129bb3c9..aa17293f0b2 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -3,6 +3,20 @@
  *
  * Copyright (C) 1999 Marcus Meissner, Ove Kåven
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * FIXME: we use read|write access in all cases. Shouldn't we depend that
  * on the access of the current handle?
  */
diff --git a/server/thread.c b/server/thread.c
index d03b9827709..09ad63b4023 100644
--- a/server/thread.c
+++ b/server/thread.c
@@ -2,6 +2,20 @@
  * Server-side thread management
  *
  * Copyright (C) 1998 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/server/thread.h b/server/thread.h
index d6e777979e3..f5d5f0159ab 100644
--- a/server/thread.h
+++ b/server/thread.h
@@ -2,6 +2,20 @@
  * Wine server threads
  *
  * Copyright (C) 1998 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_SERVER_THREAD_H
diff --git a/server/timer.c b/server/timer.c
index 90e1f32f74b..7120ef5ae8e 100644
--- a/server/timer.c
+++ b/server/timer.c
@@ -2,6 +2,20 @@
  * Waitable timers management
  *
  * Copyright (C) 1999 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
diff --git a/server/trace.c b/server/trace.c
index 0d5a89d6d60..c4c2879ff1d 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -2,6 +2,20 @@
  * Server request tracing
  *
  * Copyright (C) 1999 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/server/unicode.c b/server/unicode.c
index 892807762fd..17016b7e42d 100644
--- a/server/unicode.c
+++ b/server/unicode.c
@@ -2,6 +2,20 @@
  * Unicode routines for use inside the server
  *
  * Copyright (C) 1999 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <ctype.h>
diff --git a/server/unicode.h b/server/unicode.h
index c6b600db5ef..88fb21491e4 100644
--- a/server/unicode.h
+++ b/server/unicode.h
@@ -2,6 +2,20 @@
  * Unicode routines for use inside the server
  *
  * Copyright (C) 1999 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_SERVER_UNICODE_H
diff --git a/server/user.c b/server/user.c
index e28189c7ab0..c4a16cc6d3d 100644
--- a/server/user.c
+++ b/server/user.c
@@ -2,6 +2,20 @@
  * Server-side USER handles
  *
  * Copyright (C) 2001 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "thread.h"
diff --git a/server/user.h b/server/user.h
index 884088ac94e..d62ced116ce 100644
--- a/server/user.h
+++ b/server/user.h
@@ -2,6 +2,20 @@
  * Wine server USER definitions
  *
  * Copyright (C) 2001 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_SERVER_USER_H
diff --git a/server/window.c b/server/window.c
index c1ffe8499ff..40790072892 100644
--- a/server/window.c
+++ b/server/window.c
@@ -2,6 +2,20 @@
  * Server-side window handling
  *
  * Copyright (C) 2001 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
diff --git a/tools/bin2res.c b/tools/bin2res.c
index dd5e8833c3d..e88e4960e5f 100644
--- a/tools/bin2res.c
+++ b/tools/bin2res.c
@@ -5,6 +5,20 @@
  * Copyright 1999 Juergen Schmied
  *
  * 11/99 first release
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/tools/bug_report.pl b/tools/bug_report.pl
index 677412d8cd5..c634b8a662a 100755
--- a/tools/bug_report.pl
+++ b/tools/bug_report.pl
@@ -1,14 +1,25 @@
 #!/usr/bin/perl
 ##Wine Quick Debug Report Maker Thingy (WQDRMK)
-##By Adam Sacarny
-##(c) 1998-1999
+## Copyright (c) 1998-1999 Adam Sacarny
 ##Do not say this is yours without my express permisson, or I will
 ##hunt you down and kill you like the savage animal I am.
 ##
 ## Improvements by Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>
 ## (c) 2000
 ##
-## Released under the WINE licence.
+## 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.
+##
+## This library is distributed in the hope that it will be useful,
+## 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ##
 ##Changelog: 
 ##August 29, 1999 - Work around for debugger exit (or lack thereof)
diff --git a/tools/c2man.pl b/tools/c2man.pl
index f1d211c0d28..26dd39509a0 100755
--- a/tools/c2man.pl
+++ b/tools/c2man.pl
@@ -4,12 +4,26 @@
 # 
 # c2man.pl v0.1  Copyright (C) 2000 Mike McCormack
 #
-# Genenerates Documents from C source code.
+# Generates Documents from C source code.
 #
 # Input is source code with specially formatted comments, output
 # is man pages. The functionality is meant to be similar to c2man.
 # The following is an example provided in the Wine documentation.
 #
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 # TODO:
 #  Write code to generate HTML output with the -Th option.
 #  Need somebody who knows about TROFF to help touch up the man page generation.
diff --git a/tools/examine-relay b/tools/examine-relay
index fd2a52db4a2..cc9d5161ff0 100755
--- a/tools/examine-relay
+++ b/tools/examine-relay
@@ -10,6 +10,19 @@
 # Copyright 1997-1998 Morten Welinder (terra@diku.dk)
 #           2001      Eric Pouech
 #
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 # -----------------------------------------------------------------------------
 
 use strict;
diff --git a/tools/fnt2bdf.c b/tools/fnt2bdf.c
index ce773c5059a..a7571cc999c 100644
--- a/tools/fnt2bdf.c
+++ b/tools/fnt2bdf.c
@@ -5,6 +5,19 @@
  *
  * Copyright 1994-1996 Kevin Carothers and Alex Korobka
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/tools/fnt2bdf.h b/tools/fnt2bdf.h
index 0abd6a8439b..43bdebe7974 100644
--- a/tools/fnt2bdf.h
+++ b/tools/fnt2bdf.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1994-1996 Kevin Carothers and Alex Korobka
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include "wine/wingdi16.h"
 
 #include "pshpack1.h"
diff --git a/tools/font_convert.sh b/tools/font_convert.sh
index 19fd96a72ed..24bd89e5629 100755
--- a/tools/font_convert.sh
+++ b/tools/font_convert.sh
@@ -1,4 +1,21 @@
 #! /bin/bash
+#
+# Copyright 2000 Peter Ganten
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 
 # default settings
 TMPDIR=/tmp/fconv.$$;
diff --git a/tools/genpatch b/tools/genpatch
index 539f1f40dc0..2625cd412ad 100755
--- a/tools/genpatch
+++ b/tools/genpatch
@@ -3,9 +3,22 @@
 # genpatch - A utility that generates patches for submission to
 # wine-patches@winehq.com
 #
-# By Steven Elliott <elliotsl@mindspring.com>
+# Copyright Steven Elliott <elliotsl@mindspring.com>
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-# This program is subject to the same license as Wine (www.winehq.com).
 
 =head1 NAME
 
diff --git a/tools/make_X11wrappers b/tools/make_X11wrappers
index 1fc5967ed3a..87ae46070a6 100755
--- a/tools/make_X11wrappers
+++ b/tools/make_X11wrappers
@@ -4,7 +4,20 @@
 #
 # Copyright 1998 Kristian Nielsen.
 #
-
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 # FIXME: This does not do full C prototype parsing, but relies on
 # knowledge on how the X11 include files are formatted. It will
 # probably need to be modified for new include files. It also fails
diff --git a/tools/make_authors b/tools/make_authors
index 23e0166bc77..e2c1c9d9d4a 100755
--- a/tools/make_authors
+++ b/tools/make_authors
@@ -2,6 +2,23 @@
 #
 # Generate AUTHORS and dlls/shell32/authors.h
 #
+# Copyright 1998 Alexandre Julliard
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 open(AUTHORS,"<AUTHORS") or die "Can't open AUTHORS";
 open(NEWAUTHORS,">AUTHORS.new");
 while(<AUTHORS>)
diff --git a/tools/make_debug b/tools/make_debug
index 7916f8ec529..cc83b29846d 100755
--- a/tools/make_debug
+++ b/tools/make_debug
@@ -4,6 +4,20 @@
 #
 # Copyright 2000 Alexandre Julliard
 #
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 # Usage: make_debug spec_file [source_files...]
 #
 
diff --git a/tools/make_requests b/tools/make_requests
index 34cd54d0b53..f23416c3968 100755
--- a/tools/make_requests
+++ b/tools/make_requests
@@ -5,6 +5,20 @@
 #
 # Copyright (C) 1998 Alexandre Julliard
 #
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 
 %formats =
 (
diff --git a/tools/makedep.c b/tools/makedep.c
index a5401a56404..5a09e5ebc2e 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -2,6 +2,20 @@
  * Generate include file dependencies
  *
  * Copyright 1996 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <ctype.h>
diff --git a/tools/testrun b/tools/testrun
index b5e1da689f2..79e34620091 100755
--- a/tools/testrun
+++ b/tools/testrun
@@ -2,6 +2,22 @@
 # Copyright 1996-1998 Marcus Meissner
 # IPC remove code Copyright 1995 Michael Veksler
 #
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# NOTES:
+#
 # This perl script automatically test runs ALL windows .exe and .scr binaries
 # it finds (and can access) on your computer. It creates a subdirectory called
 # runs/ and stores the output there. It also does (unique) diffs between runs.
diff --git a/tools/winapi/c_function.pm b/tools/winapi/c_function.pm
index ee96a91af4d..9b82814d765 100644
--- a/tools/winapi/c_function.pm
+++ b/tools/winapi/c_function.pm
@@ -1,3 +1,21 @@
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 package c_function;
 
 use strict;
diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm
index ac517e65715..451dcdf148c 100644
--- a/tools/winapi/c_parser.pm
+++ b/tools/winapi/c_parser.pm
@@ -1,3 +1,21 @@
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 package c_parser;
 
 use strict;
diff --git a/tools/winapi/config.pm b/tools/winapi/config.pm
index 87e80d07b08..24c3ed44c12 100644
--- a/tools/winapi/config.pm
+++ b/tools/winapi/config.pm
@@ -1,3 +1,21 @@
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 package config;
 
 use strict;
diff --git a/tools/winapi/function.pm b/tools/winapi/function.pm
index 2bd9b37ee36..92dfab74da1 100644
--- a/tools/winapi/function.pm
+++ b/tools/winapi/function.pm
@@ -1,3 +1,21 @@
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 package function;
 
 use strict;
diff --git a/tools/winapi/make_filter b/tools/winapi/make_filter
index 4cbd1f39c91..1dfc9afe697 100755
--- a/tools/winapi/make_filter
+++ b/tools/winapi/make_filter
@@ -1,4 +1,21 @@
 #! /usr/bin/perl -w
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 
 use strict;
 
diff --git a/tools/winapi/make_filter_options.pm b/tools/winapi/make_filter_options.pm
index 98f3becc66a..707b121e4d3 100644
--- a/tools/winapi/make_filter_options.pm
+++ b/tools/winapi/make_filter_options.pm
@@ -1,3 +1,21 @@
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 package make_filter_options;
 use base qw(options);
 
diff --git a/tools/winapi/make_parser.pm b/tools/winapi/make_parser.pm
index 00c1ed95c1d..5d35f39f321 100644
--- a/tools/winapi/make_parser.pm
+++ b/tools/winapi/make_parser.pm
@@ -1,3 +1,21 @@
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 package make_parser;
 
 use strict;
diff --git a/tools/winapi/options.pm b/tools/winapi/options.pm
index 3f7cdf6659b..5a6ca950a72 100644
--- a/tools/winapi/options.pm
+++ b/tools/winapi/options.pm
@@ -1,3 +1,21 @@
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 package options;
 
 use strict;
diff --git a/tools/winapi/output.pm b/tools/winapi/output.pm
index 49939740f82..f5cf79373fb 100644
--- a/tools/winapi/output.pm
+++ b/tools/winapi/output.pm
@@ -1,3 +1,21 @@
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 package output;
 
 use strict;
diff --git a/tools/winapi/setup.pm b/tools/winapi/setup.pm
index e123a7c32ee..6ec13a512cf 100644
--- a/tools/winapi/setup.pm
+++ b/tools/winapi/setup.pm
@@ -1,3 +1,21 @@
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 package setup;
 
 use strict;
diff --git a/tools/winapi/trampoline b/tools/winapi/trampoline
index 166c3497e8b..cd048650079 100755
--- a/tools/winapi/trampoline
+++ b/tools/winapi/trampoline
@@ -1,4 +1,21 @@
 #! /usr/bin/perl -w
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 
 use strict;
 
diff --git a/tools/winapi/type.pm b/tools/winapi/type.pm
index 3608355e7bc..1026e92747b 100644
--- a/tools/winapi/type.pm
+++ b/tools/winapi/type.pm
@@ -1,3 +1,21 @@
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 package type;
 
 use strict;
diff --git a/tools/winapi/util.pm b/tools/winapi/util.pm
index 9d94feb5600..2d3c86f8004 100644
--- a/tools/winapi/util.pm
+++ b/tools/winapi/util.pm
@@ -1,3 +1,21 @@
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 package util;
 
 use strict;
diff --git a/tools/winapi/winapi_check b/tools/winapi/winapi_check
index 0adab85fb34..d9c190c691b 100755
--- a/tools/winapi/winapi_check
+++ b/tools/winapi/winapi_check
@@ -1,4 +1,21 @@
 #! /usr/bin/perl -w
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 
 use strict;
 
diff --git a/tools/winapi/winapi_check_options.pm b/tools/winapi/winapi_check_options.pm
index 88dab8c317b..35e7b0d46f9 100644
--- a/tools/winapi/winapi_check_options.pm
+++ b/tools/winapi/winapi_check_options.pm
@@ -1,3 +1,21 @@
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 package winapi_check_options;
 use base qw(options);
 
diff --git a/tools/winapi/winapi_extract b/tools/winapi/winapi_extract
index 88cebeb31c2..a480b71bfbb 100755
--- a/tools/winapi/winapi_extract
+++ b/tools/winapi/winapi_extract
@@ -1,6 +1,21 @@
 #!/usr/bin/perl -w
 
 # Copyright 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 
 use strict;
 
diff --git a/tools/winapi/winapi_extract_options.pm b/tools/winapi/winapi_extract_options.pm
index 6a5d4ebbd62..d21ce9a6ea2 100644
--- a/tools/winapi/winapi_extract_options.pm
+++ b/tools/winapi/winapi_extract_options.pm
@@ -1,3 +1,21 @@
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 package winapi_extract_options;
 use base qw(options);
 
diff --git a/tools/winapi/winapi_fixup b/tools/winapi/winapi_fixup
index 4ac4b3946ed..83c96c75da8 100755
--- a/tools/winapi/winapi_fixup
+++ b/tools/winapi/winapi_fixup
@@ -1,6 +1,21 @@
 #!/usr/bin/perl -w
 
 # Copyright 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 
 use strict;
 
diff --git a/tools/winapi/winapi_fixup_documentation.pm b/tools/winapi/winapi_fixup_documentation.pm
index 15d22eab11b..91d7e73183a 100644
--- a/tools/winapi/winapi_fixup_documentation.pm
+++ b/tools/winapi/winapi_fixup_documentation.pm
@@ -1,3 +1,21 @@
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 package winapi_fixup_documentation;
 
 use strict;
diff --git a/tools/winapi/winapi_fixup_editor.pm b/tools/winapi/winapi_fixup_editor.pm
index 49f0bde2f8d..6a09d903a39 100644
--- a/tools/winapi/winapi_fixup_editor.pm
+++ b/tools/winapi/winapi_fixup_editor.pm
@@ -1,3 +1,21 @@
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 package winapi_fixup_editor;
 
 use strict;
diff --git a/tools/winapi/winapi_fixup_options.pm b/tools/winapi/winapi_fixup_options.pm
index c4a15e5db51..94be80c29bd 100644
--- a/tools/winapi/winapi_fixup_options.pm
+++ b/tools/winapi/winapi_fixup_options.pm
@@ -1,3 +1,21 @@
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 package winapi_fixup_options;
 use base qw(options);
 
diff --git a/tools/winapi/winapi_fixup_statements.pm b/tools/winapi/winapi_fixup_statements.pm
index 83b92febfc7..fb7c3ecea27 100644
--- a/tools/winapi/winapi_fixup_statements.pm
+++ b/tools/winapi/winapi_fixup_statements.pm
@@ -1,3 +1,21 @@
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 package winapi_fixup_statements;
 
 use strict;
diff --git a/tools/winapi/winapi_module_user.pm b/tools/winapi/winapi_module_user.pm
index afb23dcdb39..e2df1fa616b 100644
--- a/tools/winapi/winapi_module_user.pm
+++ b/tools/winapi/winapi_module_user.pm
@@ -1,3 +1,21 @@
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 package winapi_module_user;
 
 use strict;
diff --git a/tools/winapi_check/modules.pm b/tools/winapi_check/modules.pm
index a6598b6736d..030866e5176 100644
--- a/tools/winapi_check/modules.pm
+++ b/tools/winapi_check/modules.pm
@@ -1,3 +1,21 @@
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 package modules;
 
 use strict;
diff --git a/tools/winapi_check/nativeapi.pm b/tools/winapi_check/nativeapi.pm
index 969e58ca157..5816d9a1527 100644
--- a/tools/winapi_check/nativeapi.pm
+++ b/tools/winapi_check/nativeapi.pm
@@ -1,3 +1,21 @@
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 package nativeapi;
 
 use strict;
diff --git a/tools/winapi_check/preprocessor.pm b/tools/winapi_check/preprocessor.pm
index 771c26cba2a..a3086a95d35 100644
--- a/tools/winapi_check/preprocessor.pm
+++ b/tools/winapi_check/preprocessor.pm
@@ -1,3 +1,21 @@
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 package preprocessor;
 
 use strict;
diff --git a/tools/winapi_check/winapi.pm b/tools/winapi_check/winapi.pm
index 6ccea49a26a..db04ec13201 100644
--- a/tools/winapi_check/winapi.pm
+++ b/tools/winapi_check/winapi.pm
@@ -1,3 +1,21 @@
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 package winapi;
 
 use strict;
diff --git a/tools/winapi_check/winapi_check b/tools/winapi_check/winapi_check
index f14b698b335..8ef4a31dd6b 100755
--- a/tools/winapi_check/winapi_check
+++ b/tools/winapi_check/winapi_check
@@ -1,6 +1,21 @@
 #!/usr/bin/perl -w
 
 # Copyright 1999-2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 
 # Note that winapi_check are using heuristics quite heavily.
 # So always remember that:
diff --git a/tools/winapi_check/winapi_documentation.pm b/tools/winapi_check/winapi_documentation.pm
index 695f11a77fc..13b94b2d1a1 100644
--- a/tools/winapi_check/winapi_documentation.pm
+++ b/tools/winapi_check/winapi_documentation.pm
@@ -1,3 +1,21 @@
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 package winapi_documentation;
 
 use strict;
diff --git a/tools/winapi_check/winapi_function.pm b/tools/winapi_check/winapi_function.pm
index 6a3d0ec6572..f0208064f5b 100644
--- a/tools/winapi_check/winapi_function.pm
+++ b/tools/winapi_check/winapi_function.pm
@@ -1,3 +1,21 @@
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 package winapi_function;
 use base qw(function);
 
diff --git a/tools/winapi_check/winapi_global.pm b/tools/winapi_check/winapi_global.pm
index d58b2849e2c..495737e87aa 100644
--- a/tools/winapi_check/winapi_global.pm
+++ b/tools/winapi_check/winapi_global.pm
@@ -1,3 +1,21 @@
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 package winapi_global;
 
 use strict;
diff --git a/tools/winapi_check/winapi_local.pm b/tools/winapi_check/winapi_local.pm
index 2eda324349d..38a35b3f909 100644
--- a/tools/winapi_check/winapi_local.pm
+++ b/tools/winapi_check/winapi_local.pm
@@ -1,3 +1,21 @@
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 package winapi_local;
 
 use strict;
diff --git a/tools/winapi_check/winapi_options.pm b/tools/winapi_check/winapi_options.pm
index 73b617c138e..b5f71c3b209 100644
--- a/tools/winapi_check/winapi_options.pm
+++ b/tools/winapi_check/winapi_options.pm
@@ -1,3 +1,21 @@
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 package winapi_options;
 
 use strict;
diff --git a/tools/winapi_check/winapi_parser.pm b/tools/winapi_check/winapi_parser.pm
index 6c9195d541e..677a7bd409b 100644
--- a/tools/winapi_check/winapi_parser.pm
+++ b/tools/winapi_check/winapi_parser.pm
@@ -1,3 +1,21 @@
+#
+# Copyright 1999, 2000, 2001 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 package winapi_parser;
 
 use strict;
diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h
index 8b304c6093a..6c3f07f8643 100644
--- a/tools/winebuild/build.h
+++ b/tools/winebuild/build.h
@@ -4,6 +4,20 @@
  * Copyright 1995, 1996, 1997 Alexandre Julliard
  * Copyright 1997 Eric Youngdale
  * Copyright 1999 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WINE_BUILD_H
@@ -134,6 +148,7 @@ extern char *strupper(char *s);
 extern void fatal_error( const char *msg, ... );
 extern void fatal_perror( const char *msg, ... );
 extern void warning( const char *msg, ... );
+extern void output_standard_file_header( FILE *outfile );
 extern void dump_bytes( FILE *outfile, const unsigned char *data, int len,
                         const char *label, int constant );
 extern int get_alignment(int alignBoundary);
diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c
index 39634de7133..9f2ee3d923c 100644
--- a/tools/winebuild/import.c
+++ b/tools/winebuild/import.c
@@ -3,6 +3,20 @@
  *
  * Copyright 2000 Alexandre Julliard
  *           2000 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c
index 37f39bdc2a5..a106cb0f2bd 100644
--- a/tools/winebuild/main.c
+++ b/tools/winebuild/main.c
@@ -6,6 +6,20 @@
  * Copyright 1995, 1996, 1997 Alexandre Julliard
  * Copyright 1997 Eric Youngdale
  * Copyright 1999 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c
index d66ec2dac22..cb23a1a4fc6 100644
--- a/tools/winebuild/parser.c
+++ b/tools/winebuild/parser.c
@@ -6,6 +6,20 @@
  * Copyright 1995, 1996, 1997 Alexandre Julliard
  * Copyright 1997 Eric Youngdale
  * Copyright 1999 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c
index b944c90d910..b61a8556d18 100644
--- a/tools/winebuild/relay.c
+++ b/tools/winebuild/relay.c
@@ -6,6 +6,20 @@
  * Copyright 1995, 1996, 1997 Alexandre Julliard
  * Copyright 1997 Eric Youngdale
  * Copyright 1999 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/tools/winebuild/res16.c b/tools/winebuild/res16.c
index 67d38f4b693..b0e078ec242 100644
--- a/tools/winebuild/res16.c
+++ b/tools/winebuild/res16.c
@@ -2,6 +2,20 @@
  * Builtin dlls resource support
  *
  * Copyright 2000 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c
index 75f6566fcbe..bfda90e47d1 100644
--- a/tools/winebuild/res32.c
+++ b/tools/winebuild/res32.c
@@ -2,6 +2,20 @@
  * Builtin dlls resource support
  *
  * Copyright 2000 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c
index fd06f841415..23d990f1049 100644
--- a/tools/winebuild/spec16.c
+++ b/tools/winebuild/spec16.c
@@ -6,6 +6,20 @@
  * Copyright 1995, 1996, 1997 Alexandre Julliard
  * Copyright 1997 Eric Youngdale
  * Copyright 1999 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -34,8 +48,7 @@ __ASM_GLOBAL_FUNC( __get_cs, "movw %cs,%ax\n\tret" );
  */
 static void output_file_header( FILE *outfile )
 {
-    fprintf( outfile, "/* File generated automatically from %s; do not edit! */\n\n",
-             input_file_name );
+    output_standard_file_header( outfile );
     fprintf( outfile, "extern struct\n{\n" );
     fprintf( outfile, "  void *base[8192];\n" );
     fprintf( outfile, "  unsigned long limit[8192];\n" );
diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c
index 95444e3150a..edfa700f6c0 100644
--- a/tools/winebuild/spec32.c
+++ b/tools/winebuild/spec32.c
@@ -6,6 +6,20 @@
  * Copyright 1995, 1996, 1997 Alexandre Julliard
  * Copyright 1997 Eric Youngdale
  * Copyright 1999 Ulrich Weigand
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -437,9 +451,7 @@ void BuildSpec32File( FILE *outfile )
     nr_exports = Base <= Limit ? Limit - Base + 1 : 0;
 
     resolve_imports();
-
-    fprintf( outfile, "/* File generated automatically from %s; do not edit! */\n\n",
-             input_file_name );
+    output_standard_file_header( outfile );
 
     /* Reserve some space for the PE header */
 
diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c
index 95c399d6e27..1523d957267 100644
--- a/tools/winebuild/utils.c
+++ b/tools/winebuild/utils.c
@@ -1,4 +1,22 @@
-/* small utility functions for winebuild */
+/*
+ * Small utility functions for winebuild
+ *
+ * Copyright 2000 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include "config.h"
 
@@ -102,6 +120,15 @@ void warning( const char *msg, ... )
     va_end( valist );
 }
 
+/* output a standard header for generated files */
+void output_standard_file_header( FILE *outfile )
+{
+    fprintf( outfile, "/* File generated automatically from %s; do not edit! */\n",
+             input_file_name );
+    fprintf( outfile,
+             "/* This file can be copied, modified and distributed without restriction. */\n\n" );
+}
+
 /* dump a byte stream into the assembly code */
 void dump_bytes( FILE *outfile, const unsigned char *data, int len,
                  const char *label, int constant )
diff --git a/tools/winecheck b/tools/winecheck
index 97962a87dad..f6013d6b527 100755
--- a/tools/winecheck
+++ b/tools/winecheck
@@ -2,8 +2,21 @@
 
 # This program checks the whole Wine environment configuration.
 # (or that's at least what it's supposed to do once it's finished)
-# (C) 2001 Andreas Mohr
-# Redistributable under Wine License
+# Copyright (C) 2001 Andreas Mohr
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 # FIXME:
 # - implement cmdline arguments e.g. for confirmation keypress
diff --git a/tools/wineconf b/tools/wineconf
index c8bc540ee10..8a5e0badf61 100755
--- a/tools/wineconf
+++ b/tools/wineconf
@@ -1,11 +1,24 @@
 #!/usr/bin/perl -w
 
 # This program generates wine.conf files on STDOUT.
-# (C) 1996 Stephen Simmons
-# Redistributable under Wine License
-
-$RCS_ID = '$Id$ ';
-
+# Copyright (C) 1996 Stephen Simmons
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# NOTES:
+#
 # This program examines the contents of the DOS filesystems and
 # attempts to generate a sensible wine.conf file.  This is output
 # to STDOUT.
diff --git a/tools/wineconf.libs/autoconf.eng b/tools/wineconf.libs/autoconf.eng
index f5754db0278..1bca06a0112 100644
--- a/tools/wineconf.libs/autoconf.eng
+++ b/tools/wineconf.libs/autoconf.eng
@@ -1,3 +1,20 @@
+# Copyright 1999 Jean-Louis Thirot
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 set AlternateFstab "No /etc/fstab on your system, please, give an alternate filename"
 
 set IsCDwrite "is a cdrom.\n\n Please, let me know if you want to write CDs on this device."
diff --git a/tools/wineconf.libs/autoconf.tcl b/tools/wineconf.libs/autoconf.tcl
index e28a3d763e6..9c992dd5a58 100644
--- a/tools/wineconf.libs/autoconf.tcl
+++ b/tools/wineconf.libs/autoconf.tcl
@@ -1,3 +1,20 @@
+# Copyright 1999 Jean-Louis Thirot
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 proc TkW:autoconf {outfile} {
 
 # This files scans the fstab, then creates a wine.conf file
diff --git a/tools/wineconf.libs/browsers.eng b/tools/wineconf.libs/browsers.eng
index 86f74dea31d..08c3c3d9dd1 100644
--- a/tools/wineconf.libs/browsers.eng
+++ b/tools/wineconf.libs/browsers.eng
@@ -1,3 +1,20 @@
+# Copyright 1999 Jean-Louis Thirot
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 set DIRBROWSE "Browse Folders"
 set FolderSelection "Selection:"
 set FILTERFOLD "Search Filter (Folders):"
diff --git a/tools/wineconf.libs/dirbrowser.tcl b/tools/wineconf.libs/dirbrowser.tcl
index 735351d4d01..64a68ca9ce5 100644
--- a/tools/wineconf.libs/dirbrowser.tcl
+++ b/tools/wineconf.libs/dirbrowser.tcl
@@ -1,3 +1,20 @@
+# Copyright 1999 Jean-Louis Thirot
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 proc TkW:dirbrowse {pattern patternF mode} {
 	# input arg: initial pattern  mode (File or Folder
 	# returns selected folders as a global SelectFolder
diff --git a/tools/wineconf.libs/general.eng b/tools/wineconf.libs/general.eng
index 21b53975d1a..9ff0c29d546 100644
--- a/tools/wineconf.libs/general.eng
+++ b/tools/wineconf.libs/general.eng
@@ -1,3 +1,20 @@
+# Copyright 1999 Jean-Louis Thirot
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 set TO TO
 set OK OK
 set QUIT QUIT
diff --git a/tools/wineconf.libs/getfilename.tcl b/tools/wineconf.libs/getfilename.tcl
index 23fe6814f15..04cd51e0905 100644
--- a/tools/wineconf.libs/getfilename.tcl
+++ b/tools/wineconf.libs/getfilename.tcl
@@ -2,6 +2,22 @@
 #############################################################################
 # Visual Tcl v1.07 Project
 #
+# Copyright 1999 Jean-Louis Thirot
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 
 #################################
 # GLOBAL VARIABLES
diff --git a/tools/wineconf.libs/message.tcl b/tools/wineconf.libs/message.tcl
index 4db66f0aa1a..cdd5bf798f8 100644
--- a/tools/wineconf.libs/message.tcl
+++ b/tools/wineconf.libs/message.tcl
@@ -2,6 +2,22 @@
 #############################################################################
 # Visual Tcl v1.07 Project
 #
+# Copyright 1999 Jean-Louis Thirot
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 
 #################################
 # GLOBAL VARIABLES
diff --git a/tools/wineconf.libs/message2.tcl b/tools/wineconf.libs/message2.tcl
index f67154fa710..443205fe1d1 100644
--- a/tools/wineconf.libs/message2.tcl
+++ b/tools/wineconf.libs/message2.tcl
@@ -2,6 +2,22 @@
 #############################################################################
 # Visual Tcl v1.07 Project
 #
+# Copyright 1999 Jean-Louis Thirot
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 
 #################################
 # GLOBAL VARIABLES
diff --git a/tools/wineconf.libs/saveRC.tcl b/tools/wineconf.libs/saveRC.tcl
index 4f4d71296a3..5eb4b0e7ba9 100644
--- a/tools/wineconf.libs/saveRC.tcl
+++ b/tools/wineconf.libs/saveRC.tcl
@@ -1,3 +1,20 @@
+# Copyright 1999 Jean-Louis Thirot
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 proc TkW:exit {} {
 	global EXIT_title QUITSAVING QUITNOSAVE CANCEL TKW
     set base .saveRC
diff --git a/tools/wineconf.libs/wineconf.eng b/tools/wineconf.libs/wineconf.eng
index 65431e94d29..95ca21dfe6f 100644
--- a/tools/wineconf.libs/wineconf.eng
+++ b/tools/wineconf.libs/wineconf.eng
@@ -1,3 +1,20 @@
+# Copyright 1999 Jean-Louis Thirot
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 set WC_banner "Configuring wine - Please, fill in all sections"
 
 set WC_drivesSect "Drive section: Add the drives wine will need"
diff --git a/tools/wineconf.libs/wineconf.tcl b/tools/wineconf.libs/wineconf.tcl
index 2d8c3221da7..080b3fde6d5 100644
--- a/tools/wineconf.libs/wineconf.tcl
+++ b/tools/wineconf.libs/wineconf.tcl
@@ -1,3 +1,20 @@
+# Copyright 1999 Jean-Louis Thirot
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 proc TkW:wineconf {DefaultConfFile} {
 	global WC_banner WC_driveSect WC_path WC_type WC_label  WC_fstype 
 	global EDIT SAVE REMOVE ADD WC_wineSect WC_windows  WC_system WC_temp
diff --git a/tools/wineconf.libs/wineconf1.tcl b/tools/wineconf.libs/wineconf1.tcl
index 19342f0d1c9..ef24621058b 100644
--- a/tools/wineconf.libs/wineconf1.tcl
+++ b/tools/wineconf.libs/wineconf1.tcl
@@ -1,3 +1,20 @@
+# Copyright 1999 Jean-Louis Thirot
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 proc TkW:debug {msg} {
 }
 proc TkW:fixme {msg} {
diff --git a/tools/wineconf.tcl b/tools/wineconf.tcl
index 84cb60284da..b5c80e88972 100755
--- a/tools/wineconf.tcl
+++ b/tools/wineconf.tcl
@@ -1,4 +1,21 @@
 #!/bin/sh
+#
+# Copyright 1999 Jean-Louis Thirot
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 # the next line restarts using wish \
 exec wish $0 ${1+"$@"} 
 proc load_libs {} {
diff --git a/tools/winedump/cvinclude.h b/tools/winedump/cvinclude.h
index 2fd5112a707..2c9deda7171 100644
--- a/tools/winedump/cvinclude.h
+++ b/tools/winedump/cvinclude.h
@@ -2,6 +2,22 @@
  * CodeView 4 Debug format - declarations
  *
  * (based on cvinfo.h and cvexefmt.h from the Win32 SDK)
+ *
+ * Copyright 2000 John R. Sheets for Codeweavers
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define sstModule           0x120
diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c
index 45254461819..ab7bc947441 100644
--- a/tools/winedump/debug.c
+++ b/tools/winedump/debug.c
@@ -4,6 +4,20 @@
  * 	and dumps the info to STDOUT in a human-readable format
  *
  * 	Copyright 2000 John R. Sheets
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
diff --git a/tools/winedump/function_grep.pl b/tools/winedump/function_grep.pl
index 894c4e30972..74cdecc8e9c 100755
--- a/tools/winedump/function_grep.pl
+++ b/tools/winedump/function_grep.pl
@@ -1,6 +1,21 @@
 #! /usr/bin/perl
-
+#
 # Copyright 2000 Patrik Stridvall
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 
 use strict;
 
diff --git a/tools/winedump/main.c b/tools/winedump/main.c
index 55199a2b82a..b470698a7fa 100644
--- a/tools/winedump/main.c
+++ b/tools/winedump/main.c
@@ -2,6 +2,20 @@
  *  Option processing and main()
  *
  *  Copyright 2000 Jon Griffiths
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "winedump.h"
 
diff --git a/tools/winedump/misc.c b/tools/winedump/misc.c
index 4598b15c0cd..aaac6e370b4 100644
--- a/tools/winedump/misc.c
+++ b/tools/winedump/misc.c
@@ -2,6 +2,20 @@
  *  Misc functions
  *
  *  Copyright 2000 Jon Griffiths
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "winedump.h"
 
diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c
index 109f9a48d36..9264db4b8d3 100644
--- a/tools/winedump/msmangle.c
+++ b/tools/winedump/msmangle.c
@@ -2,6 +2,20 @@
  *  Demangle VC++ symbols into C function prototypes
  *
  *  Copyright 2000 Jon Griffiths
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "winedump.h"
 
diff --git a/tools/winedump/output.c b/tools/winedump/output.c
index 5a386e0fd96..2367d3c7c8c 100644
--- a/tools/winedump/output.c
+++ b/tools/winedump/output.c
@@ -2,6 +2,20 @@
  *  Code generation functions
  *
  *  Copyright 2000 Jon Griffiths
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "winedump.h"
 
diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c
index bf74d625721..977cbe7ed56 100644
--- a/tools/winedump/pe.c
+++ b/tools/winedump/pe.c
@@ -2,6 +2,20 @@
  *	PE dumping utility
  *
  * 	Copyright 2001 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
diff --git a/tools/winedump/pe.h b/tools/winedump/pe.h
index 6b1affc5ddb..a01f61c690c 100644
--- a/tools/winedump/pe.h
+++ b/tools/winedump/pe.h
@@ -1,3 +1,23 @@
+/*
+ *	PE dumping utility
+ *
+ * 	Copyright 2001 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 extern void		dump_codeview(unsigned long ptr, unsigned long len);
 extern void*		PRD(unsigned long prd, unsigned long len);
 extern unsigned long	Offset(void* ptr);
diff --git a/tools/winedump/search.c b/tools/winedump/search.c
index 975ee4cc0be..c817e7db3f6 100644
--- a/tools/winedump/search.c
+++ b/tools/winedump/search.c
@@ -2,6 +2,20 @@
  *  Prototype search and parsing functions
  *
  *  Copyright 2000 Jon Griffiths
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "winedump.h"
 
diff --git a/tools/winedump/symbol.c b/tools/winedump/symbol.c
index 383cb559c9c..6aab65214b4 100644
--- a/tools/winedump/symbol.c
+++ b/tools/winedump/symbol.c
@@ -2,6 +2,20 @@
  *  Symbol functions
  *
  *  Copyright 2000 Jon Griffiths
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "winedump.h"
 
diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h
index 4882b0e9159..58371feb352 100644
--- a/tools/winedump/winedump.h
+++ b/tools/winedump/winedump.h
@@ -3,6 +3,20 @@
  *
  *  Copyright 2000 Jon Griffiths
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  *  References:
  *  DLL symbol extraction based on file format from alib (anthonyw.cjb.net).
  *
diff --git a/tools/wineinstall b/tools/wineinstall
index a27abea396b..aa1c13e3f71 100755
--- a/tools/wineinstall
+++ b/tools/wineinstall
@@ -1,7 +1,24 @@
 #!/bin/bash
 # WINE Installation script
 # Can do almost everything from compiling to configuring...
-
+#
+# Copyright 1999 Ove Kåven
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# History:
 # Mar 31 1999 - Ove Kåven
 #  First version
 # Dec 9 1999 - Ove Kåven
diff --git a/tools/winelauncher.in b/tools/winelauncher.in
index 70830809bbf..162fc109878 100755
--- a/tools/winelauncher.in
+++ b/tools/winelauncher.in
@@ -14,7 +14,20 @@
 #   documented in the Wine man page.
 #
 #   Copyright (c) 2000 by Jeremy White for CodeWeavers
-#       
+#
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #------------------------------------------------------------------------------
 
 #------------------------------------------------------------------------------
diff --git a/tools/winemaker b/tools/winemaker
index 9112f022a4d..f83ca777434 100755
--- a/tools/winemaker
+++ b/tools/winemaker
@@ -3,6 +3,21 @@
 # Copyright 2000 Francois Gouget for CodeWeavers
 # fgouget@codeweavers.com
 #
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 my $version="0.5.8";
 
 use Cwd;
diff --git a/tools/wineshelllink b/tools/wineshelllink
index 98f3fdc9cca..5f4c2de5f07 100755
--- a/tools/wineshelllink
+++ b/tools/wineshelllink
@@ -5,6 +5,21 @@
 #
 # Copyright 2000 Alexandre Julliard
 #
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 mode=""
 args=""
 menu=""
diff --git a/tools/wmc/lang.c b/tools/wmc/lang.c
index 04c754a7362..8d1a0cbf78d 100644
--- a/tools/wmc/lang.c
+++ b/tools/wmc/lang.c
@@ -3,6 +3,19 @@
  *
  * Copyright 2000 Bertho A. Stultiens (BS)
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/wmc/lang.h b/tools/wmc/lang.h
index 678a35e92fa..d2432c911e7 100644
--- a/tools/wmc/lang.h
+++ b/tools/wmc/lang.h
@@ -3,6 +3,19 @@
  *
  * Copyright 2000 Bertho A. Stultiens (BS)
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WMC_LANG_H
diff --git a/tools/wmc/mcl.c b/tools/wmc/mcl.c
index 5d640114c26..8e584e9b5e6 100644
--- a/tools/wmc/mcl.c
+++ b/tools/wmc/mcl.c
@@ -3,6 +3,19 @@
  *
  * Copyright 2000 Bertho A. Stultiens (BS)
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/tools/wmc/mcy.y b/tools/wmc/mcy.y
index f504bf8d08b..d4c268010d4 100644
--- a/tools/wmc/mcy.y
+++ b/tools/wmc/mcy.y
@@ -3,6 +3,22 @@
  *
  * Copyright 2000 Bertho A. Stultiens (BS)
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * NOTES:
+ *
  * The basic grammar of the file is yet another example of, humpf,
  * design. There is is mix of context-insensitive and -sentitive
  * stuff, which makes it rather complicated.
diff --git a/tools/wmc/utils.c b/tools/wmc/utils.c
index 5d0dee53e23..35010737a01 100644
--- a/tools/wmc/utils.c
+++ b/tools/wmc/utils.c
@@ -3,6 +3,19 @@
  *
  * Copyright 1998,2000 Bertho A. Stultiens
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/tools/wmc/utils.h b/tools/wmc/utils.h
index 156e5c420aa..9848b55055c 100644
--- a/tools/wmc/utils.h
+++ b/tools/wmc/utils.h
@@ -3,6 +3,19 @@
  *
  * Copyright 1998,2000 Bertho A. Stultiens (BS)
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WMC_UTILS_H
diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c
index 28419d158a8..119860c3c32 100644
--- a/tools/wmc/wmc.c
+++ b/tools/wmc/wmc.c
@@ -3,6 +3,19 @@
  *
  * Copyright 2000 Bertho A. Stultiens (BS)
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/tools/wmc/wmc.h b/tools/wmc/wmc.h
index 5446bee8b57..154be606121 100644
--- a/tools/wmc/wmc.h
+++ b/tools/wmc/wmc.h
@@ -3,6 +3,19 @@
  *
  * Copyright 2000 Bertho A. Stultiens (BS)
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WMC_WMC_H
diff --git a/tools/wmc/wmctypes.h b/tools/wmc/wmctypes.h
index 8a2839ff00f..f709d7c67f5 100644
--- a/tools/wmc/wmctypes.h
+++ b/tools/wmc/wmctypes.h
@@ -3,6 +3,19 @@
  *
  * Copyright 2000 Bertho A. Stultiens (BS)
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WMC_WMCTYPES_H
diff --git a/tools/wmc/write.c b/tools/wmc/write.c
index 733f7bc2c74..b04d5eee249 100644
--- a/tools/wmc/write.c
+++ b/tools/wmc/write.c
@@ -3,6 +3,19 @@
  *
  * Copyright 2000 Bertho A. Stultiens (BS)
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
diff --git a/tools/wmc/write.h b/tools/wmc/write.h
index 18127174ff1..8169348b0ab 100644
--- a/tools/wmc/write.h
+++ b/tools/wmc/write.h
@@ -3,6 +3,19 @@
  *
  * Copyright 2000 Bertho A. Stultiens (BS)
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #ifndef __WMC_WRITE_H
 #define __WMC_WRITE_H
diff --git a/tools/wrc/dumpres.c b/tools/wrc/dumpres.c
index 38f9f105cef..3ff81373441 100644
--- a/tools/wrc/dumpres.c
+++ b/tools/wrc/dumpres.c
@@ -1,8 +1,19 @@
 /*
- * Copyrignt 1998 Bertho A. Stultiens (BS)
+ * Copyright 1998 Bertho A. Stultiens (BS)
  *
- * 16-Apr-1998 BS	- Yeah, dump it to stdout.
+ * 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.
  *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/tools/wrc/dumpres.h b/tools/wrc/dumpres.h
index 3c17cc007eb..63f5a0a470e 100644
--- a/tools/wrc/dumpres.h
+++ b/tools/wrc/dumpres.h
@@ -3,6 +3,19 @@
  *
  * Copyright 1998 Bertho A. Stultiens (BS)
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WRC_DUMPRES_H
diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c
index 6ecf4aec5fe..9e4eaa555d5 100644
--- a/tools/wrc/genres.c
+++ b/tools/wrc/genres.c
@@ -3,6 +3,21 @@
  *
  * Copyright 1998 Bertho A. Stultiens
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * History:
  * 05-May-2000 BS	- Added code to support endian conversions. The
  * 			  extra functions also aid unaligned access, but
  * 			  this is not yet implemented.
diff --git a/tools/wrc/genres.h b/tools/wrc/genres.h
index 0f4d9d2c4d9..7dbca3ff35c 100644
--- a/tools/wrc/genres.h
+++ b/tools/wrc/genres.h
@@ -3,6 +3,19 @@
  *
  * Copyright 1998 Bertho A. Stultiens (BS)
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WRC_GENRES_H
diff --git a/tools/wrc/newstruc.c b/tools/wrc/newstruc.c
index 913cecea0f6..4973538e8e0 100644
--- a/tools/wrc/newstruc.c
+++ b/tools/wrc/newstruc.c
@@ -4,6 +4,19 @@
  *
  * Copyright 1998 Bertho A. Stultiens
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/tools/wrc/newstruc.h b/tools/wrc/newstruc.h
index a305d6d29f0..6dc4bb14f37 100644
--- a/tools/wrc/newstruc.h
+++ b/tools/wrc/newstruc.h
@@ -3,6 +3,19 @@
  *
  * Copyright 1998 Bertho A. Stultiens
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WRC_NEWSTRUC_H
diff --git a/tools/wrc/parser.h b/tools/wrc/parser.h
index 7586c66af02..63116383bcd 100644
--- a/tools/wrc/parser.h
+++ b/tools/wrc/parser.h
@@ -2,6 +2,20 @@
  * Copyright 1998 Bertho A. Stultiens (BS)
  *
  * Shared things between parser.l and parser.y and some others
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WRC_PARSER_H
diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l
index 75fb7541c4f..c0d5c5dbfb4 100644
--- a/tools/wrc/parser.l
+++ b/tools/wrc/parser.l
@@ -2,6 +2,21 @@
  *
  * Copyright 1998-2000	Bertho A. Stultiens (BS)
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * History:
  * 21-May-2000 BS	- Fixed the ident requirement of resource names
  *			  which can be keywords.
  * 30-Apr-2000 BS	- Reintegration into the wine-tree
diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y
index 9f4863f2234..f271ab30287 100644
--- a/tools/wrc/parser.y
+++ b/tools/wrc/parser.y
@@ -4,6 +4,21 @@
  * Copyright 1998-2000	Bertho A. Stultiens (BS)
  *           1999	Juergen Schmied (JS)
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * History:
  * 24-Jul-2000 BS	- Made a fix for broken Berkeley yacc on
  *			  non-terminals (see cjunk rule).
  * 21-May-2000 BS	- Partial implementation of font resources.
diff --git a/tools/wrc/ppl.l b/tools/wrc/ppl.l
index 67411dd5bb2..4af3a6d9cc6 100644
--- a/tools/wrc/ppl.l
+++ b/tools/wrc/ppl.l
@@ -3,6 +3,21 @@
  *
  * Copyright 1999-2000	Bertho A. Stultiens (BS)
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * History:
  * 24-Apr-2000 BS	- Started from scratch to restructure everything
  *			  and reintegrate the source into the wine-tree.
  * 04-Jan-2000 BS	- Added comments about the lexicographical
diff --git a/tools/wrc/ppy.y b/tools/wrc/ppy.y
index f6c8c380a02..fc654895628 100644
--- a/tools/wrc/ppy.y
+++ b/tools/wrc/ppy.y
@@ -3,6 +3,22 @@
  *
  * Copyright 1999-2000	Bertho A. Stultiens (BS)
  *
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * History:
  * 24-Apr-2000 BS	Restructured the lot to fit the new scanner
  *			and reintegrate into the wine-tree.
  * 01-Jan-2000 BS	FIXME: win16 preprocessor calculates with
diff --git a/tools/wrc/preproc.c b/tools/wrc/preproc.c
index de81e068a36..8fda4ce8b19 100644
--- a/tools/wrc/preproc.c
+++ b/tools/wrc/preproc.c
@@ -1,6 +1,19 @@
 /*
  * Copyright 1998 Bertho A. Stultiens (BS)
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/tools/wrc/preproc.h b/tools/wrc/preproc.h
index 91dad1da2d4..0573e394cf4 100644
--- a/tools/wrc/preproc.h
+++ b/tools/wrc/preproc.h
@@ -1,6 +1,19 @@
 /*
  * Copyright 1998 Bertho A. Stultiens (BS)
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WRC_PREPROC_H
diff --git a/tools/wrc/readres.c b/tools/wrc/readres.c
index 02b5fad0269..4e29761dcf2 100644
--- a/tools/wrc/readres.c
+++ b/tools/wrc/readres.c
@@ -3,6 +3,19 @@
  *
  * Copyright 1998 Bertho A. Stultiens
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/tools/wrc/readres.h b/tools/wrc/readres.h
index e87da515b10..6b25dac9f0c 100644
--- a/tools/wrc/readres.h
+++ b/tools/wrc/readres.h
@@ -3,6 +3,19 @@
  *
  * Copyright 1998 Bertho A. Stultiens (BS)
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WRC_READRES_H
diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c
index 465a7df8b67..372b9ee1de5 100644
--- a/tools/wrc/utils.c
+++ b/tools/wrc/utils.c
@@ -3,6 +3,19 @@
  *
  * Copyright 1998 Bertho A. Stultiens
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/tools/wrc/utils.h b/tools/wrc/utils.h
index 9d9cfce7f86..86de9463a39 100644
--- a/tools/wrc/utils.h
+++ b/tools/wrc/utils.h
@@ -3,6 +3,19 @@
  *
  * Copyright 1998 Bertho A. Stultiens (BS)
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WRC_UTILS_H
diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c
index 968a46d84eb..89855b7203d 100644
--- a/tools/wrc/wrc.c
+++ b/tools/wrc/wrc.c
@@ -1,8 +1,22 @@
 /*
- *
  * Copyright  Martin von Loewis, 1994
  * Copyrignt 1998 Bertho A. Stultiens (BS)
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * History:
  * 30-Apr-2000 BS	- Integrated a new preprocessor (-E and -N)
  * 20-Jun-1998 BS	- Added -L option to prevent case conversion
  *			  of embedded filenames.
diff --git a/tools/wrc/wrc.h b/tools/wrc/wrc.h
index 0468b9c46cd..15aa70d38db 100644
--- a/tools/wrc/wrc.h
+++ b/tools/wrc/wrc.h
@@ -3,6 +3,19 @@
  *
  * Copyright 1998 Bertho A. Stultiens (BS)
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WRC_WRC_H
diff --git a/tools/wrc/wrctypes.h b/tools/wrc/wrctypes.h
index 5f8162dd7c3..fd54507e3c4 100644
--- a/tools/wrc/wrctypes.h
+++ b/tools/wrc/wrctypes.h
@@ -3,6 +3,19 @@
  *
  * Copyright 1998 Bertho A. Stultiens (BS)
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WRC_WRCTYPES_H
diff --git a/tools/wrc/writeres.c b/tools/wrc/writeres.c
index 8db68de2d91..ae91caa48b8 100644
--- a/tools/wrc/writeres.c
+++ b/tools/wrc/writeres.c
@@ -3,6 +3,19 @@
  *
  * Copyright 1998 Bertho A. Stultiens
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
diff --git a/tools/wrc/writeres.h b/tools/wrc/writeres.h
index 08da1b29bf5..159aafa815d 100644
--- a/tools/wrc/writeres.h
+++ b/tools/wrc/writeres.h
@@ -3,6 +3,19 @@
  *
  * Copyright 1998 Bertho A. Stultiens (BS)
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __WRC_WRITERES_H
diff --git a/tsx11/locking.c b/tsx11/locking.c
index 3f77e0075f9..484772f1653 100644
--- a/tsx11/locking.c
+++ b/tsx11/locking.c
@@ -1,5 +1,21 @@
 /*
  * Thread-safe X11 locking stubs
+ *
+ * Copyright 2000 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 static void nop(void)
diff --git a/unicode/cpmap.pl b/unicode/cpmap.pl
index 208907b9a16..83d4df46fa3 100755
--- a/unicode/cpmap.pl
+++ b/unicode/cpmap.pl
@@ -4,6 +4,20 @@
 #
 # Copyright 2000 Alexandre Julliard
 #
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 
 # base directory for ftp.unicode.org files
 $BASEDIR = "ftp.unicode.org/Public/";
diff --git a/unicode/cptable.c b/unicode/cptable.c
index 0fd2c3ffe50..4a2d7e43097 100644
--- a/unicode/cptable.c
+++ b/unicode/cptable.c
@@ -2,6 +2,20 @@
  * Codepage tables
  *
  * Copyright 2000 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
diff --git a/unicode/defaults b/unicode/defaults
index 5525a7b7428..8713cd8426f 100644
--- a/unicode/defaults
+++ b/unicode/defaults
@@ -2,6 +2,22 @@
 #
 # Copyright 2000 Alexandre Julliard
 #
+# 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.
+#
+# This library is distributed in the hope that it will be useful,
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# NOTES:
+#
 # This file contains default mappings for Unicode chars that aren't
 # defined directly in the code page file. It is used by the cpmap.pl
 # tool to build codepage tables.
diff --git a/unicode/mbtowc.c b/unicode/mbtowc.c
index 9f6407b2f5f..71581a8ebb8 100644
--- a/unicode/mbtowc.c
+++ b/unicode/mbtowc.c
@@ -2,6 +2,20 @@
  * MultiByteToWideChar implementation
  *
  * Copyright 2000 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
diff --git a/unicode/string.c b/unicode/string.c
index dec7ec6a612..47bce77537a 100644
--- a/unicode/string.c
+++ b/unicode/string.c
@@ -2,6 +2,20 @@
  * Unicode string manipulation functions
  *
  * Copyright 2000 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "wine/unicode.h"
diff --git a/unicode/utf8.c b/unicode/utf8.c
index 66992e67386..0e669678830 100644
--- a/unicode/utf8.c
+++ b/unicode/utf8.c
@@ -2,6 +2,20 @@
  * UTF-8 support routines
  *
  * Copyright 2000 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
diff --git a/unicode/wctomb.c b/unicode/wctomb.c
index a964e23c384..e3c4a7c7354 100644
--- a/unicode/wctomb.c
+++ b/unicode/wctomb.c
@@ -2,6 +2,20 @@
  * WideCharToMultiByte implementation
  *
  * Copyright 2000 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
diff --git a/win32/console.c b/win32/console.c
index f3e03f52e5e..0de5fac9351 100644
--- a/win32/console.c
+++ b/win32/console.c
@@ -6,6 +6,20 @@
  * Copyright 1998 John Richardson
  * Copyright 1998 Marcus Meissner
  * Copyright 2001 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* Reference applications:
@@ -27,11 +41,11 @@
 #include "heap.h"
 #include "wine/server.h"
 #include "wine/exception.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "options.h"
 #include "msvcrt/excpt.h"
 
-DEFAULT_DEBUG_CHANNEL(console);
+WINE_DEFAULT_DEBUG_CHANNEL(console);
 
 /* editline.c */
 extern WCHAR* CONSOLE_Readline(HANDLE, int);
diff --git a/win32/device.c b/win32/device.c
index ce88d8f6176..b03698f3690 100644
--- a/win32/device.c
+++ b/win32/device.c
@@ -5,6 +5,19 @@
  * Copyright 1998 Ulrich Weigand
  * Copyright 1998 Patrik Stridvall
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -28,9 +41,9 @@
 #include "miscemu.h"
 #include "stackframe.h"
 #include "wine/server.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(win32);
+WINE_DEFAULT_DEBUG_CHANNEL(win32);
 
 
 static BOOL DeviceIo_VTDAPI(DWORD dwIoControlCode, 
diff --git a/win32/editline.c b/win32/editline.c
index 4c668ce9739..ce67ffa5b01 100644
--- a/win32/editline.c
+++ b/win32/editline.c
@@ -2,6 +2,20 @@
  * line edition function for Win32 console
  *
  * Copyright 2001 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -12,9 +26,9 @@
 #include "wincon.h"
 #include "wine/unicode.h"
 #include "winnls.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(console);
+WINE_DEFAULT_DEBUG_CHANNEL(console);
 
 /* console.c */
 extern int CONSOLE_GetHistory(int idx, WCHAR* buf, int buf_len);
diff --git a/win32/except.c b/win32/except.c
index 02d3b002147..2ca3a89e08d 100644
--- a/win32/except.c
+++ b/win32/except.c
@@ -4,6 +4,20 @@
  * Copyright (c) 1996 Onno Hovers, (onno@stack.urc.tue.nl)
  * Copyright (c) 1999 Alexandre Julliard
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * Notes:
  *  What really happens behind the scenes of those new
  *  __try{...}__except(..){....}  and
@@ -32,10 +46,10 @@
 #include "thread.h"
 #include "stackframe.h"
 #include "wine/server.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "msvcrt/excpt.h"
 
-DEFAULT_DEBUG_CHANNEL(seh);
+WINE_DEFAULT_DEBUG_CHANNEL(seh);
 
 static PTOP_LEVEL_EXCEPTION_FILTER top_filter;
 
diff --git a/win32/file.c b/win32/file.c
index cdfcfecdbbb..b37f032f1d9 100644
--- a/win32/file.c
+++ b/win32/file.c
@@ -2,6 +2,20 @@
  * Win32 kernel functions
  *
  * Copyright 1995 Martin von Loewis, Sven Verdoolaege, and Cameron Heide
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -28,9 +42,9 @@
 #include "wine/winbase16.h"
 #include "file.h"
 
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(file);
+WINE_DEFAULT_DEBUG_CHANNEL(file);
 
 /**************************************************************************
  *              SetFileAttributes	(KERNEL.421)
diff --git a/win32/init.c b/win32/init.c
index df23b7fd965..a9490b59a6b 100644
--- a/win32/init.c
+++ b/win32/init.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1995 Martin von Loewis and Cameron Heide
  * 1999 Peter Ganten
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -15,9 +29,9 @@
 #include "winerror.h"
 #include "wine/exception.h"
 #include "msvcrt/excpt.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(win32);
+WINE_DEFAULT_DEBUG_CHANNEL(win32);
   
 /* filter for page-fault exceptions */
 static WINE_EXCEPTION_FILTER(page_fault)
diff --git a/win32/kernel32.c b/win32/kernel32.c
index aa8bffead2e..6c3d695e0af 100644
--- a/win32/kernel32.c
+++ b/win32/kernel32.c
@@ -4,6 +4,19 @@
  * Copyright 1997-1998 Marcus Meissner
  * Copyright 1998      Ulrich Weigand
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -14,9 +27,9 @@
 #include "winbase.h"
 #include "wine/winbase16.h"
 #include "winerror.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(win32);
+WINE_DEFAULT_DEBUG_CHANNEL(win32);
 
 /***********************************************************************
  *           UpdateResourceA                 (KERNEL32.@)
diff --git a/win32/newfns.c b/win32/newfns.c
index 8b92062d302..53cc0df62d6 100644
--- a/win32/newfns.c
+++ b/win32/newfns.c
@@ -2,6 +2,20 @@
  * Win32 miscellaneous functions
  *
  * Copyright 1995 Thomas Sandford (tdgsandf@prds-grn.demon.co.uk)
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* Misc. new functions - they should be moved into appropriate files
@@ -15,10 +29,10 @@ at a later date. */
 #include "winbase.h"
 #include "winnls.h"
 #include "winerror.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(win32);
-DECLARE_DEBUG_CHANNEL(debug);
+WINE_DEFAULT_DEBUG_CHANNEL(win32);
+WINE_DECLARE_DEBUG_CHANNEL(debug);
 
 
 static BOOL	QUERYPERF_Initialized		= 0;
diff --git a/win32/time.c b/win32/time.c
index a0ca47abf49..ed2840cef20 100644
--- a/win32/time.c
+++ b/win32/time.c
@@ -2,6 +2,20 @@
  * Win32 kernel functions
  *
  * Copyright 1995 Martin von Loewis and Cameron Heide
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -10,9 +24,9 @@
 #include <unistd.h>
 #include "file.h"
 #include "winerror.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(win32);
+WINE_DEFAULT_DEBUG_CHANNEL(win32);
 
 /***********************************************************************
  *              GetLocalTime            (KERNEL32.@)
diff --git a/windows/caret.c b/windows/caret.c
index 932a3d22d9f..52ceaf9f952 100644
--- a/windows/caret.c
+++ b/windows/caret.c
@@ -4,6 +4,20 @@
  * Copyright 1993 David Metcalfe
  * Copyright 1996 Frans van Dorsselaer
  * Copyright 2001 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
@@ -13,9 +27,9 @@
 #include "wine/wingdi16.h"
 #include "wine/winuser16.h"
 #include "win.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(caret);
+WINE_DEFAULT_DEBUG_CHANNEL(caret);
 
 typedef struct
 {
diff --git a/windows/class.c b/windows/class.c
index 8e10d0cdb1f..613b65577e7 100644
--- a/windows/class.c
+++ b/windows/class.c
@@ -4,6 +4,20 @@
  * Copyright 1993, 1996 Alexandre Julliard
  *           1998 Juergen Schmied (jsch)
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * FIXME: In win32 all classes are local. They are registered at 
  *	  program start. Processes CANNOT share classes. (Source: some
  *	  win31->NT migration book)
@@ -29,9 +43,9 @@
 #include "controls.h"
 #include "dce.h"
 #include "winproc.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(class);
+WINE_DEFAULT_DEBUG_CHANNEL(class);
 
 typedef struct tagCLASS
 {
diff --git a/windows/clipboard.c b/windows/clipboard.c
index fc969cd3b11..3a8a87966e7 100644
--- a/windows/clipboard.c
+++ b/windows/clipboard.c
@@ -5,6 +5,20 @@
  *	     1996 Alex Korobka
  *	     1999 Noel Borthwick
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * NOTES:
  *    This file contains the implementation for the WIN32 Clipboard API
  * and Wine's internal clipboard cache.
@@ -30,9 +44,9 @@
 #include "user.h"
 #include "win.h"
 #include "clipboard.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(clipboard);
+WINE_DEFAULT_DEBUG_CHANNEL(clipboard);
 
 #define  CF_REGFORMATBASE 	0xC000
 
diff --git a/windows/cursoricon.c b/windows/cursoricon.c
index d31cdb311b9..63315722c6b 100644
--- a/windows/cursoricon.c
+++ b/windows/cursoricon.c
@@ -5,6 +5,20 @@
  *           1996 Martin Von Loewis
  *           1997 Alex Korobka
  *           1998 Turchanov Sergey
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /*
@@ -41,16 +55,16 @@
 #include "bitmap.h"
 #include "cursoricon.h"
 #include "module.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "user.h"
 #include "input.h"
 #include "message.h"
 #include "winerror.h"
 #include "msvcrt/excpt.h"
 
-DECLARE_DEBUG_CHANNEL(cursor);
-DECLARE_DEBUG_CHANNEL(icon);
-DECLARE_DEBUG_CHANNEL(resource);
+WINE_DECLARE_DEBUG_CHANNEL(cursor);
+WINE_DECLARE_DEBUG_CHANNEL(icon);
+WINE_DECLARE_DEBUG_CHANNEL(resource);
 
 static HCURSOR hActiveCursor = 0;  /* Active cursor */
 static INT CURSOR_ShowCount = 0;   /* Cursor display count */
diff --git a/windows/dce.c b/windows/dce.c
index 4f27e65dc44..2cc7383f723 100644
--- a/windows/dce.c
+++ b/windows/dce.c
@@ -4,6 +4,20 @@
  * Copyright 1993 Alexandre Julliard
  *	     1996,1997 Alex Korobka
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  *
  * Note: Visible regions of CS_OWNDC/CS_CLASSDC window DCs 
  * have to be updated dynamically. 
@@ -23,13 +37,13 @@
 #include "gdi.h"
 #include "region.h"
 #include "user.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "windef.h"
 #include "wingdi.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
 
-DEFAULT_DEBUG_CHANNEL(dc);
+WINE_DEFAULT_DEBUG_CHANNEL(dc);
 
 static DCE *firstDCE;
 static HDC defaultDCstate;
diff --git a/windows/defdlg.c b/windows/defdlg.c
index 6c314d76116..de1184880f7 100644
--- a/windows/defdlg.c
+++ b/windows/defdlg.c
@@ -3,6 +3,19 @@
  *
  * Copyright 1993, 1996 Alexandre Julliard
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
@@ -12,9 +25,9 @@
 #include "controls.h"
 #include "win.h"
 #include "winproc.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(dialog);
+WINE_DEFAULT_DEBUG_CHANNEL(dialog);
 
 
 /***********************************************************************
diff --git a/windows/defwnd.c b/windows/defwnd.c
index a62f2890f0a..232a16f76d2 100644
--- a/windows/defwnd.c
+++ b/windows/defwnd.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1993, 1996 Alexandre Julliard
  *	     1995 Alex Korobka
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -12,7 +26,7 @@
 #include "nonclient.h"
 #include "winpos.h"
 #include "dce.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "spy.h"
 #include "windef.h"
 #include "wingdi.h"
@@ -22,7 +36,7 @@
 #include "wine/server.h"
 #include "imm.h"
 
-DEFAULT_DEBUG_CHANNEL(win);
+WINE_DEFAULT_DEBUG_CHANNEL(win);
 
   /* bits in the dwKeyData */
 #define KEYDATA_ALT 		0x2000
diff --git a/windows/dialog.c b/windows/dialog.c
index c439bc57e12..ff9d5cb78b3 100644
--- a/windows/dialog.c
+++ b/windows/dialog.c
@@ -2,6 +2,20 @@
  * Dialog functions
  *
  * Copyright 1993, 1994, 1996 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -27,9 +41,9 @@
 #include "heap.h"
 #include "win.h"
 #include "user.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(dialog);
+WINE_DEFAULT_DEBUG_CHANNEL(dialog);
 
 
   /* Dialog control information */
diff --git a/windows/driver.c b/windows/driver.c
index 045500056ed..02d250cfb7c 100644
--- a/windows/driver.c
+++ b/windows/driver.c
@@ -6,6 +6,20 @@
  * Copyright 1994 Martin Ayotte
  * Copyright 1998 Marcus Meissner
  * Copyright 1999,2000 Eric Pouech
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -15,9 +29,9 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "mmddk.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(driver);
+WINE_DEFAULT_DEBUG_CHANNEL(driver);
 
 typedef struct tagWINE_DRIVER
 {
diff --git a/windows/focus.c b/windows/focus.c
index 09cd85ee360..c7842b1ef39 100644
--- a/windows/focus.c
+++ b/windows/focus.c
@@ -5,6 +5,19 @@
  *           1994 Alexandre Julliard
  * 	     1995 Alex Korobka
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
@@ -16,9 +29,9 @@
 #include "message.h"
 #include "queue.h"
 #include "user.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(win);
+WINE_DEFAULT_DEBUG_CHANNEL(win);
 
 
 /*****************************************************************
diff --git a/windows/hook.c b/windows/hook.c
index f9e8cabeae4..0f8bb6a9d75 100644
--- a/windows/hook.c
+++ b/windows/hook.c
@@ -5,6 +5,20 @@
  *                 1996 Andrew Lewycky
  *
  * Based on investigations by Alex Korobka
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /*
@@ -27,9 +41,9 @@
 #include "heap.h"
 #include "struct32.h"
 #include "winproc.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(hook);
+WINE_DEFAULT_DEBUG_CHANNEL(hook);
 
 #include "pshpack1.h"
 
diff --git a/windows/input.c b/windows/input.c
index 3d6939227d7..7e876abeebc 100644
--- a/windows/input.c
+++ b/windows/input.c
@@ -7,6 +7,19 @@
  * Copyright 1998 Morten Welinder
  * Copyright 1998 Ulrich Weigand
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -28,13 +41,13 @@
 #include "input.h"
 #include "message.h"
 #include "queue.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winerror.h"
 
-DECLARE_DEBUG_CHANNEL(key);
-DECLARE_DEBUG_CHANNEL(keyboard);
-DECLARE_DEBUG_CHANNEL(win);
-DEFAULT_DEBUG_CHANNEL(event);
+WINE_DECLARE_DEBUG_CHANNEL(key);
+WINE_DECLARE_DEBUG_CHANNEL(keyboard);
+WINE_DECLARE_DEBUG_CHANNEL(win);
+WINE_DEFAULT_DEBUG_CHANNEL(event);
 
 static BOOL InputEnabled = TRUE;
 static BOOL SwappedButtons;
diff --git a/windows/keyboard.c b/windows/keyboard.c
index 9bab27d42a8..fa1e5ffe735 100644
--- a/windows/keyboard.c
+++ b/windows/keyboard.c
@@ -7,6 +7,19 @@
  * Copyright 1998 Morten Welinder
  * Copyright 1998 Ulrich Weigand
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -20,10 +33,10 @@
 #include "win.h"
 #include "user.h"
 #include "message.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winerror.h"
 
-DEFAULT_DEBUG_CHANNEL(keyboard);
+WINE_DEFAULT_DEBUG_CHANNEL(keyboard);
 
 #include "pshpack1.h"
 typedef struct _KBINFO
diff --git a/windows/mdi.c b/windows/mdi.c
index cb11a5fc1bc..7d961743ce0 100644
--- a/windows/mdi.c
+++ b/windows/mdi.c
@@ -6,6 +6,20 @@
  * This file contains routines to support MDI (Multiple Document
  * Interface) features .
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * Notes: Fairly complete implementation.
  *        Also, Excel and WinWord do _not_ use MDI so if you're trying
  *	  to fix them look elsewhere. 
@@ -81,10 +95,10 @@
 #include "controls.h"
 #include "user.h"
 #include "struct32.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "dlgs.h"
 
-DEFAULT_DEBUG_CHANNEL(mdi);
+WINE_DEFAULT_DEBUG_CHANNEL(mdi);
 
 #define MDI_MAXLISTLENGTH       0x40
 #define MDI_MAXTITLELENGTH      0xa1
diff --git a/windows/message.c b/windows/message.c
index 517751c45a1..94a98e582a0 100644
--- a/windows/message.c
+++ b/windows/message.c
@@ -2,6 +2,20 @@
  * Message queues related functions
  *
  * Copyright 1993, 1994 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -29,10 +43,10 @@
 #include "thread.h"
 #include "task.h"
 #include "controls.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(msg);
-DECLARE_DEBUG_CHANNEL(key);
+WINE_DEFAULT_DEBUG_CHANNEL(msg);
+WINE_DECLARE_DEBUG_CHANNEL(key);
 
 #define WM_NCMOUSEFIRST         WM_NCMOUSEMOVE
 #define WM_NCMOUSELAST          WM_NCMBUTTONDBLCLK
diff --git a/windows/msgbox.c b/windows/msgbox.c
index df922c43bb9..788cdafac4f 100644
--- a/windows/msgbox.c
+++ b/windows/msgbox.c
@@ -2,6 +2,20 @@
  * Message boxes
  *
  * Copyright 1995 Bernd Schmidt
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -13,9 +27,9 @@
 #include "dlgs.h"
 #include "heap.h"
 #include "user.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(dialog);
+WINE_DEFAULT_DEBUG_CHANNEL(dialog);
 
 #define MSGBOX_IDICON 1088
 #define MSGBOX_IDTEXT 100
diff --git a/windows/multimon.c b/windows/multimon.c
index e770482497e..4a4092ffade 100644
--- a/windows/multimon.c
+++ b/windows/multimon.c
@@ -2,6 +2,20 @@
  * Multimonitor APIs
  *
  * Copyright 1998 Turchanov Sergey
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
diff --git a/windows/nonclient.c b/windows/nonclient.c
index b04a7477411..999b5a6500d 100644
--- a/windows/nonclient.c
+++ b/windows/nonclient.c
@@ -3,6 +3,19 @@
  *
  * Copyright 1994 Alexandre Julliard
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
@@ -17,12 +30,12 @@
 #include "winpos.h"
 #include "hook.h"
 #include "nonclient.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "shellapi.h"
 #include "bitmap.h"
 
-DEFAULT_DEBUG_CHANNEL(nonclient);
-DECLARE_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(nonclient);
+WINE_DECLARE_DEBUG_CHANNEL(shell);
 
 BOOL NC_DrawGrayButton(HDC hdc, int x, int y);
 
diff --git a/windows/painting.c b/windows/painting.c
index dcad3ac4936..9dc25b5004c 100644
--- a/windows/painting.c
+++ b/windows/painting.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1993, 1994, 1995 Alexandre Julliard
  *			 1999 Alex Korobka
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -16,10 +30,10 @@
 #include "win.h"
 #include "queue.h"
 #include "dce.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(win);
-DECLARE_DEBUG_CHANNEL(nonclient);
+WINE_DEFAULT_DEBUG_CHANNEL(win);
+WINE_DECLARE_DEBUG_CHANNEL(nonclient);
 
 /* client rect in window coordinates */
 
diff --git a/windows/queue.c b/windows/queue.c
index 00dd6aa22b4..5f0b6d48021 100644
--- a/windows/queue.c
+++ b/windows/queue.c
@@ -2,6 +2,20 @@
  * Message queues related functions
  *
  * Copyright 1993, 1994 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -17,11 +31,11 @@
 #include "user.h"
 #include "hook.h"
 #include "thread.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "wine/server.h"
 #include "spy.h"
 
-DEFAULT_DEBUG_CHANNEL(msg);
+WINE_DEFAULT_DEBUG_CHANNEL(msg);
 
 
 static PERQUEUEDATA *pQDataWin16 = NULL;  /* Global perQData for Win16 tasks */
diff --git a/windows/rect.c b/windows/rect.c
index d5bcef14d6d..73ffe0e26d9 100644
--- a/windows/rect.c
+++ b/windows/rect.c
@@ -3,6 +3,19 @@
  *
  * Copyright 1993, 1996 Alexandre Julliard
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
diff --git a/windows/scroll.c b/windows/scroll.c
index 84e2391bed0..ac215dc3af7 100644
--- a/windows/scroll.c
+++ b/windows/scroll.c
@@ -4,7 +4,19 @@
  * Copyright  David W. Metcalfe, 1993
  *	      Alex Korobka       1995,1996
  *
+ * 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.
  *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -14,9 +26,9 @@
 #include "wine/winuser16.h"
 #include "winuser.h"
 #include "user.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(scroll);
+WINE_DEFAULT_DEBUG_CHANNEL(scroll);
 
 /*************************************************************************
  *		ScrollWindow (USER32.@)
diff --git a/windows/spy.c b/windows/spy.c
index d17f6d4352d..5fab928cf56 100644
--- a/windows/spy.c
+++ b/windows/spy.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1994, Bob Amstadt
  *           1995, Alex Korobka  
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -15,11 +29,11 @@
 #include "wine/winbase16.h"
 #include "wine/unicode.h"
 #include "win.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "spy.h"
 #include "commctrl.h"
 
-DEFAULT_DEBUG_CHANNEL(message);
+WINE_DEFAULT_DEBUG_CHANNEL(message);
 
 #define SPY_MAX_MSGNUM   WM_USER
 #define SPY_INDENT_UNIT  4  /* 4 spaces */
diff --git a/windows/struct32.c b/windows/struct32.c
index 3638b5f96c7..c83c518457e 100644
--- a/windows/struct32.c
+++ b/windows/struct32.c
@@ -2,6 +2,20 @@
  * Win32 structure conversion functions
  *
  * Copyright 1996 Martin von Loewis
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "struct32.h"
diff --git a/windows/struct32.h b/windows/struct32.h
index 50c15e1ed04..33b14ed0722 100644
--- a/windows/struct32.h
+++ b/windows/struct32.h
@@ -1,4 +1,23 @@
-/* Structure definitions for Win32 -- used only internally */
+/*
+ * Structure definitions for Win32 -- used only internally
+ *
+ * Copyright 1996 Martin von Loewis
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_STRUCT32_H
 #define __WINE_STRUCT32_H
 
diff --git a/windows/syscolor.c b/windows/syscolor.c
index d15cb0647e8..5f8be9c2959 100644
--- a/windows/syscolor.c
+++ b/windows/syscolor.c
@@ -4,6 +4,19 @@
  * Copyright  David W. Metcalfe, 1993
  * Copyright  Alexandre Julliard, 1994
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
@@ -17,13 +30,13 @@
 #include "sysmetrics.h"
 #include "winbase.h"
 #include "winuser.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winreg.h"
 #include "local.h"
 #include "user.h"
 #include "gdi.h" /* sic */
 
-DEFAULT_DEBUG_CHANNEL(syscolor);
+WINE_DEFAULT_DEBUG_CHANNEL(syscolor);
 
 static const char * const DefSysColors[] =
 {
diff --git a/windows/sysmetrics.c b/windows/sysmetrics.c
index 60c2081956b..0b3b7dad53a 100644
--- a/windows/sysmetrics.c
+++ b/windows/sysmetrics.c
@@ -3,6 +3,19 @@
  *
  * Copyright 1994 Alexandre Julliard
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
diff --git a/windows/sysparams.c b/windows/sysparams.c
index e39126b50cc..df43a625193 100644
--- a/windows/sysparams.c
+++ b/windows/sysparams.c
@@ -2,6 +2,20 @@
  * System parameters functions
  *
  * Copyright 1994 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -19,10 +33,10 @@
 
 #include "controls.h"
 #include "user.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "sysmetrics.h"
 
-DEFAULT_DEBUG_CHANNEL(system);
+WINE_DEFAULT_DEBUG_CHANNEL(system);
 
 /* System parameter indexes */
 #define SPI_SETBEEP_IDX                         0
diff --git a/windows/timer.c b/windows/timer.c
index 2dc61fd7d77..f4e8a551441 100644
--- a/windows/timer.c
+++ b/windows/timer.c
@@ -2,6 +2,20 @@
  * Timer functions
  *
  * Copyright 1993 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "windef.h"
@@ -14,9 +28,9 @@
 #include "message.h"
 #include "win.h"
 #include "wine/server.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(timer);
+WINE_DEFAULT_DEBUG_CHANNEL(timer);
 
 
 typedef struct tagTIMER
diff --git a/windows/user.c b/windows/user.c
index 7385dd08bc8..1abf7d9e04a 100644
--- a/windows/user.c
+++ b/windows/user.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1993 Robert J. Amstadt
  *	     1996 Alex Korobka 
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -22,13 +36,13 @@
 #include "sysmetrics.h"
 #include "local.h"
 #include "module.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DECLARE_DEBUG_CHANNEL(hook);
-DECLARE_DEBUG_CHANNEL(local);
-DECLARE_DEBUG_CHANNEL(system);
-DECLARE_DEBUG_CHANNEL(win);
-DECLARE_DEBUG_CHANNEL(win32);
+WINE_DECLARE_DEBUG_CHANNEL(hook);
+WINE_DECLARE_DEBUG_CHANNEL(local);
+WINE_DECLARE_DEBUG_CHANNEL(system);
+WINE_DECLARE_DEBUG_CHANNEL(win);
+WINE_DECLARE_DEBUG_CHANNEL(win32);
 
 SYSLEVEL USER_SysLevel = { CRITICAL_SECTION_INIT("USER_SysLevel"), 2 };
 
diff --git a/windows/win.c b/windows/win.c
index 0bc438f1c13..a8c715b1fee 100644
--- a/windows/win.c
+++ b/windows/win.c
@@ -2,6 +2,20 @@
  * Window related functions
  *
  * Copyright 1993, 1994 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <assert.h>
@@ -24,10 +38,10 @@
 #include "winpos.h"
 #include "winerror.h"
 #include "stackframe.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(win);
-DECLARE_DEBUG_CHANNEL(msg);
+WINE_DEFAULT_DEBUG_CHANNEL(win);
+WINE_DECLARE_DEBUG_CHANNEL(msg);
 
 #define NB_USER_HANDLES  (LAST_USER_HANDLE - FIRST_USER_HANDLE + 1)
 
diff --git a/windows/winhelp.c b/windows/winhelp.c
index 009e21a0b26..49c6bbc6eaa 100644
--- a/windows/winhelp.c
+++ b/windows/winhelp.c
@@ -1,19 +1,35 @@
 /*
  * Windows Help
+ *
+ * Copyright 1996 Martin von Loewis
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "windef.h"
 #include "wingdi.h"
 #include "wine/winuser16.h"
 #include "wine/winbase16.h"
 #include "win.h"
 
-DEFAULT_DEBUG_CHANNEL(win);
+WINE_DEFAULT_DEBUG_CHANNEL(win);
 
 
 /* WinHelp internal structure */
diff --git a/windows/winpos.c b/windows/winpos.c
index 72d126c9b9f..6a6c95d4148 100644
--- a/windows/winpos.c
+++ b/windows/winpos.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1993, 1994, 1995 Alexandre Julliard
  *                       1995, 1996, 1999 Alex Korobka
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
@@ -22,10 +36,10 @@
 #include "winpos.h"
 #include "dce.h"
 #include "nonclient.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "input.h"
 
-DEFAULT_DEBUG_CHANNEL(win);
+WINE_DEFAULT_DEBUG_CHANNEL(win);
 
 #define HAS_DLGFRAME(style,exStyle) \
     (((exStyle) & WS_EX_DLGMODALFRAME) || \
diff --git a/windows/winproc.c b/windows/winproc.c
index 706a9449544..1cf3785574b 100644
--- a/windows/winproc.c
+++ b/windows/winproc.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1995 Martin von Loewis
  * Copyright 1996 Alexandre Julliard
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -21,14 +35,14 @@
 #include "struct32.h"
 #include "win.h"
 #include "winproc.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "spy.h"
 #include "task.h"
 #include "thread.h"
 
-DECLARE_DEBUG_CHANNEL(msg);
-DECLARE_DEBUG_CHANNEL(relay);
-DECLARE_DEBUG_CHANNEL(win);
+WINE_DECLARE_DEBUG_CHANNEL(msg);
+WINE_DECLARE_DEBUG_CHANNEL(relay);
+WINE_DECLARE_DEBUG_CHANNEL(win);
 
 #include "pshpack1.h"
 
diff --git a/windows/x11drv/clipboard.c b/windows/x11drv/clipboard.c
index 4dcd92cce98..73703a8771f 100644
--- a/windows/x11drv/clipboard.c
+++ b/windows/x11drv/clipboard.c
@@ -5,6 +5,20 @@
  *	     1996 Alex Korobka
  *	     1999 Noel Borthwick
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * NOTES:
  *    This file contains the X specific implementation for the windows
  *    Clipboard API.
@@ -58,9 +72,9 @@
 #include "clipboard.h"
 #include "win.h"
 #include "x11drv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(clipboard);
+WINE_DEFAULT_DEBUG_CHANNEL(clipboard);
 
 /* Selection masks */
 
diff --git a/windows/x11drv/event.c b/windows/x11drv/event.c
index e9022e949a6..edca7f72768 100644
--- a/windows/x11drv/event.c
+++ b/windows/x11drv/event.c
@@ -3,6 +3,20 @@
  *
  * Copyright 1993 Alexandre Julliard
  *	     1999 Noel Borthwick
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -24,7 +38,7 @@
 
 #include "clipboard.h"
 #include "dce.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "input.h"
 #include "options.h"
 #include "win.h"
@@ -34,8 +48,8 @@
 #include "x11drv.h"
 #include "shellapi.h"
 
-DEFAULT_DEBUG_CHANNEL(event);
-DECLARE_DEBUG_CHANNEL(win);
+WINE_DEFAULT_DEBUG_CHANNEL(event);
+WINE_DECLARE_DEBUG_CHANNEL(win);
   
 /* X context to associate a hwnd to an X window */
 extern XContext winContext;
diff --git a/windows/x11drv/keyboard.c b/windows/x11drv/keyboard.c
index 9a938368063..d7de84e7dcf 100644
--- a/windows/x11drv/keyboard.c
+++ b/windows/x11drv/keyboard.c
@@ -7,6 +7,20 @@
  * Copyright 1998 Morten Welinder
  * Copyright 1998 Ulrich Weigand
  * Copyright 1999 Ove Kåven
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
@@ -30,11 +44,11 @@
 #include "winnls.h"
 #include "win.h"
 #include "x11drv.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(keyboard);
-DECLARE_DEBUG_CHANNEL(key);
-DECLARE_DEBUG_CHANNEL(dinput);
+WINE_DEFAULT_DEBUG_CHANNEL(keyboard);
+WINE_DECLARE_DEBUG_CHANNEL(key);
+WINE_DECLARE_DEBUG_CHANNEL(dinput);
 
 int min_keycode, max_keycode, keysyms_per_keycode;
 WORD keyc2vkey[256], keyc2scan[256];
diff --git a/windows/x11drv/wineclipsrv.c b/windows/x11drv/wineclipsrv.c
index 33032e0b03d..4b0b18b0266 100644
--- a/windows/x11drv/wineclipsrv.c
+++ b/windows/x11drv/wineclipsrv.c
@@ -3,6 +3,20 @@
  *
  *      Copyright 1999  Noel Borthwick
  *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * USAGE:
  *       wineclipsrv [selection_mask] [debugClass_mask] [clearAllSelections]
  *
-- 
GitLab