diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd6a37c1a..bb4c19f72 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,18 @@
+# synergy-plus -- mouse and keyboard sharing utility
+# Copyright (C) 2009 The Synergy+ Project
+# 
+# This package is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# found in the file COPYING that should have accompanied this file.
+# 
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 # Version number for Synergy+
 SET(VERSION_MAJOR 1)
 SET(VERSION_MINOR 4)
diff --git a/build/__init__.py b/build/__init__.py
index e69de29bb..e1fb17d25 100644
--- a/build/__init__.py
+++ b/build/__init__.py
@@ -0,0 +1,14 @@
+# synergy-plus -- mouse and keyboard sharing utility
+# Copyright (C) 2009 The Synergy+ Project
+# 
+# This package is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# found in the file COPYING that should have accompanied this file.
+# 
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
\ No newline at end of file
diff --git a/build/commands.py b/build/commands.py
index 875937baf..7a93af8d2 100644
--- a/build/commands.py
+++ b/build/commands.py
@@ -1,3 +1,18 @@
+# synergy-plus -- mouse and keyboard sharing utility
+# Copyright (C) 2009 The Synergy+ Project
+# 
+# This package is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# found in the file COPYING that should have accompanied this file.
+# 
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 # TODO: split this file up, it's too long!
 
 import sys, os, ConfigParser, subprocess, shutil, re
diff --git a/cmake/CMakeLists_config.txt b/cmake/CMakeLists_config.txt
index 66a26e218..a29a5645c 100644
--- a/cmake/CMakeLists_config.txt
+++ b/cmake/CMakeLists_config.txt
@@ -1,3 +1,18 @@
+# synergy-plus -- mouse and keyboard sharing utility
+# Copyright (C) 2009 The Synergy+ Project
+# 
+# This package is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# found in the file COPYING that should have accompanied this file.
+# 
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 # Declare libs, so we can use list in linker later. There's probably 
 # a more elegant way of doing this; with SCons, when you check for the
 # lib, it is automatically passed to the linker.
diff --git a/cmake/CMakeLists_cpack.txt b/cmake/CMakeLists_cpack.txt
index 681340c4b..cf73edbc3 100644
--- a/cmake/CMakeLists_cpack.txt
+++ b/cmake/CMakeLists_cpack.txt
@@ -1,9 +1,20 @@
+# synergy-plus -- mouse and keyboard sharing utility
+# Copyright (C) 2009 The Synergy+ Project
+# 
+# This package is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# found in the file COPYING that should have accompanied this file.
+# 
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Synergy+ CPack config
-#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 # List of CPack variables:
 # http://www.vtk.org/Wiki/CMake:CPackConfiguration
-#
 
 # CPack files common to all platforms.
 SET(cpack_targets synergys synergyc)
diff --git a/cmake/CMakeLists_launcher.txt b/cmake/CMakeLists_launcher.txt
index 032f20b44..09131ca2b 100644
--- a/cmake/CMakeLists_launcher.txt
+++ b/cmake/CMakeLists_launcher.txt
@@ -1,3 +1,18 @@
+# synergy-plus -- mouse and keyboard sharing utility
+# Copyright (C) 2009 The Synergy+ Project
+# 
+# This package is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# found in the file COPYING that should have accompanied this file.
+# 
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 IF(WIN32)
 	SET(root_cmd_launcher ${root_dir}/cmd/launcher)
 
diff --git a/cmake/CMakeLists_lib.txt b/cmake/CMakeLists_lib.txt
index a69721008..9e847cd95 100644
--- a/cmake/CMakeLists_lib.txt
+++ b/cmake/CMakeLists_lib.txt
@@ -1,3 +1,18 @@
+# synergy-plus -- mouse and keyboard sharing utility
+# Copyright (C) 2009 The Synergy+ Project
+# 
+# This package is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# found in the file COPYING that should have accompanied this file.
+# 
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 SET(root_lib ${root_dir}/lib)
 
 SET(src_lib_arch
diff --git a/cmake/CMakeLists_synergyc.txt b/cmake/CMakeLists_synergyc.txt
index 5bd3a0b55..f7cfda7cb 100644
--- a/cmake/CMakeLists_synergyc.txt
+++ b/cmake/CMakeLists_synergyc.txt
@@ -1,3 +1,18 @@
+# synergy-plus -- mouse and keyboard sharing utility
+# Copyright (C) 2009 The Synergy+ Project
+# 
+# This package is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# found in the file COPYING that should have accompanied this file.
+# 
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 SET(root_cmd_synergyc ${root_dir}/cmd/synergyc)
 
 SET(src_cmd_synergyc_common
diff --git a/cmake/CMakeLists_synergys.txt b/cmake/CMakeLists_synergys.txt
index 08bbf1f14..2d17fe46a 100644
--- a/cmake/CMakeLists_synergys.txt
+++ b/cmake/CMakeLists_synergys.txt
@@ -1,3 +1,18 @@
+# synergy-plus -- mouse and keyboard sharing utility
+# Copyright (C) 2009 The Synergy+ Project
+# 
+# This package is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# found in the file COPYING that should have accompanied this file.
+# 
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 SET(root_cmd_synergys ${root_dir}/cmd/synergys)
 
 SET(src_cmd_synergys_common
diff --git a/cmd/launcher/CAddScreen.cpp b/cmd/launcher/CAddScreen.cpp
index 5a876b772..c9d80546d 100644
--- a/cmd/launcher/CAddScreen.cpp
+++ b/cmd/launcher/CAddScreen.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CConfig.h"
diff --git a/cmd/launcher/CAddScreen.h b/cmd/launcher/CAddScreen.h
index e926c4989..2f75835b3 100644
--- a/cmd/launcher/CAddScreen.h
+++ b/cmd/launcher/CAddScreen.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CADDSCREEN_H
diff --git a/cmd/launcher/CAdvancedOptions.cpp b/cmd/launcher/CAdvancedOptions.cpp
index c1ea83ef8..c2cea178d 100644
--- a/cmd/launcher/CAdvancedOptions.cpp
+++ b/cmd/launcher/CAdvancedOptions.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CConfig.h"
diff --git a/cmd/launcher/CAdvancedOptions.h b/cmd/launcher/CAdvancedOptions.h
index 1dd9dc44f..81a6928fd 100644
--- a/cmd/launcher/CAdvancedOptions.h
+++ b/cmd/launcher/CAdvancedOptions.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CADVANCEDOPTIONS_H
diff --git a/cmd/launcher/CAutoStart.cpp b/cmd/launcher/CAutoStart.cpp
index b57fb5592..581b71244 100644
--- a/cmd/launcher/CAutoStart.cpp
+++ b/cmd/launcher/CAutoStart.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CLog.h"
diff --git a/cmd/launcher/CAutoStart.h b/cmd/launcher/CAutoStart.h
index 46aad1000..05150932d 100644
--- a/cmd/launcher/CAutoStart.h
+++ b/cmd/launcher/CAutoStart.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CAUTOSTART_H
diff --git a/cmd/launcher/CGlobalOptions.cpp b/cmd/launcher/CGlobalOptions.cpp
index 8237a07fc..eea3be9f1 100644
--- a/cmd/launcher/CGlobalOptions.cpp
+++ b/cmd/launcher/CGlobalOptions.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CConfig.h"
diff --git a/cmd/launcher/CGlobalOptions.h b/cmd/launcher/CGlobalOptions.h
index f04f1bae5..a92aa2bf2 100644
--- a/cmd/launcher/CGlobalOptions.h
+++ b/cmd/launcher/CGlobalOptions.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CGLOBALOPTIONS_H
diff --git a/cmd/launcher/CHotkeyOptions.cpp b/cmd/launcher/CHotkeyOptions.cpp
index 4ea6a40b0..cdb67fdc0 100644
--- a/cmd/launcher/CHotkeyOptions.cpp
+++ b/cmd/launcher/CHotkeyOptions.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2006 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CArchMiscWindows.h"
diff --git a/cmd/launcher/CHotkeyOptions.h b/cmd/launcher/CHotkeyOptions.h
index dec5367a1..c1d739d76 100644
--- a/cmd/launcher/CHotkeyOptions.h
+++ b/cmd/launcher/CHotkeyOptions.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2006 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CHOTKEYOPTIONS_H
diff --git a/cmd/launcher/CInfo.cpp b/cmd/launcher/CInfo.cpp
index 73d4085ad..03364ba99 100644
--- a/cmd/launcher/CInfo.cpp
+++ b/cmd/launcher/CInfo.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2006 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "ProtocolTypes.h"
diff --git a/cmd/launcher/CInfo.h b/cmd/launcher/CInfo.h
index 2d85ec7dd..75962dd6d 100644
--- a/cmd/launcher/CInfo.h
+++ b/cmd/launcher/CInfo.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2006 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CINFO_H
diff --git a/cmd/launcher/CScreensLinks.cpp b/cmd/launcher/CScreensLinks.cpp
index b9fe24743..3bc27bd9d 100644
--- a/cmd/launcher/CScreensLinks.cpp
+++ b/cmd/launcher/CScreensLinks.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CConfig.h"
diff --git a/cmd/launcher/CScreensLinks.h b/cmd/launcher/CScreensLinks.h
index 8ffd00898..da0b02512 100644
--- a/cmd/launcher/CScreensLinks.h
+++ b/cmd/launcher/CScreensLinks.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CSCREENSLINKS_H
diff --git a/cmd/launcher/LaunchUtil.cpp b/cmd/launcher/LaunchUtil.cpp
index 05b517e79..baf3c0bcf 100644
--- a/cmd/launcher/LaunchUtil.cpp
+++ b/cmd/launcher/LaunchUtil.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CConfig.h"
diff --git a/cmd/launcher/LaunchUtil.h b/cmd/launcher/LaunchUtil.h
index 75954046d..5d1840ff1 100644
--- a/cmd/launcher/LaunchUtil.h
+++ b/cmd/launcher/LaunchUtil.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef LAUNCHUTIL_H
diff --git a/cmd/launcher/launcher.cpp b/cmd/launcher/launcher.cpp
index 043293aeb..43df3d207 100644
--- a/cmd/launcher/launcher.cpp
+++ b/cmd/launcher/launcher.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CConfig.h"
diff --git a/cmd/synergyc/CMSWindowsClientTaskBarReceiver.cpp b/cmd/synergyc/CMSWindowsClientTaskBarReceiver.cpp
index f328a233a..0ad5b3124 100644
--- a/cmd/synergyc/CMSWindowsClientTaskBarReceiver.cpp
+++ b/cmd/synergyc/CMSWindowsClientTaskBarReceiver.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CMSWindowsClientTaskBarReceiver.h"
diff --git a/cmd/synergyc/CMSWindowsClientTaskBarReceiver.h b/cmd/synergyc/CMSWindowsClientTaskBarReceiver.h
index 5c4d9cdf6..9b9ba2a50 100644
--- a/cmd/synergyc/CMSWindowsClientTaskBarReceiver.h
+++ b/cmd/synergyc/CMSWindowsClientTaskBarReceiver.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CMSWINDOWSCLIENTTASKBARRECEIVER_H
diff --git a/cmd/synergyc/COSXClientTaskBarReceiver.cpp b/cmd/synergyc/COSXClientTaskBarReceiver.cpp
index 08d1fad77..b704af96a 100644
--- a/cmd/synergyc/COSXClientTaskBarReceiver.cpp
+++ b/cmd/synergyc/COSXClientTaskBarReceiver.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "COSXClientTaskBarReceiver.h"
diff --git a/cmd/synergyc/COSXClientTaskBarReceiver.h b/cmd/synergyc/COSXClientTaskBarReceiver.h
index 59bca97ca..cd4c0ed43 100644
--- a/cmd/synergyc/COSXClientTaskBarReceiver.h
+++ b/cmd/synergyc/COSXClientTaskBarReceiver.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef COSXCLIENTTASKBARRECEIVER_H
diff --git a/cmd/synergyc/CXWindowsClientTaskBarReceiver.cpp b/cmd/synergyc/CXWindowsClientTaskBarReceiver.cpp
index 965f698e1..9e5555d82 100644
--- a/cmd/synergyc/CXWindowsClientTaskBarReceiver.cpp
+++ b/cmd/synergyc/CXWindowsClientTaskBarReceiver.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CXWindowsClientTaskBarReceiver.h"
diff --git a/cmd/synergyc/CXWindowsClientTaskBarReceiver.h b/cmd/synergyc/CXWindowsClientTaskBarReceiver.h
index fa9da4716..e205fd817 100644
--- a/cmd/synergyc/CXWindowsClientTaskBarReceiver.h
+++ b/cmd/synergyc/CXWindowsClientTaskBarReceiver.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CXWINDOWSCLIENTTASKBARRECEIVER_H
diff --git a/cmd/synergyc/synergyc.cpp b/cmd/synergyc/synergyc.cpp
index bd415e6a9..eab0f1912 100644
--- a/cmd/synergyc/synergyc.cpp
+++ b/cmd/synergyc/synergyc.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CClientApp.h"
diff --git a/cmd/synergys/CMSWindowsServerTaskBarReceiver.cpp b/cmd/synergys/CMSWindowsServerTaskBarReceiver.cpp
index 001268066..3cf906c93 100644
--- a/cmd/synergys/CMSWindowsServerTaskBarReceiver.cpp
+++ b/cmd/synergys/CMSWindowsServerTaskBarReceiver.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CMSWindowsServerTaskBarReceiver.h"
diff --git a/cmd/synergys/CMSWindowsServerTaskBarReceiver.h b/cmd/synergys/CMSWindowsServerTaskBarReceiver.h
index 22decc8d9..cc9905b5b 100644
--- a/cmd/synergys/CMSWindowsServerTaskBarReceiver.h
+++ b/cmd/synergys/CMSWindowsServerTaskBarReceiver.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CMSWINDOWSSERVERTASKBARRECEIVER_H
diff --git a/cmd/synergys/COSXServerTaskBarReceiver.cpp b/cmd/synergys/COSXServerTaskBarReceiver.cpp
index 4770478b1..a66175dc2 100644
--- a/cmd/synergys/COSXServerTaskBarReceiver.cpp
+++ b/cmd/synergys/COSXServerTaskBarReceiver.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "COSXServerTaskBarReceiver.h"
diff --git a/cmd/synergys/COSXServerTaskBarReceiver.h b/cmd/synergys/COSXServerTaskBarReceiver.h
index 7f6dc2983..8a4dad6da 100644
--- a/cmd/synergys/COSXServerTaskBarReceiver.h
+++ b/cmd/synergys/COSXServerTaskBarReceiver.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef COSXSERVERTASKBARRECEIVER_H
diff --git a/cmd/synergys/CXWindowsServerTaskBarReceiver.cpp b/cmd/synergys/CXWindowsServerTaskBarReceiver.cpp
index 61db20df2..ef22f9dda 100644
--- a/cmd/synergys/CXWindowsServerTaskBarReceiver.cpp
+++ b/cmd/synergys/CXWindowsServerTaskBarReceiver.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CXWindowsServerTaskBarReceiver.h"
diff --git a/cmd/synergys/CXWindowsServerTaskBarReceiver.h b/cmd/synergys/CXWindowsServerTaskBarReceiver.h
index 732341232..2e7e3d168 100644
--- a/cmd/synergys/CXWindowsServerTaskBarReceiver.h
+++ b/cmd/synergys/CXWindowsServerTaskBarReceiver.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CXWINDOWSSERVERTASKBARRECEIVER_H
diff --git a/cmd/synergys/synergys.cpp b/cmd/synergys/synergys.cpp
index 6272cdae1..d193106f3 100644
--- a/cmd/synergys/synergys.cpp
+++ b/cmd/synergys/synergys.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CServerApp.h"
diff --git a/gui/src/AboutDialog.cpp b/gui/src/AboutDialog.cpp
index 2264b7b30..546276b19 100644
--- a/gui/src/AboutDialog.cpp
+++ b/gui/src/AboutDialog.cpp
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "AboutDialog.h"
 
 #include <QtCore>
diff --git a/gui/src/AboutDialog.h b/gui/src/AboutDialog.h
index 95cf36016..829f1d331 100644
--- a/gui/src/AboutDialog.h
+++ b/gui/src/AboutDialog.h
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #if !defined(ABOUTDIALOG__H)
 
 #define ABOUTDIALOG__H
diff --git a/gui/src/Action.cpp b/gui/src/Action.cpp
index f96daf62d..9ec157e82 100644
--- a/gui/src/Action.cpp
+++ b/gui/src/Action.cpp
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "Action.h"
 
 #include <QSettings>
diff --git a/gui/src/Action.h b/gui/src/Action.h
index d3b69566e..3a1c63bea 100644
--- a/gui/src/Action.h
+++ b/gui/src/Action.h
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #if !defined(ACTION_H)
 
 #define ACTION_H
diff --git a/gui/src/ActionDialog.cpp b/gui/src/ActionDialog.cpp
index 661f2575c..57080e499 100644
--- a/gui/src/ActionDialog.cpp
+++ b/gui/src/ActionDialog.cpp
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "ActionDialog.h"
 
 #include "Hotkey.h"
diff --git a/gui/src/ActionDialog.h b/gui/src/ActionDialog.h
index 5c7945a42..94a716c3d 100644
--- a/gui/src/ActionDialog.h
+++ b/gui/src/ActionDialog.h
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #if !defined(ACTIONDIALOG_H)
 
 #define ACTIONDIALOG_H
diff --git a/gui/src/AppConfig.cpp b/gui/src/AppConfig.cpp
index 543bc6335..420ac4a53 100644
--- a/gui/src/AppConfig.cpp
+++ b/gui/src/AppConfig.cpp
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "AppConfig.h"
 
 #include <QtCore>
diff --git a/gui/src/AppConfig.h b/gui/src/AppConfig.h
index 572f8fa06..41ef9c92a 100644
--- a/gui/src/AppConfig.h
+++ b/gui/src/AppConfig.h
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #if !defined(APPCONFIG_H)
 
 #define APPCONFIG_H
diff --git a/gui/src/BaseConfig.cpp b/gui/src/BaseConfig.cpp
index c005c6946..5c1b76d97 100644
--- a/gui/src/BaseConfig.cpp
+++ b/gui/src/BaseConfig.cpp
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "BaseConfig.h"
 
 const char* BaseConfig::m_ModifierNames[] =
diff --git a/gui/src/BaseConfig.h b/gui/src/BaseConfig.h
index ced6ef2de..9386cd215 100644
--- a/gui/src/BaseConfig.h
+++ b/gui/src/BaseConfig.h
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #if !defined(BASECONFIG_H)
 
 #define BASECONFIG_H
diff --git a/gui/src/Hotkey.cpp b/gui/src/Hotkey.cpp
index 88b7ecf00..41f3bcfb9 100644
--- a/gui/src/Hotkey.cpp
+++ b/gui/src/Hotkey.cpp
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "Hotkey.h"
 
 #include <QSettings>
diff --git a/gui/src/Hotkey.h b/gui/src/Hotkey.h
index b39b494d8..34af2c61f 100644
--- a/gui/src/Hotkey.h
+++ b/gui/src/Hotkey.h
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #if !defined(HOTKEY_H)
 
 #define HOTKEY_H
diff --git a/gui/src/HotkeyDialog.cpp b/gui/src/HotkeyDialog.cpp
index 849815716..21a0ee9dc 100644
--- a/gui/src/HotkeyDialog.cpp
+++ b/gui/src/HotkeyDialog.cpp
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "HotkeyDialog.h"
 
 #include <QtCore>
diff --git a/gui/src/HotkeyDialog.h b/gui/src/HotkeyDialog.h
index 917cf3f99..c6a466e9c 100644
--- a/gui/src/HotkeyDialog.h
+++ b/gui/src/HotkeyDialog.h
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #if !defined(HOTKEYDIALOG_H)
 
 #define HOTKEYDIALOG_H
diff --git a/gui/src/KeySequence.cpp b/gui/src/KeySequence.cpp
index 69588e77c..e636555d9 100644
--- a/gui/src/KeySequence.cpp
+++ b/gui/src/KeySequence.cpp
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "KeySequence.h"
 
 #include <QtCore>
diff --git a/gui/src/KeySequence.h b/gui/src/KeySequence.h
index fd6fa46c7..31ecb962b 100644
--- a/gui/src/KeySequence.h
+++ b/gui/src/KeySequence.h
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #if !defined(KEYSEQUENCE_H)
 
 #define KEYSEQUENCE_H
diff --git a/gui/src/KeySequenceWidget.cpp b/gui/src/KeySequenceWidget.cpp
index 729ac6427..3bae56ea4 100644
--- a/gui/src/KeySequenceWidget.cpp
+++ b/gui/src/KeySequenceWidget.cpp
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "KeySequenceWidget.h"
 
 #include <iostream>
diff --git a/gui/src/KeySequenceWidget.h b/gui/src/KeySequenceWidget.h
index db71d8e76..1298fbe1e 100644
--- a/gui/src/KeySequenceWidget.h
+++ b/gui/src/KeySequenceWidget.h
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #if !defined(KEYSEQUENCEWIDGET__H)
 
 #define KEYSEQUENCEWIDGET__H
diff --git a/gui/src/LogDialog.cpp b/gui/src/LogDialog.cpp
index 580b59e55..20d133828 100644
--- a/gui/src/LogDialog.cpp
+++ b/gui/src/LogDialog.cpp
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "LogDialog.h"
 
 #include <QProcess>
diff --git a/gui/src/LogDialog.h b/gui/src/LogDialog.h
index c6a83db1f..3329e30cc 100644
--- a/gui/src/LogDialog.h
+++ b/gui/src/LogDialog.h
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #if !defined(LOGDIALOG_H)
 
 #define LOGDIALOG_H
diff --git a/gui/src/MainWindow.cpp b/gui/src/MainWindow.cpp
index c62ca99e5..8cd568e82 100644
--- a/gui/src/MainWindow.cpp
+++ b/gui/src/MainWindow.cpp
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "MainWindow.h"
 #include "AboutDialog.h"
 #include "ServerConfigDialog.h"
diff --git a/gui/src/MainWindow.h b/gui/src/MainWindow.h
index 023b8b422..d1d93cd3f 100644
--- a/gui/src/MainWindow.h
+++ b/gui/src/MainWindow.h
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #if !defined(MAINWINDOW__H)
 
 #define MAINWINDOW__H
diff --git a/gui/src/NewScreenWidget.cpp b/gui/src/NewScreenWidget.cpp
index 5c31db173..06da2fbaa 100644
--- a/gui/src/NewScreenWidget.cpp
+++ b/gui/src/NewScreenWidget.cpp
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "NewScreenWidget.h"
 #include "ScreenSetupModel.h"
 
diff --git a/gui/src/NewScreenWidget.h b/gui/src/NewScreenWidget.h
index 402bc068c..26d8d4615 100644
--- a/gui/src/NewScreenWidget.h
+++ b/gui/src/NewScreenWidget.h
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #if !defined(NEWSCREENWIDGET__H)
 
 #define NEWSCREENWIDGET__H
diff --git a/gui/src/QSynergyApplication.cpp b/gui/src/QSynergyApplication.cpp
index ab5b125cd..f6ac9bba9 100644
--- a/gui/src/QSynergyApplication.cpp
+++ b/gui/src/QSynergyApplication.cpp
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "QSynergyApplication.h"
 #include "MainWindow.h"
 
diff --git a/gui/src/QSynergyApplication.h b/gui/src/QSynergyApplication.h
index a2b9de19e..c31f935bb 100644
--- a/gui/src/QSynergyApplication.h
+++ b/gui/src/QSynergyApplication.h
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #if !defined(QSYNERGYAPPLICATION__H)
 
 #define QSYNERGYAPPLICATION__H
diff --git a/gui/src/Screen.cpp b/gui/src/Screen.cpp
index 5b71023ad..133c1ec46 100644
--- a/gui/src/Screen.cpp
+++ b/gui/src/Screen.cpp
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "Screen.h"
 
 #include <QtCore>
diff --git a/gui/src/Screen.h b/gui/src/Screen.h
index 2b75a1e20..b530d64fe 100644
--- a/gui/src/Screen.h
+++ b/gui/src/Screen.h
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #if !defined(SCREEN__H)
 
 #define SCREEN__H
diff --git a/gui/src/ScreenSettingsDialog.cpp b/gui/src/ScreenSettingsDialog.cpp
index f240eda53..53371d20d 100644
--- a/gui/src/ScreenSettingsDialog.cpp
+++ b/gui/src/ScreenSettingsDialog.cpp
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "ScreenSettingsDialog.h"
 #include "Screen.h"
 
diff --git a/gui/src/ScreenSettingsDialog.h b/gui/src/ScreenSettingsDialog.h
index 14c2a1fc0..59e63a64d 100644
--- a/gui/src/ScreenSettingsDialog.h
+++ b/gui/src/ScreenSettingsDialog.h
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #if !defined(SCREENSETTINGSDIALOG__H)
 
 #define SCREENSETTINGSDIALOG__H
diff --git a/gui/src/ScreenSetupModel.cpp b/gui/src/ScreenSetupModel.cpp
index 42c50af6c..f360bb394 100644
--- a/gui/src/ScreenSetupModel.cpp
+++ b/gui/src/ScreenSetupModel.cpp
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "ScreenSetupModel.h"
 #include "Screen.h"
 
diff --git a/gui/src/ScreenSetupModel.h b/gui/src/ScreenSetupModel.h
index 11cec0fb1..66a6c7fc3 100644
--- a/gui/src/ScreenSetupModel.h
+++ b/gui/src/ScreenSetupModel.h
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #if !defined(SCREENSETUPMODEL__H)
 
 #define SCREENSETUPMODEL__H
diff --git a/gui/src/ScreenSetupView.cpp b/gui/src/ScreenSetupView.cpp
index e461787bf..c23c086cc 100644
--- a/gui/src/ScreenSetupView.cpp
+++ b/gui/src/ScreenSetupView.cpp
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "ScreenSetupView.h"
 #include "ScreenSetupModel.h"
 #include "ScreenSettingsDialog.h"
diff --git a/gui/src/ScreenSetupView.h b/gui/src/ScreenSetupView.h
index 8ed9a2b06..c2df2ceee 100644
--- a/gui/src/ScreenSetupView.h
+++ b/gui/src/ScreenSetupView.h
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #if !defined(SCREENSETUPVIEW__H)
 
 #define SCREENSETUPVIEW__H
diff --git a/gui/src/ServerConfig.cpp b/gui/src/ServerConfig.cpp
index 9895d5bf6..b915c0cc1 100644
--- a/gui/src/ServerConfig.cpp
+++ b/gui/src/ServerConfig.cpp
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "ServerConfig.h"
 #include "Hotkey.h"
 
diff --git a/gui/src/ServerConfig.h b/gui/src/ServerConfig.h
index a94e33d40..96a6e308f 100644
--- a/gui/src/ServerConfig.h
+++ b/gui/src/ServerConfig.h
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #if !defined(SERVERCONFIG__H)
 
 #define SERVERCONFIG__H
diff --git a/gui/src/ServerConfigDialog.cpp b/gui/src/ServerConfigDialog.cpp
index 509a0b3ae..630923765 100644
--- a/gui/src/ServerConfigDialog.cpp
+++ b/gui/src/ServerConfigDialog.cpp
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "ServerConfigDialog.h"
 #include "ServerConfig.h"
 #include "HotkeyDialog.h"
diff --git a/gui/src/ServerConfigDialog.h b/gui/src/ServerConfigDialog.h
index 9e84144ec..4e821ab46 100644
--- a/gui/src/ServerConfigDialog.h
+++ b/gui/src/ServerConfigDialog.h
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #if !defined(SERVERCONFIGDIALOG__H)
 
 #define SERVERCONFIGDIALOG__H
diff --git a/gui/src/SettingsDialog.cpp b/gui/src/SettingsDialog.cpp
index eaa27e9fd..3ec6b362a 100644
--- a/gui/src/SettingsDialog.cpp
+++ b/gui/src/SettingsDialog.cpp
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "SettingsDialog.h"
 
 #include <QtCore>
diff --git a/gui/src/SettingsDialog.h b/gui/src/SettingsDialog.h
index 5ecb515a4..cd6f3370c 100644
--- a/gui/src/SettingsDialog.h
+++ b/gui/src/SettingsDialog.h
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #if !defined(SETTINGSDIALOG_H)
 
 #define SETTINGSDIALOG_H
diff --git a/gui/src/TrashScreenWidget.cpp b/gui/src/TrashScreenWidget.cpp
index 2aac8d214..88491fbc5 100644
--- a/gui/src/TrashScreenWidget.cpp
+++ b/gui/src/TrashScreenWidget.cpp
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "TrashScreenWidget.h"
 #include "ScreenSetupModel.h"
 
diff --git a/gui/src/TrashScreenWidget.h b/gui/src/TrashScreenWidget.h
index d12ff564b..7c4dcbfc6 100644
--- a/gui/src/TrashScreenWidget.h
+++ b/gui/src/TrashScreenWidget.h
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #if !defined(TRASHSCREENWIDGET__H)
 
 #define TRASHSCREENWIDGET__H
diff --git a/gui/src/WindowsServices.cpp b/gui/src/WindowsServices.cpp
index 2d807e64c..f55bc6ab3 100644
--- a/gui/src/WindowsServices.cpp
+++ b/gui/src/WindowsServices.cpp
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "WindowsServices.h"
 #include "AppConfig.h"
 #include "MainWindow.h"
diff --git a/gui/src/WindowsServices.h b/gui/src/WindowsServices.h
index fb00594e9..b6ec14878 100644
--- a/gui/src/WindowsServices.h
+++ b/gui/src/WindowsServices.h
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef WINDOWSSERVICES_H
 #define WINDOWSSERVICES_H
 
diff --git a/gui/src/main.cpp b/gui/src/main.cpp
index e3ff1c24d..d48197392 100644
--- a/gui/src/main.cpp
+++ b/gui/src/main.cpp
@@ -1,3 +1,21 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "QSynergyApplication.h"
 #include "MainWindow.h"
 
diff --git a/hm.py b/hm.py
index f4b29b07a..07c5b848c 100644
--- a/hm.py
+++ b/hm.py
@@ -1,5 +1,20 @@
 #! /usr/bin/env python
 
+# synergy-plus -- mouse and keyboard sharing utility
+# Copyright (C) 2009 The Synergy+ Project
+# 
+# This package is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# found in the file COPYING that should have accompanied this file.
+# 
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 # hm.py: 'Help Me', is a simple wrapper for all build tools.
 # 
 # This script was created for the Synergy+ project.
diff --git a/lib/arch/CArch.cpp b/lib/arch/CArch.cpp
index b299ffc7c..1fca2381d 100644
--- a/lib/arch/CArch.cpp
+++ b/lib/arch/CArch.cpp
@@ -1,15 +1,19 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
- * This package is free software you can redistribute it and/or
+ * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
  * 
  * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "common.h"
diff --git a/lib/arch/CArch.h b/lib/arch/CArch.h
index f6bb400ae..dcacda866 100644
--- a/lib/arch/CArch.h
+++ b/lib/arch/CArch.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CARCH_H
diff --git a/lib/arch/CArchAppUtil.cpp b/lib/arch/CArchAppUtil.cpp
index 2ccf1d7da..898dce0a7 100644
--- a/lib/arch/CArchAppUtil.cpp
+++ b/lib/arch/CArchAppUtil.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  
 #include "CArchAppUtil.h"
diff --git a/lib/arch/CArchAppUtil.h b/lib/arch/CArchAppUtil.h
index 7e2b6ba06..25a09e805 100644
--- a/lib/arch/CArchAppUtil.h
+++ b/lib/arch/CArchAppUtil.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  
 #pragma once
diff --git a/lib/arch/CArchAppUtilUnix.cpp b/lib/arch/CArchAppUtilUnix.cpp
index 78a7f46fd..26eaeca86 100644
--- a/lib/arch/CArchAppUtilUnix.cpp
+++ b/lib/arch/CArchAppUtilUnix.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CArchAppUtilUnix.h"
diff --git a/lib/arch/CArchAppUtilUnix.h b/lib/arch/CArchAppUtilUnix.h
index 83bf097b8..0380f09fa 100644
--- a/lib/arch/CArchAppUtilUnix.h
+++ b/lib/arch/CArchAppUtilUnix.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #pragma once
diff --git a/lib/arch/CArchAppUtilWindows.cpp b/lib/arch/CArchAppUtilWindows.cpp
index 1480c5055..123d1d528 100644
--- a/lib/arch/CArchAppUtilWindows.cpp
+++ b/lib/arch/CArchAppUtilWindows.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CArchAppUtilWindows.h"
diff --git a/lib/arch/CArchAppUtilWindows.h b/lib/arch/CArchAppUtilWindows.h
index 158f718ca..4b904c3cb 100644
--- a/lib/arch/CArchAppUtilWindows.h
+++ b/lib/arch/CArchAppUtilWindows.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #pragma once
diff --git a/lib/arch/CArchConsoleStd.cpp b/lib/arch/CArchConsoleStd.cpp
index e9e06c65e..d4a0970ef 100644
--- a/lib/arch/CArchConsoleStd.cpp
+++ b/lib/arch/CArchConsoleStd.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CArchConsoleStd.h"
diff --git a/lib/arch/CArchConsoleStd.h b/lib/arch/CArchConsoleStd.h
index ac9027211..1acae8407 100644
--- a/lib/arch/CArchConsoleStd.h
+++ b/lib/arch/CArchConsoleStd.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #pragma once
diff --git a/lib/arch/CArchConsoleUnix.cpp b/lib/arch/CArchConsoleUnix.cpp
index 59877a196..8835b4a17 100644
--- a/lib/arch/CArchConsoleUnix.cpp
+++ b/lib/arch/CArchConsoleUnix.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CArchConsoleUnix.h"
diff --git a/lib/arch/CArchConsoleUnix.h b/lib/arch/CArchConsoleUnix.h
index c8a737f3f..bbeaa0cc6 100644
--- a/lib/arch/CArchConsoleUnix.h
+++ b/lib/arch/CArchConsoleUnix.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #pragma once
diff --git a/lib/arch/CArchConsoleWindows.cpp b/lib/arch/CArchConsoleWindows.cpp
index 1f721c5b1..b97d0e957 100644
--- a/lib/arch/CArchConsoleWindows.cpp
+++ b/lib/arch/CArchConsoleWindows.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CArchConsoleWindows.h"
diff --git a/lib/arch/CArchConsoleWindows.h b/lib/arch/CArchConsoleWindows.h
index 4a2a6ac41..e20e5a01f 100644
--- a/lib/arch/CArchConsoleWindows.h
+++ b/lib/arch/CArchConsoleWindows.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #pragma once
diff --git a/lib/arch/CArchDaemonNone.cpp b/lib/arch/CArchDaemonNone.cpp
index 0281f3653..e6e7a3f53 100644
--- a/lib/arch/CArchDaemonNone.cpp
+++ b/lib/arch/CArchDaemonNone.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CArchDaemonNone.h"
diff --git a/lib/arch/CArchDaemonNone.h b/lib/arch/CArchDaemonNone.h
index 1c196c5d7..c93cfdceb 100644
--- a/lib/arch/CArchDaemonNone.h
+++ b/lib/arch/CArchDaemonNone.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CARCHDAEMONNONE_H
diff --git a/lib/arch/CArchDaemonUnix.cpp b/lib/arch/CArchDaemonUnix.cpp
index 8d4c0c87c..ad323d39e 100644
--- a/lib/arch/CArchDaemonUnix.cpp
+++ b/lib/arch/CArchDaemonUnix.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CArchDaemonUnix.h"
diff --git a/lib/arch/CArchDaemonUnix.h b/lib/arch/CArchDaemonUnix.h
index 923004e13..a340d0e94 100644
--- a/lib/arch/CArchDaemonUnix.h
+++ b/lib/arch/CArchDaemonUnix.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CARCHDAEMONUNIX_H
diff --git a/lib/arch/CArchDaemonWindows.cpp b/lib/arch/CArchDaemonWindows.cpp
index ee24ac99c..92b968a06 100644
--- a/lib/arch/CArchDaemonWindows.cpp
+++ b/lib/arch/CArchDaemonWindows.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CArchDaemonWindows.h"
diff --git a/lib/arch/CArchDaemonWindows.h b/lib/arch/CArchDaemonWindows.h
index 22ed26bad..2120c76a0 100644
--- a/lib/arch/CArchDaemonWindows.h
+++ b/lib/arch/CArchDaemonWindows.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CARCHDAEMONWINDOWS_H
diff --git a/lib/arch/CArchFileUnix.cpp b/lib/arch/CArchFileUnix.cpp
index 89bb51dc9..2d452fd5f 100644
--- a/lib/arch/CArchFileUnix.cpp
+++ b/lib/arch/CArchFileUnix.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CArchFileUnix.h"
diff --git a/lib/arch/CArchFileUnix.h b/lib/arch/CArchFileUnix.h
index 41d00e90d..319d7fc4c 100644
--- a/lib/arch/CArchFileUnix.h
+++ b/lib/arch/CArchFileUnix.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CARCHFILEUNIX_H
diff --git a/lib/arch/CArchFileWindows.cpp b/lib/arch/CArchFileWindows.cpp
index 5debb17b2..6112c9e1c 100644
--- a/lib/arch/CArchFileWindows.cpp
+++ b/lib/arch/CArchFileWindows.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CArchFileWindows.h"
diff --git a/lib/arch/CArchFileWindows.h b/lib/arch/CArchFileWindows.h
index 617b1c401..56a34c0be 100644
--- a/lib/arch/CArchFileWindows.h
+++ b/lib/arch/CArchFileWindows.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CARCHFILEWINDOWS_H
diff --git a/lib/arch/CArchLogUnix.cpp b/lib/arch/CArchLogUnix.cpp
index 093d89f9d..b698baafb 100644
--- a/lib/arch/CArchLogUnix.cpp
+++ b/lib/arch/CArchLogUnix.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CArchLogUnix.h"
diff --git a/lib/arch/CArchLogUnix.h b/lib/arch/CArchLogUnix.h
index 91070b459..0a9f81889 100644
--- a/lib/arch/CArchLogUnix.h
+++ b/lib/arch/CArchLogUnix.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CARCHLOGUNIX_H
diff --git a/lib/arch/CArchLogWindows.cpp b/lib/arch/CArchLogWindows.cpp
index a2249e0bb..23e37390b 100644
--- a/lib/arch/CArchLogWindows.cpp
+++ b/lib/arch/CArchLogWindows.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CArchLogWindows.h"
diff --git a/lib/arch/CArchLogWindows.h b/lib/arch/CArchLogWindows.h
index e8812536f..5c1bf493c 100644
--- a/lib/arch/CArchLogWindows.h
+++ b/lib/arch/CArchLogWindows.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CARCHLOGWINDOWS_H
diff --git a/lib/arch/CArchMiscWindows.cpp b/lib/arch/CArchMiscWindows.cpp
index 49b576c03..ca71050e2 100644
--- a/lib/arch/CArchMiscWindows.cpp
+++ b/lib/arch/CArchMiscWindows.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CArchMiscWindows.h"
diff --git a/lib/arch/CArchMiscWindows.h b/lib/arch/CArchMiscWindows.h
index dc1eca028..e0c405b4f 100644
--- a/lib/arch/CArchMiscWindows.h
+++ b/lib/arch/CArchMiscWindows.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CARCHMISCWINDOWS_H
diff --git a/lib/arch/CArchMultithreadPosix.cpp b/lib/arch/CArchMultithreadPosix.cpp
index ec11fc502..10950d495 100644
--- a/lib/arch/CArchMultithreadPosix.cpp
+++ b/lib/arch/CArchMultithreadPosix.cpp
@@ -1,15 +1,19 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
- * This package is free software you can redistribute it and/or
+ * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
  * 
  * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CArchMultithreadPosix.h"
diff --git a/lib/arch/CArchMultithreadPosix.h b/lib/arch/CArchMultithreadPosix.h
index 4e587cfc7..0122e68bc 100644
--- a/lib/arch/CArchMultithreadPosix.h
+++ b/lib/arch/CArchMultithreadPosix.h
@@ -1,15 +1,19 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
- * This package is free software you can redistribute it and/or
+ * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
  * 
  * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CARCHMULTITHREADPOSIX_H
diff --git a/lib/arch/CArchMultithreadWindows.cpp b/lib/arch/CArchMultithreadWindows.cpp
index ebb5f0c67..378dcc7a3 100644
--- a/lib/arch/CArchMultithreadWindows.cpp
+++ b/lib/arch/CArchMultithreadWindows.cpp
@@ -1,15 +1,19 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
- * This package is free software you can redistribute it and/or
+ * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
  * 
  * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #if defined(_MSC_VER) && !defined(_MT)
diff --git a/lib/arch/CArchMultithreadWindows.h b/lib/arch/CArchMultithreadWindows.h
index d009c8424..48fb6c99a 100644
--- a/lib/arch/CArchMultithreadWindows.h
+++ b/lib/arch/CArchMultithreadWindows.h
@@ -1,15 +1,19 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
- * This package is free software you can redistribute it and/or
+ * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
  * 
  * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CARCHMULTITHREADWINDOWS_H
diff --git a/lib/arch/CArchNetworkBSD.cpp b/lib/arch/CArchNetworkBSD.cpp
index fe6acdbb9..eae706a5f 100644
--- a/lib/arch/CArchNetworkBSD.cpp
+++ b/lib/arch/CArchNetworkBSD.cpp
@@ -1,15 +1,19 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
- * This package is free software you can redistribute it and/or
+ * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
  * 
  * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CArchNetworkBSD.h"
diff --git a/lib/arch/CArchNetworkBSD.h b/lib/arch/CArchNetworkBSD.h
index bba602721..abc7ef491 100644
--- a/lib/arch/CArchNetworkBSD.h
+++ b/lib/arch/CArchNetworkBSD.h
@@ -1,15 +1,19 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
- * This package is free software you can redistribute it and/or
+ * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
  * 
  * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CARCHNETWORKBSD_H
diff --git a/lib/arch/CArchNetworkWinsock.cpp b/lib/arch/CArchNetworkWinsock.cpp
index 26dccffac..1133afac6 100644
--- a/lib/arch/CArchNetworkWinsock.cpp
+++ b/lib/arch/CArchNetworkWinsock.cpp
@@ -1,15 +1,19 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
- * This package is free software you can redistribute it and/or
+ * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
  * 
  * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/lib/arch/CArchNetworkWinsock.h b/lib/arch/CArchNetworkWinsock.h
index 3912ba5b2..6586069aa 100644
--- a/lib/arch/CArchNetworkWinsock.h
+++ b/lib/arch/CArchNetworkWinsock.h
@@ -1,15 +1,19 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
- * This package is free software you can redistribute it and/or
+ * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
  * 
  * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CARCHNETWORKWINSOCK_H
diff --git a/lib/arch/CArchSleepUnix.cpp b/lib/arch/CArchSleepUnix.cpp
index 350107218..ba5cd57e2 100644
--- a/lib/arch/CArchSleepUnix.cpp
+++ b/lib/arch/CArchSleepUnix.cpp
@@ -1,15 +1,19 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
- * This package is free software you can redistribute it and/or
+ * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
  * 
  * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CArchSleepUnix.h"
diff --git a/lib/arch/CArchSleepUnix.h b/lib/arch/CArchSleepUnix.h
index 939ca401c..2cbdf5322 100644
--- a/lib/arch/CArchSleepUnix.h
+++ b/lib/arch/CArchSleepUnix.h
@@ -1,15 +1,19 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
- * This package is free software you can redistribute it and/or
+ * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
  * 
  * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CARCHSLEEPUNIX_H
diff --git a/lib/arch/CArchSleepWindows.cpp b/lib/arch/CArchSleepWindows.cpp
index f6c8bed82..7953d5037 100644
--- a/lib/arch/CArchSleepWindows.cpp
+++ b/lib/arch/CArchSleepWindows.cpp
@@ -1,15 +1,19 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
- * This package is free software you can redistribute it and/or
+ * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
  * 
  * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CArchSleepWindows.h"
diff --git a/lib/arch/CArchSleepWindows.h b/lib/arch/CArchSleepWindows.h
index a5a5fa90a..cb6fa19d5 100644
--- a/lib/arch/CArchSleepWindows.h
+++ b/lib/arch/CArchSleepWindows.h
@@ -1,15 +1,19 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
- * This package is free software you can redistribute it and/or
+ * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
  * 
  * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CARCHSLEEPWINDOWS_H
diff --git a/lib/arch/CArchStringUnix.cpp b/lib/arch/CArchStringUnix.cpp
index e0ad34571..e29beba3e 100644
--- a/lib/arch/CArchStringUnix.cpp
+++ b/lib/arch/CArchStringUnix.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CArchStringUnix.h"
diff --git a/lib/arch/CArchStringUnix.h b/lib/arch/CArchStringUnix.h
index 20e5486bb..b2af160c4 100644
--- a/lib/arch/CArchStringUnix.h
+++ b/lib/arch/CArchStringUnix.h
@@ -1,15 +1,19 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
- * This package is free software you can redistribute it and/or
+ * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
  * 
  * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CARCHSTRINGUNIX_H
diff --git a/lib/arch/CArchStringWindows.cpp b/lib/arch/CArchStringWindows.cpp
index a3b907650..7b2ec5bd0 100644
--- a/lib/arch/CArchStringWindows.cpp
+++ b/lib/arch/CArchStringWindows.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #define WIN32_LEAN_AND_MEAN
diff --git a/lib/arch/CArchStringWindows.h b/lib/arch/CArchStringWindows.h
index a67d8431f..312fbd887 100644
--- a/lib/arch/CArchStringWindows.h
+++ b/lib/arch/CArchStringWindows.h
@@ -1,15 +1,19 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
- * This package is free software you can redistribute it and/or
+ * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
  * 
  * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CARCHSTRINGWINDOWS_H
diff --git a/lib/arch/CArchSystemUnix.cpp b/lib/arch/CArchSystemUnix.cpp
index 3235853d4..10e600709 100644
--- a/lib/arch/CArchSystemUnix.cpp
+++ b/lib/arch/CArchSystemUnix.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CArchSystemUnix.h"
diff --git a/lib/arch/CArchSystemUnix.h b/lib/arch/CArchSystemUnix.h
index 57e3dcbfd..367854acd 100644
--- a/lib/arch/CArchSystemUnix.h
+++ b/lib/arch/CArchSystemUnix.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CARCHSYSTEMUNIX_H
diff --git a/lib/arch/CArchSystemWindows.cpp b/lib/arch/CArchSystemWindows.cpp
index bd1f95213..9fd251206 100644
--- a/lib/arch/CArchSystemWindows.cpp
+++ b/lib/arch/CArchSystemWindows.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #define WIN32_LEAN_AND_MEAN
diff --git a/lib/arch/CArchSystemWindows.h b/lib/arch/CArchSystemWindows.h
index c40868a84..2df0c1c01 100644
--- a/lib/arch/CArchSystemWindows.h
+++ b/lib/arch/CArchSystemWindows.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CARCHSYSTEMWINDOWS_H
diff --git a/lib/arch/CArchTaskBarWindows.cpp b/lib/arch/CArchTaskBarWindows.cpp
index 8b0f6e8fa..b9fdc06cd 100644
--- a/lib/arch/CArchTaskBarWindows.cpp
+++ b/lib/arch/CArchTaskBarWindows.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CArchTaskBarWindows.h"
diff --git a/lib/arch/CArchTaskBarWindows.h b/lib/arch/CArchTaskBarWindows.h
index 82aefcb2a..895617110 100644
--- a/lib/arch/CArchTaskBarWindows.h
+++ b/lib/arch/CArchTaskBarWindows.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CARCHTASKBARWINDOWS_H
diff --git a/lib/arch/CArchTaskBarXWindows.cpp b/lib/arch/CArchTaskBarXWindows.cpp
index 075c7cba3..76c247d28 100644
--- a/lib/arch/CArchTaskBarXWindows.cpp
+++ b/lib/arch/CArchTaskBarXWindows.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CArchTaskBarXWindows.h"
diff --git a/lib/arch/CArchTaskBarXWindows.h b/lib/arch/CArchTaskBarXWindows.h
index 0b74a8172..214d0bbe9 100644
--- a/lib/arch/CArchTaskBarXWindows.h
+++ b/lib/arch/CArchTaskBarXWindows.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CARCHTASKBARXWINDOWS_H
diff --git a/lib/arch/CArchTimeUnix.cpp b/lib/arch/CArchTimeUnix.cpp
index 49506bade..e7c7ef130 100644
--- a/lib/arch/CArchTimeUnix.cpp
+++ b/lib/arch/CArchTimeUnix.cpp
@@ -1,15 +1,19 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
- * This package is free software you can redistribute it and/or
+ * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
  * 
  * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CArchTimeUnix.h"
diff --git a/lib/arch/CArchTimeUnix.h b/lib/arch/CArchTimeUnix.h
index 78c6ff6f8..162d8ac9f 100644
--- a/lib/arch/CArchTimeUnix.h
+++ b/lib/arch/CArchTimeUnix.h
@@ -1,15 +1,19 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
- * This package is free software you can redistribute it and/or
+ * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
  * 
  * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CARCHTIMEUNIX_H
diff --git a/lib/arch/CArchTimeWindows.cpp b/lib/arch/CArchTimeWindows.cpp
index 57aee2901..29efc0946 100644
--- a/lib/arch/CArchTimeWindows.cpp
+++ b/lib/arch/CArchTimeWindows.cpp
@@ -1,15 +1,19 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
- * This package is free software you can redistribute it and/or
+ * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
  * 
  * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 // avoid getting a lot a crap from mmsystem.h that we don't need
diff --git a/lib/arch/CArchTimeWindows.h b/lib/arch/CArchTimeWindows.h
index fb9b1e9f3..cf8e78d6b 100644
--- a/lib/arch/CArchTimeWindows.h
+++ b/lib/arch/CArchTimeWindows.h
@@ -1,15 +1,19 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
- * This package is free software you can redistribute it and/or
+ * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
  * 
  * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CARCHTIMEWINDOWS_H
diff --git a/lib/arch/CMultibyte.cpp b/lib/arch/CMultibyte.cpp
index 81999ed91..acf3c9ff6 100644
--- a/lib/arch/CMultibyte.cpp
+++ b/lib/arch/CMultibyte.cpp
@@ -1,15 +1,19 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
- * This package is free software you can redistribute it and/or
+ * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
  * 
  * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CMULTIBYTE_H
diff --git a/lib/arch/IArchAppUtil.h b/lib/arch/IArchAppUtil.h
index 028e4ce7e..2617d323e 100644
--- a/lib/arch/IArchAppUtil.h
+++ b/lib/arch/IArchAppUtil.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  
 #pragma once
diff --git a/lib/arch/IArchConsole.h b/lib/arch/IArchConsole.h
index 76e788536..2b09bbca9 100644
--- a/lib/arch/IArchConsole.h
+++ b/lib/arch/IArchConsole.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef IARCHCONSOLE_H
diff --git a/lib/arch/IArchDaemon.h b/lib/arch/IArchDaemon.h
index ba6b049b2..a32de2197 100644
--- a/lib/arch/IArchDaemon.h
+++ b/lib/arch/IArchDaemon.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef IARCHDAEMON_H
diff --git a/lib/arch/IArchFile.h b/lib/arch/IArchFile.h
index 8594053da..e444832b3 100644
--- a/lib/arch/IArchFile.h
+++ b/lib/arch/IArchFile.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef IARCHFILE_H
diff --git a/lib/arch/IArchLog.h b/lib/arch/IArchLog.h
index 7655ff95a..1e3441047 100644
--- a/lib/arch/IArchLog.h
+++ b/lib/arch/IArchLog.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef IARCHLOG_H
diff --git a/lib/arch/IArchMultithread.h b/lib/arch/IArchMultithread.h
index b7b722936..dffae792e 100644
--- a/lib/arch/IArchMultithread.h
+++ b/lib/arch/IArchMultithread.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef IARCHMULTITHREAD_H
diff --git a/lib/arch/IArchNetwork.h b/lib/arch/IArchNetwork.h
index 007fb4423..b80c1ee3e 100644
--- a/lib/arch/IArchNetwork.h
+++ b/lib/arch/IArchNetwork.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef IARCHNETWORK_H
diff --git a/lib/arch/IArchSleep.h b/lib/arch/IArchSleep.h
index 95a2852c1..74bd88872 100644
--- a/lib/arch/IArchSleep.h
+++ b/lib/arch/IArchSleep.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef IARCHSLEEP_H
diff --git a/lib/arch/IArchString.h b/lib/arch/IArchString.h
index 703d64b15..e44e42f1e 100644
--- a/lib/arch/IArchString.h
+++ b/lib/arch/IArchString.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef IARCHSTRING_H
diff --git a/lib/arch/IArchSystem.h b/lib/arch/IArchSystem.h
index dcea106bc..d951df1b6 100644
--- a/lib/arch/IArchSystem.h
+++ b/lib/arch/IArchSystem.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef IARCHSYSTEM_H
diff --git a/lib/arch/IArchTaskBar.h b/lib/arch/IArchTaskBar.h
index e94715661..1107b5fcb 100644
--- a/lib/arch/IArchTaskBar.h
+++ b/lib/arch/IArchTaskBar.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef IARCHTASKBAR_H
diff --git a/lib/arch/IArchTaskBarReceiver.h b/lib/arch/IArchTaskBarReceiver.h
index 9f6730d64..1114397b0 100644
--- a/lib/arch/IArchTaskBarReceiver.h
+++ b/lib/arch/IArchTaskBarReceiver.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef IARCHTASKBARRECEIVER_H
diff --git a/lib/arch/IArchTime.h b/lib/arch/IArchTime.h
index dade64bb6..f5873c2e2 100644
--- a/lib/arch/IArchTime.h
+++ b/lib/arch/IArchTime.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef IARCHTIME_H
diff --git a/lib/arch/XArch.cpp b/lib/arch/XArch.cpp
index 9dce52835..3874419c7 100644
--- a/lib/arch/XArch.cpp
+++ b/lib/arch/XArch.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "XArch.h"
diff --git a/lib/arch/XArch.h b/lib/arch/XArch.h
index 75083649a..1c999f9ce 100644
--- a/lib/arch/XArch.h
+++ b/lib/arch/XArch.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef XARCH_H
diff --git a/lib/arch/XArchUnix.cpp b/lib/arch/XArchUnix.cpp
index 6779f3a5d..93c3e3f1e 100644
--- a/lib/arch/XArchUnix.cpp
+++ b/lib/arch/XArchUnix.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "XArchUnix.h"
diff --git a/lib/arch/XArchUnix.h b/lib/arch/XArchUnix.h
index 19e0df4c0..02e6e4868 100644
--- a/lib/arch/XArchUnix.h
+++ b/lib/arch/XArchUnix.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef XARCHUNIX_H
diff --git a/lib/arch/XArchWindows.cpp b/lib/arch/XArchWindows.cpp
index eebd64495..05ea69e50 100644
--- a/lib/arch/XArchWindows.cpp
+++ b/lib/arch/XArchWindows.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "XArchWindows.h"
diff --git a/lib/arch/XArchWindows.h b/lib/arch/XArchWindows.h
index 56c240070..c94a1f9f5 100644
--- a/lib/arch/XArchWindows.h
+++ b/lib/arch/XArchWindows.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef XARCHWINDOWS_H
diff --git a/lib/arch/vsnprintf.cpp b/lib/arch/vsnprintf.cpp
index 10800ec75..8a33f6b1e 100644
--- a/lib/arch/vsnprintf.cpp
+++ b/lib/arch/vsnprintf.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #if HAVE_VSNPRINTF
diff --git a/lib/base/CEvent.cpp b/lib/base/CEvent.cpp
index bfdf88ed5..0cdc8bd41 100644
--- a/lib/base/CEvent.cpp
+++ b/lib/base/CEvent.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CEvent.h"
diff --git a/lib/base/CEvent.h b/lib/base/CEvent.h
index 8b637ceff..3be3160d7 100644
--- a/lib/base/CEvent.h
+++ b/lib/base/CEvent.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CEVENT_H
diff --git a/lib/base/CEventQueue.cpp b/lib/base/CEventQueue.cpp
index d0a93391c..8a1af9a4b 100644
--- a/lib/base/CEventQueue.cpp
+++ b/lib/base/CEventQueue.cpp
@@ -1,5 +1,6 @@
-;/*
- * synergy -- mouse and keyboard sharing utility
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CEventQueue.h"
diff --git a/lib/base/CEventQueue.h b/lib/base/CEventQueue.h
index a63c7b160..91323630f 100644
--- a/lib/base/CEventQueue.h
+++ b/lib/base/CEventQueue.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CEVENTQUEUE_H
diff --git a/lib/base/CFunctionEventJob.cpp b/lib/base/CFunctionEventJob.cpp
index 5afdc9888..8c1d06b90 100644
--- a/lib/base/CFunctionEventJob.cpp
+++ b/lib/base/CFunctionEventJob.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CFunctionEventJob.h"
diff --git a/lib/base/CFunctionEventJob.h b/lib/base/CFunctionEventJob.h
index 517b9c45e..23a7e675d 100644
--- a/lib/base/CFunctionEventJob.h
+++ b/lib/base/CFunctionEventJob.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CFUNCTIONEVENTJOB_H
diff --git a/lib/base/CFunctionJob.cpp b/lib/base/CFunctionJob.cpp
index bc16c5099..824abf328 100644
--- a/lib/base/CFunctionJob.cpp
+++ b/lib/base/CFunctionJob.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CFunctionJob.h"
diff --git a/lib/base/CFunctionJob.h b/lib/base/CFunctionJob.h
index e30bbfa2c..a5707d039 100644
--- a/lib/base/CFunctionJob.h
+++ b/lib/base/CFunctionJob.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CFUNCTIONJOB_H
diff --git a/lib/base/CLog.cpp b/lib/base/CLog.cpp
index d598b1d3e..453f61226 100644
--- a/lib/base/CLog.cpp
+++ b/lib/base/CLog.cpp
@@ -1,15 +1,19 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
- *
+ * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
- *
+ * 
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CLog.h"
diff --git a/lib/base/CLog.h b/lib/base/CLog.h
index d766631bf..b9b992acd 100644
--- a/lib/base/CLog.h
+++ b/lib/base/CLog.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CLOG_H
diff --git a/lib/base/CPriorityQueue.h b/lib/base/CPriorityQueue.h
index 29129e31d..447d673b7 100644
--- a/lib/base/CPriorityQueue.h
+++ b/lib/base/CPriorityQueue.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CPRIORITYQUEUE_H
diff --git a/lib/base/CSimpleEventQueueBuffer.cpp b/lib/base/CSimpleEventQueueBuffer.cpp
index 8f2dbd149..6550a441d 100644
--- a/lib/base/CSimpleEventQueueBuffer.cpp
+++ b/lib/base/CSimpleEventQueueBuffer.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CSimpleEventQueueBuffer.h"
diff --git a/lib/base/CSimpleEventQueueBuffer.h b/lib/base/CSimpleEventQueueBuffer.h
index c395fabd0..3645aa357 100644
--- a/lib/base/CSimpleEventQueueBuffer.h
+++ b/lib/base/CSimpleEventQueueBuffer.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CSIMPLEEVENTQUEUEBUFFER_H
diff --git a/lib/base/CStopwatch.cpp b/lib/base/CStopwatch.cpp
index 89edce2b6..ff786ecb1 100644
--- a/lib/base/CStopwatch.cpp
+++ b/lib/base/CStopwatch.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CStopwatch.h"
diff --git a/lib/base/CStopwatch.h b/lib/base/CStopwatch.h
index e6a347190..4259f199a 100644
--- a/lib/base/CStopwatch.h
+++ b/lib/base/CStopwatch.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CSTOPWATCH_H
diff --git a/lib/base/CString.h b/lib/base/CString.h
index bc905009f..d4f12d8a8 100644
--- a/lib/base/CString.h
+++ b/lib/base/CString.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CSTRING_H
diff --git a/lib/base/CStringUtil.cpp b/lib/base/CStringUtil.cpp
index 0ef1df42c..12b12afe9 100644
--- a/lib/base/CStringUtil.cpp
+++ b/lib/base/CStringUtil.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CStringUtil.h"
diff --git a/lib/base/CStringUtil.h b/lib/base/CStringUtil.h
index 8ee866471..e35e3cdd0 100644
--- a/lib/base/CStringUtil.h
+++ b/lib/base/CStringUtil.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CSTRINGUTIL_H
diff --git a/lib/base/CUnicode.cpp b/lib/base/CUnicode.cpp
index cd8ffb0d8..9ad324894 100644
--- a/lib/base/CUnicode.cpp
+++ b/lib/base/CUnicode.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CUnicode.h"
diff --git a/lib/base/CUnicode.h b/lib/base/CUnicode.h
index 85afbfd98..3817873d6 100644
--- a/lib/base/CUnicode.h
+++ b/lib/base/CUnicode.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CUNICODE_H
diff --git a/lib/base/IEventJob.h b/lib/base/IEventJob.h
index 01ef9a96f..773ec3615 100644
--- a/lib/base/IEventJob.h
+++ b/lib/base/IEventJob.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef IEVENTJOB_H
diff --git a/lib/base/IEventQueue.cpp b/lib/base/IEventQueue.cpp
index a10621f2a..82f80ca80 100644
--- a/lib/base/IEventQueue.cpp
+++ b/lib/base/IEventQueue.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "IEventQueue.h"
diff --git a/lib/base/IEventQueue.h b/lib/base/IEventQueue.h
index 6f48f25c4..33855c8e9 100644
--- a/lib/base/IEventQueue.h
+++ b/lib/base/IEventQueue.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef IEVENTQUEUE_H
diff --git a/lib/base/IEventQueueBuffer.h b/lib/base/IEventQueueBuffer.h
index 1aff51a64..106038472 100644
--- a/lib/base/IEventQueueBuffer.h
+++ b/lib/base/IEventQueueBuffer.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef IEVENTQUEUEBUFFER_H
diff --git a/lib/base/IJob.h b/lib/base/IJob.h
index 30ef5f5ac..c38518ee7 100644
--- a/lib/base/IJob.h
+++ b/lib/base/IJob.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef IJOB_H
diff --git a/lib/base/ILogOutputter.h b/lib/base/ILogOutputter.h
index c75c643c3..a8ea35081 100644
--- a/lib/base/ILogOutputter.h
+++ b/lib/base/ILogOutputter.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef ILOGOUTPUTTER_H
diff --git a/lib/base/LogOutputters.cpp b/lib/base/LogOutputters.cpp
index cde5802ac..870603304 100644
--- a/lib/base/LogOutputters.cpp
+++ b/lib/base/LogOutputters.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "LogOutputters.h"
diff --git a/lib/base/LogOutputters.h b/lib/base/LogOutputters.h
index 01bae609e..dbb359c0e 100644
--- a/lib/base/LogOutputters.h
+++ b/lib/base/LogOutputters.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef LOGOUTPUTTERS_H
diff --git a/lib/base/TMethodEventJob.h b/lib/base/TMethodEventJob.h
index 15826be08..1b47779a7 100644
--- a/lib/base/TMethodEventJob.h
+++ b/lib/base/TMethodEventJob.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CMETHODEVENTJOB_H
diff --git a/lib/base/TMethodJob.h b/lib/base/TMethodJob.h
index 54cd936b1..93b807f17 100644
--- a/lib/base/TMethodJob.h
+++ b/lib/base/TMethodJob.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CMETHODJOB_H
diff --git a/lib/base/XBase.cpp b/lib/base/XBase.cpp
index 022be306f..692d2fa00 100644
--- a/lib/base/XBase.cpp
+++ b/lib/base/XBase.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "XBase.h"
diff --git a/lib/base/XBase.h b/lib/base/XBase.h
index e9161d70e..803f49ec4 100644
--- a/lib/base/XBase.h
+++ b/lib/base/XBase.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef XBASE_H
diff --git a/lib/client/CClient.cpp b/lib/client/CClient.cpp
index a118cb6ac..ef2c242ab 100644
--- a/lib/client/CClient.cpp
+++ b/lib/client/CClient.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CClient.h"
diff --git a/lib/client/CClient.h b/lib/client/CClient.h
index 066fcc613..695258499 100644
--- a/lib/client/CClient.h
+++ b/lib/client/CClient.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CCLIENT_H
diff --git a/lib/client/CServerProxy.cpp b/lib/client/CServerProxy.cpp
index bcd9a8b33..de3fe8644 100644
--- a/lib/client/CServerProxy.cpp
+++ b/lib/client/CServerProxy.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CServerProxy.h"
diff --git a/lib/client/CServerProxy.h b/lib/client/CServerProxy.h
index f66426966..7b90c8bf8 100644
--- a/lib/client/CServerProxy.h
+++ b/lib/client/CServerProxy.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CSERVERPROXY_H
diff --git a/lib/common/BasicTypes.h b/lib/common/BasicTypes.h
index de42d4010..e7beb77ca 100644
--- a/lib/common/BasicTypes.h
+++ b/lib/common/BasicTypes.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef BASICTYPES_H
diff --git a/lib/common/IInterface.h b/lib/common/IInterface.h
index 97df31c28..9e354dcbe 100644
--- a/lib/common/IInterface.h
+++ b/lib/common/IInterface.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef IINTERFACE_H
diff --git a/lib/common/MacOSXPrecomp.h b/lib/common/MacOSXPrecomp.h
index 64e7c90a2..f1967517e 100644
--- a/lib/common/MacOSXPrecomp.h
+++ b/lib/common/MacOSXPrecomp.h
@@ -1,4 +1,22 @@
-//
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2002 Chris Schoeneman
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+ //
 // Prefix header for all source files of the 'deleteme' target in the 'deleteme' project.
 //
 
diff --git a/lib/common/Version.cpp b/lib/common/Version.cpp
index c8ff54d0e..74d2f029c 100644
--- a/lib/common/Version.cpp
+++ b/lib/common/Version.cpp
@@ -1,15 +1,19 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
- *
+ * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
- *
+ * 
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "Version.h"
diff --git a/lib/common/Version.h b/lib/common/Version.h
index c5501c2a2..ab3070bb5 100644
--- a/lib/common/Version.h
+++ b/lib/common/Version.h
@@ -1,15 +1,19 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
- *
+ * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
- *
+ * 
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef VERSION_H
diff --git a/lib/common/common.h b/lib/common/common.h
index a470bbb53..f65ca28a3 100644
--- a/lib/common/common.h
+++ b/lib/common/common.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef COMMON_H
diff --git a/lib/common/stdbitset.h b/lib/common/stdbitset.h
index 529772ca5..0513fc91a 100644
--- a/lib/common/stdbitset.h
+++ b/lib/common/stdbitset.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "stdpre.h"
diff --git a/lib/common/stddeque.h b/lib/common/stddeque.h
index 06bdafd15..3418370ed 100644
--- a/lib/common/stddeque.h
+++ b/lib/common/stddeque.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "stdpre.h"
diff --git a/lib/common/stdfstream.h b/lib/common/stdfstream.h
index 9d1f5aa62..1dd4a73ee 100644
--- a/lib/common/stdfstream.h
+++ b/lib/common/stdfstream.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "stdpre.h"
diff --git a/lib/common/stdistream.h b/lib/common/stdistream.h
index 336673985..cacdf46c6 100644
--- a/lib/common/stdistream.h
+++ b/lib/common/stdistream.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "stdpre.h"
diff --git a/lib/common/stdlist.h b/lib/common/stdlist.h
index 6f0df8e84..94d24f404 100644
--- a/lib/common/stdlist.h
+++ b/lib/common/stdlist.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "stdpre.h"
diff --git a/lib/common/stdmap.h b/lib/common/stdmap.h
index da501615e..a667a9378 100644
--- a/lib/common/stdmap.h
+++ b/lib/common/stdmap.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "stdpre.h"
diff --git a/lib/common/stdostream.h b/lib/common/stdostream.h
index 48e898623..a80b74a3a 100644
--- a/lib/common/stdostream.h
+++ b/lib/common/stdostream.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "stdpre.h"
diff --git a/lib/common/stdpost.h b/lib/common/stdpost.h
index 0f06b74a8..b5e0e9e56 100644
--- a/lib/common/stdpost.h
+++ b/lib/common/stdpost.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #if defined(_MSC_VER)
diff --git a/lib/common/stdpre.h b/lib/common/stdpre.h
index 10fa7d5da..8d1c1d702 100644
--- a/lib/common/stdpre.h
+++ b/lib/common/stdpre.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #if defined(_MSC_VER)
diff --git a/lib/common/stdset.h b/lib/common/stdset.h
index aeb491b6d..5b8e65329 100644
--- a/lib/common/stdset.h
+++ b/lib/common/stdset.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "stdpre.h"
diff --git a/lib/common/stdsstream.h b/lib/common/stdsstream.h
index 45b281248..a5bef02b9 100644
--- a/lib/common/stdsstream.h
+++ b/lib/common/stdsstream.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "stdpre.h"
diff --git a/lib/common/stdstring.h b/lib/common/stdstring.h
index 3d83c03cf..75cc41f04 100644
--- a/lib/common/stdstring.h
+++ b/lib/common/stdstring.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "stdpre.h"
diff --git a/lib/common/stdvector.h b/lib/common/stdvector.h
index 1056bb466..198757ee6 100644
--- a/lib/common/stdvector.h
+++ b/lib/common/stdvector.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "stdpre.h"
diff --git a/lib/io/CStreamBuffer.cpp b/lib/io/CStreamBuffer.cpp
index 811cbe825..5db4b9e07 100644
--- a/lib/io/CStreamBuffer.cpp
+++ b/lib/io/CStreamBuffer.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CStreamBuffer.h"
diff --git a/lib/io/CStreamBuffer.h b/lib/io/CStreamBuffer.h
index fafcc72be..760b567c1 100644
--- a/lib/io/CStreamBuffer.h
+++ b/lib/io/CStreamBuffer.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CSTREAMBUFFER_H
diff --git a/lib/io/CStreamFilter.cpp b/lib/io/CStreamFilter.cpp
index 312b0dfdb..00cf633f1 100644
--- a/lib/io/CStreamFilter.cpp
+++ b/lib/io/CStreamFilter.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CStreamFilter.h"
diff --git a/lib/io/CStreamFilter.h b/lib/io/CStreamFilter.h
index 4dc87094b..47517e85b 100644
--- a/lib/io/CStreamFilter.h
+++ b/lib/io/CStreamFilter.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CSTREAMFILTER_H
diff --git a/lib/io/IStream.cpp b/lib/io/IStream.cpp
index aec65b61a..8e207efd9 100644
--- a/lib/io/IStream.cpp
+++ b/lib/io/IStream.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "IStream.h"
diff --git a/lib/io/IStream.h b/lib/io/IStream.h
index cb5b54c92..65fa5ea3a 100644
--- a/lib/io/IStream.h
+++ b/lib/io/IStream.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef ISTREAM_H
diff --git a/lib/io/IStreamFilterFactory.h b/lib/io/IStreamFilterFactory.h
index 6e6c86efa..851b81714 100644
--- a/lib/io/IStreamFilterFactory.h
+++ b/lib/io/IStreamFilterFactory.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef ISTREAMFILTERFACTORY_H
diff --git a/lib/io/XIO.cpp b/lib/io/XIO.cpp
index b7101a4d4..4a2fa2d22 100644
--- a/lib/io/XIO.cpp
+++ b/lib/io/XIO.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "XIO.h"
diff --git a/lib/io/XIO.h b/lib/io/XIO.h
index cc41ef40d..b95f053bc 100644
--- a/lib/io/XIO.h
+++ b/lib/io/XIO.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef XIO_H
diff --git a/lib/mt/CCondVar.cpp b/lib/mt/CCondVar.cpp
index d13aedfdb..4f2da943e 100644
--- a/lib/mt/CCondVar.cpp
+++ b/lib/mt/CCondVar.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CCondVar.h"
diff --git a/lib/mt/CCondVar.h b/lib/mt/CCondVar.h
index a04102c49..7f7c4a813 100644
--- a/lib/mt/CCondVar.h
+++ b/lib/mt/CCondVar.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CCONDVAR_H
diff --git a/lib/mt/CLock.cpp b/lib/mt/CLock.cpp
index c943395b1..38a3475e9 100644
--- a/lib/mt/CLock.cpp
+++ b/lib/mt/CLock.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CLock.h"
diff --git a/lib/mt/CLock.h b/lib/mt/CLock.h
index f00e0cd19..533cbfaf3 100644
--- a/lib/mt/CLock.h
+++ b/lib/mt/CLock.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CLOCK_H
diff --git a/lib/mt/CMutex.cpp b/lib/mt/CMutex.cpp
index 0d2bab3ca..fea23da56 100644
--- a/lib/mt/CMutex.cpp
+++ b/lib/mt/CMutex.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CMutex.h"
diff --git a/lib/mt/CMutex.h b/lib/mt/CMutex.h
index c11eeee36..6773ecf8e 100644
--- a/lib/mt/CMutex.h
+++ b/lib/mt/CMutex.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CMUTEX_H
diff --git a/lib/mt/CThread.cpp b/lib/mt/CThread.cpp
index 195b7b672..806a650bd 100644
--- a/lib/mt/CThread.cpp
+++ b/lib/mt/CThread.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CThread.h"
diff --git a/lib/mt/CThread.h b/lib/mt/CThread.h
index 896d3778a..2f0484c3d 100644
--- a/lib/mt/CThread.h
+++ b/lib/mt/CThread.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CTHREAD_H
diff --git a/lib/mt/XMT.cpp b/lib/mt/XMT.cpp
index b10d2d79f..991a569f2 100644
--- a/lib/mt/XMT.cpp
+++ b/lib/mt/XMT.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "XMT.h"
diff --git a/lib/mt/XMT.h b/lib/mt/XMT.h
index f66428ea6..5dfbe1af4 100644
--- a/lib/mt/XMT.h
+++ b/lib/mt/XMT.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef XMT_H
diff --git a/lib/mt/XThread.h b/lib/mt/XThread.h
index 30dff1da3..e36840d9a 100644
--- a/lib/mt/XThread.h
+++ b/lib/mt/XThread.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef XTHREAD_H
diff --git a/lib/net/CNetworkAddress.cpp b/lib/net/CNetworkAddress.cpp
index 7daeed55a..69b2a33d0 100644
--- a/lib/net/CNetworkAddress.cpp
+++ b/lib/net/CNetworkAddress.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CNetworkAddress.h"
diff --git a/lib/net/CNetworkAddress.h b/lib/net/CNetworkAddress.h
index d29b93b1c..a4d2e8aa6 100644
--- a/lib/net/CNetworkAddress.h
+++ b/lib/net/CNetworkAddress.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CNETWORKADDRESS_H
diff --git a/lib/net/CSocketMultiplexer.cpp b/lib/net/CSocketMultiplexer.cpp
index faeba4238..ab3efd4ab 100644
--- a/lib/net/CSocketMultiplexer.cpp
+++ b/lib/net/CSocketMultiplexer.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CSocketMultiplexer.h"
diff --git a/lib/net/CSocketMultiplexer.h b/lib/net/CSocketMultiplexer.h
index bb96ca704..2ae389bcd 100644
--- a/lib/net/CSocketMultiplexer.h
+++ b/lib/net/CSocketMultiplexer.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CSOCKETMULTIPLEXER_H
diff --git a/lib/net/CTCPListenSocket.cpp b/lib/net/CTCPListenSocket.cpp
index 62c43a83a..526939a43 100644
--- a/lib/net/CTCPListenSocket.cpp
+++ b/lib/net/CTCPListenSocket.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CTCPListenSocket.h"
diff --git a/lib/net/CTCPListenSocket.h b/lib/net/CTCPListenSocket.h
index 5321b8db0..b0b1ebaa1 100644
--- a/lib/net/CTCPListenSocket.h
+++ b/lib/net/CTCPListenSocket.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CTCPLISTENSOCKET_H
diff --git a/lib/net/CTCPSocket.cpp b/lib/net/CTCPSocket.cpp
index 2b88f7a22..4311b27b4 100644
--- a/lib/net/CTCPSocket.cpp
+++ b/lib/net/CTCPSocket.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CTCPSocket.h"
diff --git a/lib/net/CTCPSocket.h b/lib/net/CTCPSocket.h
index aa1df8c11..a078024ed 100644
--- a/lib/net/CTCPSocket.h
+++ b/lib/net/CTCPSocket.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CTCPSOCKET_H
diff --git a/lib/net/CTCPSocketFactory.cpp b/lib/net/CTCPSocketFactory.cpp
index f590efa05..54a0f239b 100644
--- a/lib/net/CTCPSocketFactory.cpp
+++ b/lib/net/CTCPSocketFactory.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CTCPSocketFactory.h"
diff --git a/lib/net/CTCPSocketFactory.h b/lib/net/CTCPSocketFactory.h
index 2b946d19f..cef3e5ed1 100644
--- a/lib/net/CTCPSocketFactory.h
+++ b/lib/net/CTCPSocketFactory.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CTCPSOCKETFACTORY_H
diff --git a/lib/net/IDataSocket.cpp b/lib/net/IDataSocket.cpp
index dc4b08edb..81966a607 100644
--- a/lib/net/IDataSocket.cpp
+++ b/lib/net/IDataSocket.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "IDataSocket.h"
diff --git a/lib/net/IDataSocket.h b/lib/net/IDataSocket.h
index 21bef9b18..76760683f 100644
--- a/lib/net/IDataSocket.h
+++ b/lib/net/IDataSocket.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef IDATASOCKET_H
diff --git a/lib/net/IListenSocket.cpp b/lib/net/IListenSocket.cpp
index 20dbc9a41..14338f8ce 100644
--- a/lib/net/IListenSocket.cpp
+++ b/lib/net/IListenSocket.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "IListenSocket.h"
diff --git a/lib/net/IListenSocket.h b/lib/net/IListenSocket.h
index 894234f42..3152ce8df 100644
--- a/lib/net/IListenSocket.h
+++ b/lib/net/IListenSocket.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef ILISTENSOCKET_H
diff --git a/lib/net/ISocket.cpp b/lib/net/ISocket.cpp
index a9aaf1acf..a8d131940 100644
--- a/lib/net/ISocket.cpp
+++ b/lib/net/ISocket.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "ISocket.h"
diff --git a/lib/net/ISocket.h b/lib/net/ISocket.h
index 4452e023d..431082525 100644
--- a/lib/net/ISocket.h
+++ b/lib/net/ISocket.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef ISOCKET_H
diff --git a/lib/net/ISocketFactory.h b/lib/net/ISocketFactory.h
index dbf9ae26f..41f561246 100644
--- a/lib/net/ISocketFactory.h
+++ b/lib/net/ISocketFactory.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef ISOCKETFACTORY_H
diff --git a/lib/net/ISocketMultiplexerJob.h b/lib/net/ISocketMultiplexerJob.h
index ac722326d..9394c0b3f 100644
--- a/lib/net/ISocketMultiplexerJob.h
+++ b/lib/net/ISocketMultiplexerJob.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef ISOCKETMULTIPLEXERJOB_H
diff --git a/lib/net/TSocketMultiplexerMethodJob.h b/lib/net/TSocketMultiplexerMethodJob.h
index 992885c4b..1a8fdc331 100644
--- a/lib/net/TSocketMultiplexerMethodJob.h
+++ b/lib/net/TSocketMultiplexerMethodJob.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef TSOCKERMULTIPLEXERMETHODJOB_H
diff --git a/lib/net/XSocket.cpp b/lib/net/XSocket.cpp
index 8471538a1..38e46090f 100644
--- a/lib/net/XSocket.cpp
+++ b/lib/net/XSocket.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "XSocket.h"
diff --git a/lib/net/XSocket.h b/lib/net/XSocket.h
index f84285b91..27075dc40 100644
--- a/lib/net/XSocket.h
+++ b/lib/net/XSocket.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef XSOCKET_H
diff --git a/lib/platform/CMSWindowsClipboard.cpp b/lib/platform/CMSWindowsClipboard.cpp
index 7df9db9f5..e95689c28 100644
--- a/lib/platform/CMSWindowsClipboard.cpp
+++ b/lib/platform/CMSWindowsClipboard.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CMSWindowsClipboard.h"
diff --git a/lib/platform/CMSWindowsClipboard.h b/lib/platform/CMSWindowsClipboard.h
index e9b59fb9e..404400659 100644
--- a/lib/platform/CMSWindowsClipboard.h
+++ b/lib/platform/CMSWindowsClipboard.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CMSWINDOWSCLIPBOARD_H
diff --git a/lib/platform/CMSWindowsClipboardAnyTextConverter.cpp b/lib/platform/CMSWindowsClipboardAnyTextConverter.cpp
index 77832f130..92ba55b4c 100644
--- a/lib/platform/CMSWindowsClipboardAnyTextConverter.cpp
+++ b/lib/platform/CMSWindowsClipboardAnyTextConverter.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CMSWindowsClipboardAnyTextConverter.h"
diff --git a/lib/platform/CMSWindowsClipboardAnyTextConverter.h b/lib/platform/CMSWindowsClipboardAnyTextConverter.h
index 254099f2f..9a3abcac8 100644
--- a/lib/platform/CMSWindowsClipboardAnyTextConverter.h
+++ b/lib/platform/CMSWindowsClipboardAnyTextConverter.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CMSWINDOWSCLIPBOARDANYTEXTCONVERTER_H
diff --git a/lib/platform/CMSWindowsClipboardBitmapConverter.cpp b/lib/platform/CMSWindowsClipboardBitmapConverter.cpp
index f7771aa9f..9605ab0be 100644
--- a/lib/platform/CMSWindowsClipboardBitmapConverter.cpp
+++ b/lib/platform/CMSWindowsClipboardBitmapConverter.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CMSWindowsClipboardBitmapConverter.h"
diff --git a/lib/platform/CMSWindowsClipboardBitmapConverter.h b/lib/platform/CMSWindowsClipboardBitmapConverter.h
index 6ddd7ce81..3545b70ce 100644
--- a/lib/platform/CMSWindowsClipboardBitmapConverter.h
+++ b/lib/platform/CMSWindowsClipboardBitmapConverter.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CMSWINDOWSCLIPBOARDBITMAPCONVERTER_H
diff --git a/lib/platform/CMSWindowsClipboardHTMLConverter.cpp b/lib/platform/CMSWindowsClipboardHTMLConverter.cpp
index 779122f39..09f703c1d 100644
--- a/lib/platform/CMSWindowsClipboardHTMLConverter.cpp
+++ b/lib/platform/CMSWindowsClipboardHTMLConverter.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CMSWindowsClipboardHTMLConverter.h"
diff --git a/lib/platform/CMSWindowsClipboardHTMLConverter.h b/lib/platform/CMSWindowsClipboardHTMLConverter.h
index 02cd8f88c..cba2a1ee2 100644
--- a/lib/platform/CMSWindowsClipboardHTMLConverter.h
+++ b/lib/platform/CMSWindowsClipboardHTMLConverter.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CMSWINDOWSCLIPBOARDHTMLCONVERTER_H
diff --git a/lib/platform/CMSWindowsClipboardTextConverter.cpp b/lib/platform/CMSWindowsClipboardTextConverter.cpp
index a735094a3..72f560d56 100644
--- a/lib/platform/CMSWindowsClipboardTextConverter.cpp
+++ b/lib/platform/CMSWindowsClipboardTextConverter.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CMSWindowsClipboardTextConverter.h"
diff --git a/lib/platform/CMSWindowsClipboardTextConverter.h b/lib/platform/CMSWindowsClipboardTextConverter.h
index 6f00d4754..75672f14d 100644
--- a/lib/platform/CMSWindowsClipboardTextConverter.h
+++ b/lib/platform/CMSWindowsClipboardTextConverter.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CMSWINDOWSCLIPBOARDTEXTCONVERTER_H
diff --git a/lib/platform/CMSWindowsClipboardUTF16Converter.cpp b/lib/platform/CMSWindowsClipboardUTF16Converter.cpp
index 81b85c608..3a3591c8f 100644
--- a/lib/platform/CMSWindowsClipboardUTF16Converter.cpp
+++ b/lib/platform/CMSWindowsClipboardUTF16Converter.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CMSWindowsClipboardUTF16Converter.h"
diff --git a/lib/platform/CMSWindowsClipboardUTF16Converter.h b/lib/platform/CMSWindowsClipboardUTF16Converter.h
index 51f477fa9..32a4e353e 100644
--- a/lib/platform/CMSWindowsClipboardUTF16Converter.h
+++ b/lib/platform/CMSWindowsClipboardUTF16Converter.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CMSWINDOWSCLIPBOARDUTF16CONVERTER_H
diff --git a/lib/platform/CMSWindowsDesks.cpp b/lib/platform/CMSWindowsDesks.cpp
index e1552a2cb..0cabac2a3 100644
--- a/lib/platform/CMSWindowsDesks.cpp
+++ b/lib/platform/CMSWindowsDesks.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CMSWindowsDesks.h"
diff --git a/lib/platform/CMSWindowsDesks.h b/lib/platform/CMSWindowsDesks.h
index 1771d5760..f52641152 100644
--- a/lib/platform/CMSWindowsDesks.h
+++ b/lib/platform/CMSWindowsDesks.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CMSWINDOWSDESKS_H
diff --git a/lib/platform/CMSWindowsEventQueueBuffer.cpp b/lib/platform/CMSWindowsEventQueueBuffer.cpp
index 5bab2855e..a499946a3 100644
--- a/lib/platform/CMSWindowsEventQueueBuffer.cpp
+++ b/lib/platform/CMSWindowsEventQueueBuffer.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CMSWindowsEventQueueBuffer.h"
diff --git a/lib/platform/CMSWindowsEventQueueBuffer.h b/lib/platform/CMSWindowsEventQueueBuffer.h
index 28d8a2f6b..575f83db5 100644
--- a/lib/platform/CMSWindowsEventQueueBuffer.h
+++ b/lib/platform/CMSWindowsEventQueueBuffer.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CMSWINDOWSEVENTQUEUEBUFFER_H
diff --git a/lib/platform/CMSWindowsKeyState.cpp b/lib/platform/CMSWindowsKeyState.cpp
index e675a4b8b..817602208 100644
--- a/lib/platform/CMSWindowsKeyState.cpp
+++ b/lib/platform/CMSWindowsKeyState.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CMSWindowsKeyState.h"
diff --git a/lib/platform/CMSWindowsKeyState.h b/lib/platform/CMSWindowsKeyState.h
index d8320a585..da59a7992 100644
--- a/lib/platform/CMSWindowsKeyState.h
+++ b/lib/platform/CMSWindowsKeyState.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CMSWINDOWSKEYSTATE_H
diff --git a/lib/platform/CMSWindowsRelauncher.cpp b/lib/platform/CMSWindowsRelauncher.cpp
index 8341021e1..c1cda9805 100644
--- a/lib/platform/CMSWindowsRelauncher.cpp
+++ b/lib/platform/CMSWindowsRelauncher.cpp
@@ -1,3 +1,20 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2010 The Synergy+ Project
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "CMSWindowsRelauncher.h"
 #include "CThread.h"
 #include "TMethodJob.h"
diff --git a/lib/platform/CMSWindowsRelauncher.h b/lib/platform/CMSWindowsRelauncher.h
index 895ef2b92..6577a2763 100644
--- a/lib/platform/CMSWindowsRelauncher.h
+++ b/lib/platform/CMSWindowsRelauncher.h
@@ -1,3 +1,20 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2010 The Synergy+ Project
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 
 #define WIN32_LEAN_AND_MEAN
diff --git a/lib/platform/CMSWindowsScreen.cpp b/lib/platform/CMSWindowsScreen.cpp
index 87162feb8..fc1568fcb 100644
--- a/lib/platform/CMSWindowsScreen.cpp
+++ b/lib/platform/CMSWindowsScreen.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CMSWindowsScreen.h"
diff --git a/lib/platform/CMSWindowsScreen.h b/lib/platform/CMSWindowsScreen.h
index 6d29bf96c..43c28a2bb 100644
--- a/lib/platform/CMSWindowsScreen.h
+++ b/lib/platform/CMSWindowsScreen.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CMSWINDOWSSCREEN_H
diff --git a/lib/platform/CMSWindowsScreenSaver.cpp b/lib/platform/CMSWindowsScreenSaver.cpp
index 7217338fc..51aef2e7a 100644
--- a/lib/platform/CMSWindowsScreenSaver.cpp
+++ b/lib/platform/CMSWindowsScreenSaver.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CMSWindowsScreenSaver.h"
diff --git a/lib/platform/CMSWindowsScreenSaver.h b/lib/platform/CMSWindowsScreenSaver.h
index bb43c7030..257b6a8de 100644
--- a/lib/platform/CMSWindowsScreenSaver.h
+++ b/lib/platform/CMSWindowsScreenSaver.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CMSWINDOWSSCREENSAVER_H
diff --git a/lib/platform/CMSWindowsUtil.cpp b/lib/platform/CMSWindowsUtil.cpp
index 4b3e3f4ca..c6982e4bf 100644
--- a/lib/platform/CMSWindowsUtil.cpp
+++ b/lib/platform/CMSWindowsUtil.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CMSWindowsUtil.h"
diff --git a/lib/platform/CMSWindowsUtil.h b/lib/platform/CMSWindowsUtil.h
index 5c4d14f5e..d8b8f823f 100644
--- a/lib/platform/CMSWindowsUtil.h
+++ b/lib/platform/CMSWindowsUtil.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CMSWINDOWSUTIL_H
diff --git a/lib/platform/COSXClipboard.cpp b/lib/platform/COSXClipboard.cpp
index bdf941b0d..174af7d3f 100644
--- a/lib/platform/COSXClipboard.cpp
+++ b/lib/platform/COSXClipboard.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CClipboard.h"
diff --git a/lib/platform/COSXClipboard.h b/lib/platform/COSXClipboard.h
index 76902b3c6..32f387a07 100644
--- a/lib/platform/COSXClipboard.h
+++ b/lib/platform/COSXClipboard.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef COSXCLIPBOARD_H
diff --git a/lib/platform/COSXClipboardAnyTextConverter.cpp b/lib/platform/COSXClipboardAnyTextConverter.cpp
index 67fc3029a..1bd993503 100644
--- a/lib/platform/COSXClipboardAnyTextConverter.cpp
+++ b/lib/platform/COSXClipboardAnyTextConverter.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "COSXClipboardAnyTextConverter.h"
diff --git a/lib/platform/COSXClipboardAnyTextConverter.h b/lib/platform/COSXClipboardAnyTextConverter.h
index fe2eb9bf7..79444211e 100644
--- a/lib/platform/COSXClipboardAnyTextConverter.h
+++ b/lib/platform/COSXClipboardAnyTextConverter.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef COSXCLIPBOARDANYTEXTCONVERTER_H
diff --git a/lib/platform/COSXClipboardTextConverter.cpp b/lib/platform/COSXClipboardTextConverter.cpp
index 03c3a4f34..7a798afd0 100644
--- a/lib/platform/COSXClipboardTextConverter.cpp
+++ b/lib/platform/COSXClipboardTextConverter.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "COSXClipboardTextConverter.h"
diff --git a/lib/platform/COSXClipboardTextConverter.h b/lib/platform/COSXClipboardTextConverter.h
index d71a09239..805d1bd98 100644
--- a/lib/platform/COSXClipboardTextConverter.h
+++ b/lib/platform/COSXClipboardTextConverter.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef COSXCLIPBOARDTEXTCONVERTER_H
diff --git a/lib/platform/COSXClipboardUTF16Converter.cpp b/lib/platform/COSXClipboardUTF16Converter.cpp
index 908f91b6b..0f85419a3 100644
--- a/lib/platform/COSXClipboardUTF16Converter.cpp
+++ b/lib/platform/COSXClipboardUTF16Converter.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "COSXClipboardUTF16Converter.h"
diff --git a/lib/platform/COSXClipboardUTF16Converter.h b/lib/platform/COSXClipboardUTF16Converter.h
index 9a114b3b6..1d9ff6906 100644
--- a/lib/platform/COSXClipboardUTF16Converter.h
+++ b/lib/platform/COSXClipboardUTF16Converter.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef COSXCLIPBOARDUTF16CONVERTER_H
diff --git a/lib/platform/COSXEventQueueBuffer.cpp b/lib/platform/COSXEventQueueBuffer.cpp
index 5bd0d7477..7adf489de 100644
--- a/lib/platform/COSXEventQueueBuffer.cpp
+++ b/lib/platform/COSXEventQueueBuffer.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "COSXEventQueueBuffer.h"
diff --git a/lib/platform/COSXEventQueueBuffer.h b/lib/platform/COSXEventQueueBuffer.h
index 2160b410a..a949f1b01 100644
--- a/lib/platform/COSXEventQueueBuffer.h
+++ b/lib/platform/COSXEventQueueBuffer.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef COSXEVENTQUEUEBUFFER_H
diff --git a/lib/platform/COSXKeyState.cpp b/lib/platform/COSXKeyState.cpp
index 4ac5cb186..8429a8201 100644
--- a/lib/platform/COSXKeyState.cpp
+++ b/lib/platform/COSXKeyState.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "COSXKeyState.h"
diff --git a/lib/platform/COSXKeyState.h b/lib/platform/COSXKeyState.h
index 3066131fd..cf9e1d17e 100644
--- a/lib/platform/COSXKeyState.h
+++ b/lib/platform/COSXKeyState.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef COSXKEYSTATE_H
diff --git a/lib/platform/COSXScreen.cpp b/lib/platform/COSXScreen.cpp
index cf575f18f..e37328106 100644
--- a/lib/platform/COSXScreen.cpp
+++ b/lib/platform/COSXScreen.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "COSXScreen.h"
diff --git a/lib/platform/COSXScreen.h b/lib/platform/COSXScreen.h
index 14e1076b1..fe6ddea49 100644
--- a/lib/platform/COSXScreen.h
+++ b/lib/platform/COSXScreen.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef COSXSCREEN_H
diff --git a/lib/platform/COSXScreenSaver.cpp b/lib/platform/COSXScreenSaver.cpp
index 9cc6a6785..5019d6e3d 100644
--- a/lib/platform/COSXScreenSaver.cpp
+++ b/lib/platform/COSXScreenSaver.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #import "COSXScreenSaver.h"
diff --git a/lib/platform/COSXScreenSaver.h b/lib/platform/COSXScreenSaver.h
index 40c4e7428..842965bd6 100644
--- a/lib/platform/COSXScreenSaver.h
+++ b/lib/platform/COSXScreenSaver.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef COSXSCREENSAVER_H
diff --git a/lib/platform/COSXScreenSaverUtil.h b/lib/platform/COSXScreenSaverUtil.h
index d4124ab31..7d184f5a9 100644
--- a/lib/platform/COSXScreenSaverUtil.h
+++ b/lib/platform/COSXScreenSaverUtil.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef COSXSCREENSAVERUTIL_H
diff --git a/lib/platform/CSynergyHook.cpp b/lib/platform/CSynergyHook.cpp
index 1905be5f8..550fe05a6 100644
--- a/lib/platform/CSynergyHook.cpp
+++ b/lib/platform/CSynergyHook.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CSynergyHook.h"
diff --git a/lib/platform/CSynergyHook.h b/lib/platform/CSynergyHook.h
index 792a5ad22..a8f79d51e 100644
--- a/lib/platform/CSynergyHook.h
+++ b/lib/platform/CSynergyHook.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CSYNERGYHOOK_H
diff --git a/lib/platform/CXWindowsClipboard.cpp b/lib/platform/CXWindowsClipboard.cpp
index 33252af9d..5e27742ac 100644
--- a/lib/platform/CXWindowsClipboard.cpp
+++ b/lib/platform/CXWindowsClipboard.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CXWindowsClipboard.h"
diff --git a/lib/platform/CXWindowsClipboard.h b/lib/platform/CXWindowsClipboard.h
index b36a6c8d8..eb92c52db 100644
--- a/lib/platform/CXWindowsClipboard.h
+++ b/lib/platform/CXWindowsClipboard.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CXWINDOWSCLIPBOARD_H
diff --git a/lib/platform/CXWindowsClipboardAnyBitmapConverter.cpp b/lib/platform/CXWindowsClipboardAnyBitmapConverter.cpp
index ab6afae2b..945c2a662 100644
--- a/lib/platform/CXWindowsClipboardAnyBitmapConverter.cpp
+++ b/lib/platform/CXWindowsClipboardAnyBitmapConverter.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CXWindowsClipboardAnyBitmapConverter.h"
diff --git a/lib/platform/CXWindowsClipboardAnyBitmapConverter.h b/lib/platform/CXWindowsClipboardAnyBitmapConverter.h
index 6a1534227..59355bd22 100644
--- a/lib/platform/CXWindowsClipboardAnyBitmapConverter.h
+++ b/lib/platform/CXWindowsClipboardAnyBitmapConverter.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CXWINDOWSCLIPBOARDANYBITMAPCONVERTER_H
diff --git a/lib/platform/CXWindowsClipboardBMPConverter.cpp b/lib/platform/CXWindowsClipboardBMPConverter.cpp
index 747d68507..5aa2794cf 100644
--- a/lib/platform/CXWindowsClipboardBMPConverter.cpp
+++ b/lib/platform/CXWindowsClipboardBMPConverter.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CXWindowsClipboardBMPConverter.h"
diff --git a/lib/platform/CXWindowsClipboardBMPConverter.h b/lib/platform/CXWindowsClipboardBMPConverter.h
index a7d445497..8bf1525ba 100644
--- a/lib/platform/CXWindowsClipboardBMPConverter.h
+++ b/lib/platform/CXWindowsClipboardBMPConverter.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CXWINDOWSCLIPBOARDBMPCONVERTER_H
diff --git a/lib/platform/CXWindowsClipboardHTMLConverter.cpp b/lib/platform/CXWindowsClipboardHTMLConverter.cpp
index fafca54ef..06e34f2ec 100644
--- a/lib/platform/CXWindowsClipboardHTMLConverter.cpp
+++ b/lib/platform/CXWindowsClipboardHTMLConverter.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CXWindowsClipboardHTMLConverter.h"
diff --git a/lib/platform/CXWindowsClipboardHTMLConverter.h b/lib/platform/CXWindowsClipboardHTMLConverter.h
index 7f761f20a..423311e0e 100644
--- a/lib/platform/CXWindowsClipboardHTMLConverter.h
+++ b/lib/platform/CXWindowsClipboardHTMLConverter.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CXWINDOWSCLIPBOARDHTMLCONVERTER_H
diff --git a/lib/platform/CXWindowsClipboardTextConverter.cpp b/lib/platform/CXWindowsClipboardTextConverter.cpp
index bd1a520ca..73fafaaec 100644
--- a/lib/platform/CXWindowsClipboardTextConverter.cpp
+++ b/lib/platform/CXWindowsClipboardTextConverter.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CXWindowsClipboardTextConverter.h"
diff --git a/lib/platform/CXWindowsClipboardTextConverter.h b/lib/platform/CXWindowsClipboardTextConverter.h
index 3840b7dfa..332e454cd 100644
--- a/lib/platform/CXWindowsClipboardTextConverter.h
+++ b/lib/platform/CXWindowsClipboardTextConverter.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CXWINDOWSCLIPBOARDTEXTCONVERTER_H
diff --git a/lib/platform/CXWindowsClipboardUCS2Converter.cpp b/lib/platform/CXWindowsClipboardUCS2Converter.cpp
index 86b8d13f6..fe00722f0 100644
--- a/lib/platform/CXWindowsClipboardUCS2Converter.cpp
+++ b/lib/platform/CXWindowsClipboardUCS2Converter.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CXWindowsClipboardUCS2Converter.h"
diff --git a/lib/platform/CXWindowsClipboardUCS2Converter.h b/lib/platform/CXWindowsClipboardUCS2Converter.h
index e848e3023..dd2379f26 100644
--- a/lib/platform/CXWindowsClipboardUCS2Converter.h
+++ b/lib/platform/CXWindowsClipboardUCS2Converter.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CXWINDOWSCLIPBOARDUCS2CONVERTER_H
diff --git a/lib/platform/CXWindowsClipboardUTF8Converter.cpp b/lib/platform/CXWindowsClipboardUTF8Converter.cpp
index 7edc850f9..e89adb94f 100644
--- a/lib/platform/CXWindowsClipboardUTF8Converter.cpp
+++ b/lib/platform/CXWindowsClipboardUTF8Converter.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CXWindowsClipboardUTF8Converter.h"
diff --git a/lib/platform/CXWindowsClipboardUTF8Converter.h b/lib/platform/CXWindowsClipboardUTF8Converter.h
index 5ac8b153a..fc0af4327 100644
--- a/lib/platform/CXWindowsClipboardUTF8Converter.h
+++ b/lib/platform/CXWindowsClipboardUTF8Converter.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CXWINDOWSCLIPBOARDUTF8CONVERTER_H
diff --git a/lib/platform/CXWindowsEventQueueBuffer.cpp b/lib/platform/CXWindowsEventQueueBuffer.cpp
index 995d50205..225d0d100 100644
--- a/lib/platform/CXWindowsEventQueueBuffer.cpp
+++ b/lib/platform/CXWindowsEventQueueBuffer.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CXWindowsEventQueueBuffer.h"
diff --git a/lib/platform/CXWindowsEventQueueBuffer.h b/lib/platform/CXWindowsEventQueueBuffer.h
index a1737b5e2..70bc0a3a9 100644
--- a/lib/platform/CXWindowsEventQueueBuffer.h
+++ b/lib/platform/CXWindowsEventQueueBuffer.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CXWINDOWSEVENTQUEUEBUFFER_H
diff --git a/lib/platform/CXWindowsKeyState.cpp b/lib/platform/CXWindowsKeyState.cpp
index 7e69cd94a..f5f2d0766 100644
--- a/lib/platform/CXWindowsKeyState.cpp
+++ b/lib/platform/CXWindowsKeyState.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CXWindowsKeyState.h"
diff --git a/lib/platform/CXWindowsKeyState.h b/lib/platform/CXWindowsKeyState.h
index 02ed45205..b2cfa45ba 100644
--- a/lib/platform/CXWindowsKeyState.h
+++ b/lib/platform/CXWindowsKeyState.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CXWINDOWSKEYSTATE_H
diff --git a/lib/platform/CXWindowsScreen.cpp b/lib/platform/CXWindowsScreen.cpp
index eda9927ab..f5acec649 100644
--- a/lib/platform/CXWindowsScreen.cpp
+++ b/lib/platform/CXWindowsScreen.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CXWindowsScreen.h"
diff --git a/lib/platform/CXWindowsScreen.h b/lib/platform/CXWindowsScreen.h
index 4c7348a94..1a3988c12 100644
--- a/lib/platform/CXWindowsScreen.h
+++ b/lib/platform/CXWindowsScreen.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CXWINDOWSSCREEN_H
diff --git a/lib/platform/CXWindowsScreenSaver.cpp b/lib/platform/CXWindowsScreenSaver.cpp
index 65af34e1c..7612c1364 100644
--- a/lib/platform/CXWindowsScreenSaver.cpp
+++ b/lib/platform/CXWindowsScreenSaver.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CXWindowsScreenSaver.h"
diff --git a/lib/platform/CXWindowsScreenSaver.h b/lib/platform/CXWindowsScreenSaver.h
index 991b20e18..3e9205c6c 100644
--- a/lib/platform/CXWindowsScreenSaver.h
+++ b/lib/platform/CXWindowsScreenSaver.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CXWINDOWSSCREENSAVER_H
diff --git a/lib/platform/CXWindowsUtil.cpp b/lib/platform/CXWindowsUtil.cpp
index edf21be09..eb958a460 100644
--- a/lib/platform/CXWindowsUtil.cpp
+++ b/lib/platform/CXWindowsUtil.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CXWindowsUtil.h"
diff --git a/lib/platform/CXWindowsUtil.h b/lib/platform/CXWindowsUtil.h
index a9049ef64..40eda4a68 100644
--- a/lib/platform/CXWindowsUtil.h
+++ b/lib/platform/CXWindowsUtil.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CXWINDOWSUTIL_H
diff --git a/lib/platform/OSXScreenSaverControl.h b/lib/platform/OSXScreenSaverControl.h
index 75aecb17d..0e7bf1f58 100644
--- a/lib/platform/OSXScreenSaverControl.h
+++ b/lib/platform/OSXScreenSaverControl.h
@@ -1,3 +1,20 @@
+/*
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 // ScreenSaver.framework private API
 // Class dumping by Alex Harper http://www.ragingmenace.com/
 
diff --git a/lib/server/CBaseClientProxy.cpp b/lib/server/CBaseClientProxy.cpp
index 0f049e350..5c07d6d6c 100644
--- a/lib/server/CBaseClientProxy.cpp
+++ b/lib/server/CBaseClientProxy.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2006 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CBaseClientProxy.h"
diff --git a/lib/server/CBaseClientProxy.h b/lib/server/CBaseClientProxy.h
index e9cceca41..717a75d0f 100644
--- a/lib/server/CBaseClientProxy.h
+++ b/lib/server/CBaseClientProxy.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CBASECLIENTPROXY_H
diff --git a/lib/server/CClientListener.cpp b/lib/server/CClientListener.cpp
index 803f44a0c..dd0fe8e03 100644
--- a/lib/server/CClientListener.cpp
+++ b/lib/server/CClientListener.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CClientListener.h"
diff --git a/lib/server/CClientListener.h b/lib/server/CClientListener.h
index e5302e695..95d3e83d8 100644
--- a/lib/server/CClientListener.h
+++ b/lib/server/CClientListener.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CCLIENTLISTENER_H
diff --git a/lib/server/CClientProxy.cpp b/lib/server/CClientProxy.cpp
index 715126d5b..700debbf8 100644
--- a/lib/server/CClientProxy.cpp
+++ b/lib/server/CClientProxy.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CClientProxy.h"
diff --git a/lib/server/CClientProxy.h b/lib/server/CClientProxy.h
index 51ad014be..71a2f9da1 100644
--- a/lib/server/CClientProxy.h
+++ b/lib/server/CClientProxy.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CCLIENTPROXY_H
diff --git a/lib/server/CClientProxy1_0.cpp b/lib/server/CClientProxy1_0.cpp
index 5f4ffce12..78b7a7d85 100644
--- a/lib/server/CClientProxy1_0.cpp
+++ b/lib/server/CClientProxy1_0.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CClientProxy1_0.h"
diff --git a/lib/server/CClientProxy1_0.h b/lib/server/CClientProxy1_0.h
index 9ebfc18d1..37cbd9c23 100644
--- a/lib/server/CClientProxy1_0.h
+++ b/lib/server/CClientProxy1_0.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CCLIENTPROXY1_0_H
diff --git a/lib/server/CClientProxy1_1.cpp b/lib/server/CClientProxy1_1.cpp
index ccce93051..3f2b9f90e 100644
--- a/lib/server/CClientProxy1_1.cpp
+++ b/lib/server/CClientProxy1_1.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CClientProxy1_1.h"
diff --git a/lib/server/CClientProxy1_1.h b/lib/server/CClientProxy1_1.h
index 087648291..13b07c5cb 100644
--- a/lib/server/CClientProxy1_1.h
+++ b/lib/server/CClientProxy1_1.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CCLIENTPROXY1_1_H
diff --git a/lib/server/CClientProxy1_2.cpp b/lib/server/CClientProxy1_2.cpp
index 29f0a56b7..6d9e13709 100644
--- a/lib/server/CClientProxy1_2.cpp
+++ b/lib/server/CClientProxy1_2.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CClientProxy1_2.h"
diff --git a/lib/server/CClientProxy1_2.h b/lib/server/CClientProxy1_2.h
index 3f8bb0e37..cbc787527 100644
--- a/lib/server/CClientProxy1_2.h
+++ b/lib/server/CClientProxy1_2.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CCLIENTPROXY1_2_H
diff --git a/lib/server/CClientProxy1_3.cpp b/lib/server/CClientProxy1_3.cpp
index 6765d2f86..60b6d9a60 100644
--- a/lib/server/CClientProxy1_3.cpp
+++ b/lib/server/CClientProxy1_3.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2006 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CClientProxy1_3.h"
diff --git a/lib/server/CClientProxy1_3.h b/lib/server/CClientProxy1_3.h
index 681094b6f..63b6e546e 100644
--- a/lib/server/CClientProxy1_3.h
+++ b/lib/server/CClientProxy1_3.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2006 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CCLIENTPROXY1_3_H
diff --git a/lib/server/CClientProxyUnknown.cpp b/lib/server/CClientProxyUnknown.cpp
index 51a25efa3..3b77eea13 100644
--- a/lib/server/CClientProxyUnknown.cpp
+++ b/lib/server/CClientProxyUnknown.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CClientProxyUnknown.h"
diff --git a/lib/server/CClientProxyUnknown.h b/lib/server/CClientProxyUnknown.h
index 140a1aee4..4841a2042 100644
--- a/lib/server/CClientProxyUnknown.h
+++ b/lib/server/CClientProxyUnknown.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CCLIENTPROXYUNKNOWN_H
diff --git a/lib/server/CConfig.cpp b/lib/server/CConfig.cpp
index b58460cf6..648d5d6cd 100644
--- a/lib/server/CConfig.cpp
+++ b/lib/server/CConfig.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CConfig.h"
diff --git a/lib/server/CConfig.h b/lib/server/CConfig.h
index c0d2faa8a..ec083e74b 100644
--- a/lib/server/CConfig.h
+++ b/lib/server/CConfig.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CCONFIG_H
diff --git a/lib/server/CInputFilter.cpp b/lib/server/CInputFilter.cpp
index 12c43b05e..6ee44fc7b 100644
--- a/lib/server/CInputFilter.cpp
+++ b/lib/server/CInputFilter.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2005 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CInputFilter.h"
diff --git a/lib/server/CInputFilter.h b/lib/server/CInputFilter.h
index 571ec82be..5d9883bf0 100644
--- a/lib/server/CInputFilter.h
+++ b/lib/server/CInputFilter.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2005 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CINPUTFILTER_H
diff --git a/lib/server/CPrimaryClient.cpp b/lib/server/CPrimaryClient.cpp
index 031466552..849044fea 100644
--- a/lib/server/CPrimaryClient.cpp
+++ b/lib/server/CPrimaryClient.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CPrimaryClient.h"
diff --git a/lib/server/CPrimaryClient.h b/lib/server/CPrimaryClient.h
index e768a21de..4f3bc7bff 100644
--- a/lib/server/CPrimaryClient.h
+++ b/lib/server/CPrimaryClient.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CPRIMARYCLIENT_H
diff --git a/lib/server/CServer.cpp b/lib/server/CServer.cpp
index 7907b6628..fbad5f54c 100644
--- a/lib/server/CServer.cpp
+++ b/lib/server/CServer.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CServer.h"
diff --git a/lib/server/CServer.h b/lib/server/CServer.h
index 03171bf52..9ff88842a 100644
--- a/lib/server/CServer.h
+++ b/lib/server/CServer.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CSERVER_H
diff --git a/lib/synergy/CApp.cpp b/lib/synergy/CApp.cpp
index c666cc52b..95d6957e9 100644
--- a/lib/synergy/CApp.cpp
+++ b/lib/synergy/CApp.cpp
@@ -1,16 +1,20 @@
 /*
-* synergy -- mouse and keyboard sharing utility
-* Copyright (C) 2002 Chris Schoeneman
-* 
-* This package is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* found in the file COPYING that should have accompanied this file.
-* 
-* This package is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*/
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2002 Chris Schoeneman
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #include "CApp.h"
 #include "CLog.h"
diff --git a/lib/synergy/CApp.h b/lib/synergy/CApp.h
index c2769f14b..5d21cb9f2 100644
--- a/lib/synergy/CApp.h
+++ b/lib/synergy/CApp.h
@@ -1,16 +1,20 @@
 /*
-* synergy -- mouse and keyboard sharing utility
-* Copyright (C) 2002 Chris Schoeneman
-* 
-* This package is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* found in the file COPYING that should have accompanied this file.
-* 
-* This package is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*/
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2002 Chris Schoeneman
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #pragma once
 
diff --git a/lib/synergy/CClientApp.cpp b/lib/synergy/CClientApp.cpp
index 07e432b4d..28a0da5d6 100644
--- a/lib/synergy/CClientApp.cpp
+++ b/lib/synergy/CClientApp.cpp
@@ -1,16 +1,20 @@
 /*
-* synergy -- mouse and keyboard sharing utility
-* Copyright (C) 2002 Chris Schoeneman
-* 
-* This package is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* found in the file COPYING that should have accompanied this file.
-* 
-* This package is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*/
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2002 Chris Schoeneman
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #include "CClientApp.h"
 #include "CLog.h"
diff --git a/lib/synergy/CClientApp.h b/lib/synergy/CClientApp.h
index e7ddccf1f..89fbe67b7 100644
--- a/lib/synergy/CClientApp.h
+++ b/lib/synergy/CClientApp.h
@@ -1,16 +1,20 @@
 /*
-* synergy -- mouse and keyboard sharing utility
-* Copyright (C) 2002 Chris Schoeneman
-* 
-* This package is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* found in the file COPYING that should have accompanied this file.
-* 
-* This package is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*/
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2002 Chris Schoeneman
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #pragma once
 
diff --git a/lib/synergy/CClientTaskBarReceiver.cpp b/lib/synergy/CClientTaskBarReceiver.cpp
index 025b43f62..cfe8a2218 100644
--- a/lib/synergy/CClientTaskBarReceiver.cpp
+++ b/lib/synergy/CClientTaskBarReceiver.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CClientTaskBarReceiver.h"
diff --git a/lib/synergy/CClientTaskBarReceiver.h b/lib/synergy/CClientTaskBarReceiver.h
index 5d2d6a87b..644144d45 100644
--- a/lib/synergy/CClientTaskBarReceiver.h
+++ b/lib/synergy/CClientTaskBarReceiver.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CCLIENTTASKBARRECEIVER_H
diff --git a/lib/synergy/CClipboard.cpp b/lib/synergy/CClipboard.cpp
index d0388a011..b485c2a23 100644
--- a/lib/synergy/CClipboard.cpp
+++ b/lib/synergy/CClipboard.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CClipboard.h"
diff --git a/lib/synergy/CClipboard.h b/lib/synergy/CClipboard.h
index f8d10aff8..7423561e2 100644
--- a/lib/synergy/CClipboard.h
+++ b/lib/synergy/CClipboard.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CCLIPBOARD_H
diff --git a/lib/synergy/CKeyMap.cpp b/lib/synergy/CKeyMap.cpp
index 38effdaf9..a31e930e3 100644
--- a/lib/synergy/CKeyMap.cpp
+++ b/lib/synergy/CKeyMap.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2005 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CKeyMap.h"
diff --git a/lib/synergy/CKeyMap.h b/lib/synergy/CKeyMap.h
index 7f34113bc..043811381 100644
--- a/lib/synergy/CKeyMap.h
+++ b/lib/synergy/CKeyMap.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2005 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CKEYMAP_H
diff --git a/lib/synergy/CKeyState.cpp b/lib/synergy/CKeyState.cpp
index 496f614cf..cf438eb32 100644
--- a/lib/synergy/CKeyState.cpp
+++ b/lib/synergy/CKeyState.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CKeyState.h"
diff --git a/lib/synergy/CKeyState.h b/lib/synergy/CKeyState.h
index 6bfd9d8bf..e179d82e3 100644
--- a/lib/synergy/CKeyState.h
+++ b/lib/synergy/CKeyState.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CKEYSTATE_H
diff --git a/lib/synergy/CPacketStreamFilter.cpp b/lib/synergy/CPacketStreamFilter.cpp
index 132940211..25c425ed8 100644
--- a/lib/synergy/CPacketStreamFilter.cpp
+++ b/lib/synergy/CPacketStreamFilter.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CPacketStreamFilter.h"
diff --git a/lib/synergy/CPacketStreamFilter.h b/lib/synergy/CPacketStreamFilter.h
index 93ddd8fa2..0dded74f3 100644
--- a/lib/synergy/CPacketStreamFilter.h
+++ b/lib/synergy/CPacketStreamFilter.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CPACKETSTREAMFILTER_H
diff --git a/lib/synergy/CPlatformScreen.cpp b/lib/synergy/CPlatformScreen.cpp
index ca33d5a95..12936830a 100644
--- a/lib/synergy/CPlatformScreen.cpp
+++ b/lib/synergy/CPlatformScreen.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CPlatformScreen.h"
diff --git a/lib/synergy/CPlatformScreen.h b/lib/synergy/CPlatformScreen.h
index 2e5c87f17..ff07ed1ee 100644
--- a/lib/synergy/CPlatformScreen.h
+++ b/lib/synergy/CPlatformScreen.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CPLATFORMSCREEN_H
diff --git a/lib/synergy/CProtocolUtil.cpp b/lib/synergy/CProtocolUtil.cpp
index 786547d77..dad31320c 100644
--- a/lib/synergy/CProtocolUtil.cpp
+++ b/lib/synergy/CProtocolUtil.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CProtocolUtil.h"
diff --git a/lib/synergy/CProtocolUtil.h b/lib/synergy/CProtocolUtil.h
index d4019b0b6..443456ffc 100644
--- a/lib/synergy/CProtocolUtil.h
+++ b/lib/synergy/CProtocolUtil.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CPROTOCOLUTIL_H
diff --git a/lib/synergy/CScreen.cpp b/lib/synergy/CScreen.cpp
index 5436588b1..907b5aba7 100644
--- a/lib/synergy/CScreen.cpp
+++ b/lib/synergy/CScreen.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CScreen.h"
diff --git a/lib/synergy/CScreen.h b/lib/synergy/CScreen.h
index 4d216f8bf..6f6a363df 100644
--- a/lib/synergy/CScreen.h
+++ b/lib/synergy/CScreen.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CSCREEN_H
diff --git a/lib/synergy/CServerApp.cpp b/lib/synergy/CServerApp.cpp
index 3d481000b..d3b16ecdd 100644
--- a/lib/synergy/CServerApp.cpp
+++ b/lib/synergy/CServerApp.cpp
@@ -1,16 +1,20 @@
 /*
-* synergy -- mouse and keyboard sharing utility
-* Copyright (C) 2002 Chris Schoeneman
-* 
-* This package is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* found in the file COPYING that should have accompanied this file.
-* 
-* This package is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*/
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2002 Chris Schoeneman
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #include "CServerApp.h"
 #include "CLog.h"
diff --git a/lib/synergy/CServerApp.h b/lib/synergy/CServerApp.h
index 5134423b4..1b018ceab 100644
--- a/lib/synergy/CServerApp.h
+++ b/lib/synergy/CServerApp.h
@@ -1,16 +1,20 @@
 /*
-* synergy -- mouse and keyboard sharing utility
-* Copyright (C) 2002 Chris Schoeneman
-* 
-* This package is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* found in the file COPYING that should have accompanied this file.
-* 
-* This package is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*/
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
+ * Copyright (C) 2002 Chris Schoeneman
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #pragma once
 
diff --git a/lib/synergy/CServerTaskBarReceiver.cpp b/lib/synergy/CServerTaskBarReceiver.cpp
index 632c9a8d1..fee615e08 100644
--- a/lib/synergy/CServerTaskBarReceiver.cpp
+++ b/lib/synergy/CServerTaskBarReceiver.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CServerTaskBarReceiver.h"
diff --git a/lib/synergy/CServerTaskBarReceiver.h b/lib/synergy/CServerTaskBarReceiver.h
index 66b155348..5492880b4 100644
--- a/lib/synergy/CServerTaskBarReceiver.h
+++ b/lib/synergy/CServerTaskBarReceiver.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CSERVERTASKBARRECEIVER_H
diff --git a/lib/synergy/ClipboardTypes.h b/lib/synergy/ClipboardTypes.h
index a638e8215..9db2719db 100644
--- a/lib/synergy/ClipboardTypes.h
+++ b/lib/synergy/ClipboardTypes.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CLIPBOARDTYPES_H
diff --git a/lib/synergy/IClient.h b/lib/synergy/IClient.h
index 81cbf06a4..4a632182e 100644
--- a/lib/synergy/IClient.h
+++ b/lib/synergy/IClient.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef ICLIENT_H
diff --git a/lib/synergy/IClipboard.cpp b/lib/synergy/IClipboard.cpp
index a59cc97b0..93d683d5b 100644
--- a/lib/synergy/IClipboard.cpp
+++ b/lib/synergy/IClipboard.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "IClipboard.h"
diff --git a/lib/synergy/IClipboard.h b/lib/synergy/IClipboard.h
index c883da8aa..ae1b6c998 100644
--- a/lib/synergy/IClipboard.h
+++ b/lib/synergy/IClipboard.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef ICLIPBOARD_H
diff --git a/lib/synergy/IKeyState.cpp b/lib/synergy/IKeyState.cpp
index 9e5d8d874..b79a0abbb 100644
--- a/lib/synergy/IKeyState.cpp
+++ b/lib/synergy/IKeyState.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "IKeyState.h"
diff --git a/lib/synergy/IKeyState.h b/lib/synergy/IKeyState.h
index 2b282487c..f735b65d0 100644
--- a/lib/synergy/IKeyState.h
+++ b/lib/synergy/IKeyState.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef IKEYSTATE_H
diff --git a/lib/synergy/INode.h b/lib/synergy/INode.h
index de4ecbd9d..ebd066df2 100644
--- a/lib/synergy/INode.h
+++ b/lib/synergy/INode.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "IInterface.h"
diff --git a/lib/synergy/IPlatformScreen.h b/lib/synergy/IPlatformScreen.h
index b4d1b785c..3660486f3 100644
--- a/lib/synergy/IPlatformScreen.h
+++ b/lib/synergy/IPlatformScreen.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef IPLATFORMSCREEN_H
diff --git a/lib/synergy/IPrimaryScreen.cpp b/lib/synergy/IPrimaryScreen.cpp
index 21d16b694..a288800ef 100644
--- a/lib/synergy/IPrimaryScreen.cpp
+++ b/lib/synergy/IPrimaryScreen.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "IPrimaryScreen.h"
diff --git a/lib/synergy/IPrimaryScreen.h b/lib/synergy/IPrimaryScreen.h
index 93166d23d..cac38554b 100644
--- a/lib/synergy/IPrimaryScreen.h
+++ b/lib/synergy/IPrimaryScreen.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef IPRIMARYSCREEN_H
diff --git a/lib/synergy/IScreen.cpp b/lib/synergy/IScreen.cpp
index 3095b9d44..e1a0d036d 100644
--- a/lib/synergy/IScreen.cpp
+++ b/lib/synergy/IScreen.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "IScreen.h"
diff --git a/lib/synergy/IScreen.h b/lib/synergy/IScreen.h
index e1f94d596..004c8b401 100644
--- a/lib/synergy/IScreen.h
+++ b/lib/synergy/IScreen.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef ISCREEN_H
diff --git a/lib/synergy/IScreenSaver.h b/lib/synergy/IScreenSaver.h
index 9076b3093..0ce5be6e5 100644
--- a/lib/synergy/IScreenSaver.h
+++ b/lib/synergy/IScreenSaver.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef ISCREENSAVER_H
diff --git a/lib/synergy/ISecondaryScreen.h b/lib/synergy/ISecondaryScreen.h
index 5b3a150d9..5165b23a8 100644
--- a/lib/synergy/ISecondaryScreen.h
+++ b/lib/synergy/ISecondaryScreen.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef ISECONDARYSCREEN_H
diff --git a/lib/synergy/KeyTypes.cpp b/lib/synergy/KeyTypes.cpp
index b483745dc..13e2d7457 100644
--- a/lib/synergy/KeyTypes.cpp
+++ b/lib/synergy/KeyTypes.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "KeyTypes.h"
diff --git a/lib/synergy/KeyTypes.h b/lib/synergy/KeyTypes.h
index c8b4f6b83..f5aaf3437 100644
--- a/lib/synergy/KeyTypes.h
+++ b/lib/synergy/KeyTypes.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef KEYTYPES_H
diff --git a/lib/synergy/MouseTypes.h b/lib/synergy/MouseTypes.h
index e83cfb6fb..2b70e168d 100644
--- a/lib/synergy/MouseTypes.h
+++ b/lib/synergy/MouseTypes.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef MOUSETYPES_H
diff --git a/lib/synergy/OptionTypes.h b/lib/synergy/OptionTypes.h
index 00352b2f7..67597cce0 100644
--- a/lib/synergy/OptionTypes.h
+++ b/lib/synergy/OptionTypes.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef OPTIONTYPES_H
diff --git a/lib/synergy/ProtocolTypes.cpp b/lib/synergy/ProtocolTypes.cpp
index 441b2f33e..57c7f0a7c 100644
--- a/lib/synergy/ProtocolTypes.cpp
+++ b/lib/synergy/ProtocolTypes.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "ProtocolTypes.h"
diff --git a/lib/synergy/ProtocolTypes.h b/lib/synergy/ProtocolTypes.h
index c4d3c99d9..ec2c2ed90 100644
--- a/lib/synergy/ProtocolTypes.h
+++ b/lib/synergy/ProtocolTypes.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PROTOCOLTYPES_H
diff --git a/lib/synergy/XScreen.cpp b/lib/synergy/XScreen.cpp
index 8a694bfad..e50272e9b 100644
--- a/lib/synergy/XScreen.cpp
+++ b/lib/synergy/XScreen.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "XScreen.h"
diff --git a/lib/synergy/XScreen.h b/lib/synergy/XScreen.h
index 9966e6cfb..afa0158f2 100644
--- a/lib/synergy/XScreen.h
+++ b/lib/synergy/XScreen.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef XSCREEN_H
diff --git a/lib/synergy/XSynergy.cpp b/lib/synergy/XSynergy.cpp
index 7a4f1a961..c4b97902c 100644
--- a/lib/synergy/XSynergy.cpp
+++ b/lib/synergy/XSynergy.cpp
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "XSynergy.h"
diff --git a/lib/synergy/XSynergy.h b/lib/synergy/XSynergy.h
index 4dce6c2a9..ea3ddd648 100644
--- a/lib/synergy/XSynergy.h
+++ b/lib/synergy/XSynergy.h
@@ -1,5 +1,6 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * synergy-plus -- mouse and keyboard sharing utility
+ * Copyright (C) 2009 The Synergy+ Project
  * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
@@ -10,6 +11,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef XSYNERGY_H