Update copyright to 2016. This was done with:

find include/ src/ lang/ docs/ modules/ *.* Config -exec sed -i 's/-20.. Anope Team/-2014 Anope Team/i' {} \;

Added missing copyright headers to files that didn't have it yet.
Fixed some whitespace and blank lines along the way.

61 files changed, 125 insertions, 147 deletions

diff --git a/src/access.cpp b/src/access.cpp
index 0c0713c49..abd55714f 100644
--- a/src/access.cpp
+++ b/src/access.cpp
@@ -1,13 +1,12 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
 #include "service.h"
diff --git a/src/account.cpp b/src/account.cpp
index 89c9c7909..f23f81242 100644
--- a/src/account.cpp
+++ b/src/account.cpp
@@ -1,13 +1,12 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
 #include "services.h"
diff --git a/src/base.cpp b/src/base.cpp
index 1b6a560d7..5e4ecc9e3 100644
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -1,10 +1,9 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
- *
  */
 
 #include "services.h"
diff --git a/src/base64.cpp b/src/base64.cpp
index c00527d42..3096d9c3f 100644
--- a/src/base64.cpp
+++ b/src/base64.cpp
@@ -1,13 +1,12 @@
 /* base64 routines.
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
 #include "services.h"
diff --git a/src/bots.cpp b/src/bots.cpp
index bc8b75594..7654bb247 100644
--- a/src/bots.cpp
+++ b/src/bots.cpp
@@ -1,10 +1,9 @@
 /*
  *
- * Copyright (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * Copyright (C) 2008-2014 Anope Team <team@anope.org>
+ * (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
+ * (C) 2008-2016 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
- *
  */
 
 #include "services.h"
diff --git a/src/channels.cpp b/src/channels.cpp
index 8e9b3be94..c2a328b82 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -1,13 +1,12 @@
 /* Channel-handling routines.
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
 #include "services.h"
diff --git a/src/command.cpp b/src/command.cpp
index 2786edecf..afabf24fc 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -1,10 +1,9 @@
 /*
  *
- * Copyright (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * Copyright (C) 2008-2014 Anope Team <team@anope.org>
+ * (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
+ * (C) 2008-2016 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
- *
  */
 
 #include "services.h"
diff --git a/src/config.cpp b/src/config.cpp
index b6972bc42..c9a4a53c8 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -1,13 +1,12 @@
 /* Configuration file handling.
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
 #include "services.h"
diff --git a/src/extensible.cpp b/src/extensible.cpp
index 8f0aab544..4079290ff 100644
--- a/src/extensible.cpp
+++ b/src/extensible.cpp
@@ -1,11 +1,9 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
- *
- *
  */
 
 #include "extensible.h"
diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 9f48bba29..6374639d8 100644
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -1,10 +1,9 @@
 /*
  *
- * Copyright (C) 2002-2011 InspIRCd Development Team
- * Copyright (C) 2008-2014 Anope Team <team@anope.org>
+ * (C) 2002-2011 InspIRCd Development Team
+ * (C) 2008-2016 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
- *
  */
 
 #include "services.h"
diff --git a/src/init.cpp b/src/init.cpp
index 6d903ac8f..7e5722603 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1,13 +1,12 @@
 /* Initialization and related routines.
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
 #include "services.h"
diff --git a/src/language.cpp b/src/language.cpp
index c2643f438..2c3377a9e 100644
--- a/src/language.cpp
+++ b/src/language.cpp
@@ -1,13 +1,12 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
 #include "services.h"
diff --git a/src/logger.cpp b/src/logger.cpp
index 977af0a5f..c681e42fa 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -1,13 +1,12 @@
 /* Logging routines.
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
 #include "services.h"
diff --git a/src/mail.cpp b/src/mail.cpp
index e514c19ec..f909fa5a3 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -1,13 +1,12 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
 #include "services.h"
diff --git a/src/main.cpp b/src/main.cpp
index 99054688c..bbcccee27 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,13 +1,12 @@
 /* Services -- main source file.
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
 #include "services.h"
diff --git a/src/memos.cpp b/src/memos.cpp
index 8b2816f9a..0f591757b 100644
--- a/src/memos.cpp
+++ b/src/memos.cpp
@@ -1,13 +1,12 @@
 /* MemoServ functions.
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
 #include "services.h"
diff --git a/src/messages.cpp b/src/messages.cpp
index 8911d45cc..109d6b02f 100644
--- a/src/messages.cpp
+++ b/src/messages.cpp
@@ -1,13 +1,12 @@
 /* Common message handlers
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
 #include "services.h"
diff --git a/src/misc.cpp b/src/misc.cpp
index a6addbc3f..e1d78c800 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -1,13 +1,12 @@
 /* Miscellaneous routines.
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
 #include "services.h"
diff --git a/src/modes.cpp b/src/modes.cpp
index d818244c3..6760a610e 100644
--- a/src/modes.cpp
+++ b/src/modes.cpp
@@ -1,10 +1,9 @@
 /* Mode support
  *
- * Copyright (C) 2008-2011 Adam <Adam@anope.org>
- * Copyright (C) 2008-2014 Anope Team <team@anope.org>
+ * (C) 2008-2011 Adam <Adam@anope.org>
+ * (C) 2008-2016 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
- *
  */
 
 #include "services.h"
diff --git a/src/module.cpp b/src/module.cpp
index 5c02e4e49..3e377efec 100644
--- a/src/module.cpp
+++ b/src/module.cpp
@@ -1,10 +1,9 @@
 /* Modular support
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
- *
  */
 
 #include "services.h"
diff --git a/src/modulemanager.cpp b/src/modulemanager.cpp
index 06a3c2181..2cda9e256 100644
--- a/src/modulemanager.cpp
+++ b/src/modulemanager.cpp
@@ -1,10 +1,9 @@
 /* Modular support
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
- *
  */
 
 #include "services.h"
diff --git a/src/nickalias.cpp b/src/nickalias.cpp
index fbf3411fc..795298cba 100644
--- a/src/nickalias.cpp
+++ b/src/nickalias.cpp
@@ -1,13 +1,12 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
 #include "services.h"
diff --git a/src/nickcore.cpp b/src/nickcore.cpp
index f669a9181..633f5a7cb 100644
--- a/src/nickcore.cpp
+++ b/src/nickcore.cpp
@@ -1,13 +1,12 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
 #include "services.h"
diff --git a/src/opertype.cpp b/src/opertype.cpp
index b75899234..9438c2ff5 100644
--- a/src/opertype.cpp
+++ b/src/opertype.cpp
@@ -1,10 +1,9 @@
 /*
  *
- * Copyright (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * Copyright (C) 2008-2014 Anope Team <team@anope.org>
+ * (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
+ * (C) 2008-2016 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
- *
  */
 
 #include "services.h"
diff --git a/src/pipeengine.cpp b/src/pipeengine.cpp
index ee12539da..0953387c1 100644
--- a/src/pipeengine.cpp
+++ b/src/pipeengine.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
diff --git a/src/process.cpp b/src/process.cpp
index 2d7a1561a..b095ab40b 100644
--- a/src/process.cpp
+++ b/src/process.cpp
@@ -1,6 +1,6 @@
 /* Main processing code for Services.
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
diff --git a/src/protocol.cpp b/src/protocol.cpp
index 0d09fee24..c8320e25a 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -1,13 +1,12 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
 #include "services.h"
diff --git a/src/regchannel.cpp b/src/regchannel.cpp
index b7c353554..df7359bb9 100644
--- a/src/regchannel.cpp
+++ b/src/regchannel.cpp
@@ -1,13 +1,12 @@
 /* Registered channel functions
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
 #include "services.h"
diff --git a/src/serialize.cpp b/src/serialize.cpp
index 1bb704b41..3c54b933d 100644
--- a/src/serialize.cpp
+++ b/src/serialize.cpp
@@ -1,16 +1,14 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
-
 #include "services.h"
 #include "anope.h"
 #include "serialize.h"
diff --git a/src/servers.cpp b/src/servers.cpp
index 6401d8d59..b78cd19f7 100644
--- a/src/servers.cpp
+++ b/src/servers.cpp
@@ -1,13 +1,12 @@
 /* Routines to maintain a list of connected servers
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
 #include "services.h"
diff --git a/src/socket_clients.cpp b/src/socket_clients.cpp
index 0de1ec861..bb0618f31 100644
--- a/src/socket_clients.cpp
+++ b/src/socket_clients.cpp
@@ -1,13 +1,12 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
 #include "services.h"
diff --git a/src/socket_transport.cpp b/src/socket_transport.cpp
index 1476d0662..070807264 100644
--- a/src/socket_transport.cpp
+++ b/src/socket_transport.cpp
@@ -1,13 +1,12 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
 #include "services.h"
diff --git a/src/socketengines/socketengine_epoll.cpp b/src/socketengines/socketengine_epoll.cpp
index 8fe8d46a4..f132ba2b9 100644
--- a/src/socketengines/socketengine_epoll.cpp
+++ b/src/socketengines/socketengine_epoll.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
diff --git a/src/socketengines/socketengine_kqueue.cpp b/src/socketengines/socketengine_kqueue.cpp
index 977b84b96..9ccf128d5 100644
--- a/src/socketengines/socketengine_kqueue.cpp
+++ b/src/socketengines/socketengine_kqueue.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
diff --git a/src/socketengines/socketengine_poll.cpp b/src/socketengines/socketengine_poll.cpp
index 944322c27..8475dd414 100644
--- a/src/socketengines/socketengine_poll.cpp
+++ b/src/socketengines/socketengine_poll.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
diff --git a/src/socketengines/socketengine_select.cpp b/src/socketengines/socketengine_select.cpp
index aab84e958..86b2085ea 100644
--- a/src/socketengines/socketengine_select.cpp
+++ b/src/socketengines/socketengine_select.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
diff --git a/src/sockets.cpp b/src/sockets.cpp
index 9b88de4c6..272760f45 100644
--- a/src/sockets.cpp
+++ b/src/sockets.cpp
@@ -1,13 +1,12 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
 #include "services.h"
diff --git a/src/threadengine.cpp b/src/threadengine.cpp
index 40f2be094..f392ac472 100644
--- a/src/threadengine.cpp
+++ b/src/threadengine.cpp
@@ -1,13 +1,12 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
 #include "services.h"
diff --git a/src/timers.cpp b/src/timers.cpp
index 8dabc4fbc..a4538c05d 100644
--- a/src/timers.cpp
+++ b/src/timers.cpp
@@ -1,10 +1,9 @@
 /* Timer stuff.
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
- *
  */
 
 #include "services.h"
diff --git a/src/tools/anoperc.in b/src/tools/anoperc.in
index 6fef1a125..2802e57e2 100644
--- a/src/tools/anoperc.in
+++ b/src/tools/anoperc.in
@@ -2,7 +2,7 @@
 #
 # Configuration script for Services
 #
-# (C) 2003-2014 Anope Team
+# (C) 2003-2016 Anope Team
 # Contact us at team@anope.org
 #
 # Please read COPYING and README for further details.
diff --git a/src/tools/anopesmtp.cpp b/src/tools/anopesmtp.cpp
index 6ef8e6baf..392c6e627 100644
--- a/src/tools/anopesmtp.cpp
+++ b/src/tools/anopesmtp.cpp
@@ -1,6 +1,6 @@
 /* smtp stuff handler for win32.
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
diff --git a/src/uplink.cpp b/src/uplink.cpp
index 6171e2353..df38f98f2 100644
--- a/src/uplink.cpp
+++ b/src/uplink.cpp
@@ -1,13 +1,12 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
 #include "uplink.h"
diff --git a/src/users.cpp b/src/users.cpp
index 73d1d4368..8a66329ab 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -1,16 +1,14 @@
 /* Routines to maintain a list of online users.
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
-
 #include "services.h"
 #include "modules.h"
 #include "users.h"
diff --git a/src/win32/Config.cs b/src/win32/Config.cs
index 4f611a129..d7c9661ec 100644
--- a/src/win32/Config.cs
+++ b/src/win32/Config.cs
@@ -1,7 +1,7 @@
 /*

  * Config.cs - Windows Configuration

  *

- * (C) 2003-2014 Anope Team

+ * (C) 2003-2016 Anope Team

  * Contact us at team@anope.org

  *

  * This program is free but copyrighted software; see the file COPYING for

diff --git a/src/win32/anope_windows.h b/src/win32/anope_windows.h
index e534d7927..14c83b4d4 100644
--- a/src/win32/anope_windows.h
+++ b/src/win32/anope_windows.h
@@ -1,14 +1,14 @@
 /* POSIX emulation layer for Windows.
  *
- * Copyright (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * Copyright (C) 2008-2014 Anope Team <info@anope.org>
+ * (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
+ * (C) 2008-2016 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
  */
- 
+
 #ifndef WINDOWS_H
 #define WINDOWS_H
 #ifdef _WIN32
@@ -65,7 +65,7 @@ namespace Anope
 {
 	class string;
 }
- 
+
 extern CoreExport void OnStartup();
 extern CoreExport void OnShutdown();
 extern CoreExport USHORT WindowsGetLanguage(const Anope::string &lang);
diff --git a/src/win32/dir/dir.cpp b/src/win32/dir/dir.cpp
index 21b80824b..d660c9694 100644
--- a/src/win32/dir/dir.cpp
+++ b/src/win32/dir/dir.cpp
@@ -1,6 +1,7 @@
- /* POSIX emulation layer for Windows.
+/* POSIX emulation layer for Windows.
  *
- * Copyright (C) 2008-2014 Anope Team <team@anope.org>
+ * (C) 2008-2016 Anope Team
+ * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  */
diff --git a/src/win32/dir/dir.h b/src/win32/dir/dir.h
index 5ddf71e7b..a6c9a055f 100644
--- a/src/win32/dir/dir.h
+++ b/src/win32/dir/dir.h
@@ -1,6 +1,7 @@
- /* POSIX emulation layer for Windows.
+/* POSIX emulation layer for Windows.
  *
- * Copyright (C) 2008-2014 Anope Team <team@anope.org>
+ * (C) 2008-2016 Anope Team
+ * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  */
diff --git a/src/win32/dl/dl.cpp b/src/win32/dl/dl.cpp
index 5b19d7441..bdcbe636c 100644
--- a/src/win32/dl/dl.cpp
+++ b/src/win32/dl/dl.cpp
@@ -1,6 +1,7 @@
- /* POSIX emulation layer for Windows.
+/* POSIX emulation layer for Windows.
  *
- * Copyright (C) 2008-2014 Anope Team <team@anope.org>
+ * (C) 2008-2016 Anope Team
+ * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  */
diff --git a/src/win32/dl/dl.h b/src/win32/dl/dl.h
index 02a2f1d3d..81c115fef 100644
--- a/src/win32/dl/dl.h
+++ b/src/win32/dl/dl.h
@@ -1,6 +1,7 @@
- /* POSIX emulation layer for Windows.
+/* POSIX emulation layer for Windows.
  *
- * Copyright (C) 2008-2014 Anope Team <team@anope.org>
+ * (C) 2008-2016 Anope Team
+ * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  */
diff --git a/src/win32/pipe/pipe.cpp b/src/win32/pipe/pipe.cpp
index 706ff655e..70690ab2b 100644
--- a/src/win32/pipe/pipe.cpp
+++ b/src/win32/pipe/pipe.cpp
@@ -1,6 +1,7 @@
- /* POSIX emulation layer for Windows.
+/* POSIX emulation layer for Windows.
  *
- * Copyright (C) 2008-2014 Anope Team <team@anope.org>
+ * (C) 2008-2016 Anope Team
+ * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  */
@@ -58,4 +59,3 @@ int pipe(int fds[2])
 	
 	return 0;
 }
-
diff --git a/src/win32/pipe/pipe.h b/src/win32/pipe/pipe.h
index 8e67bafc7..d77d0706b 100644
--- a/src/win32/pipe/pipe.h
+++ b/src/win32/pipe/pipe.h
@@ -1,6 +1,7 @@
- /* POSIX emulation layer for Windows.
+/* POSIX emulation layer for Windows.
  *
- * Copyright (C) 2008-2014 Anope Team <team@anope.org>
+ * (C) 2008-2016 Anope Team
+ * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  */
diff --git a/src/win32/pthread/pthread.cpp b/src/win32/pthread/pthread.cpp
index 3bb8b6d7b..36b8cd54d 100644
--- a/src/win32/pthread/pthread.cpp
+++ b/src/win32/pthread/pthread.cpp
@@ -1,6 +1,7 @@
- /* POSIX emulation layer for Windows.
+/* POSIX emulation layer for Windows.
  *
- * Copyright (C) 2008-2014 Anope Team <team@anope.org>
+ * (C) 2008-2016 Anope Team
+ * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  */
diff --git a/src/win32/pthread/pthread.h b/src/win32/pthread/pthread.h
index 234a2a027..18909a17d 100644
--- a/src/win32/pthread/pthread.h
+++ b/src/win32/pthread/pthread.h
@@ -1,6 +1,7 @@
- /* POSIX emulation layer for Windows.
+/* POSIX emulation layer for Windows.
  *
- * Copyright (C) 2008-2014 Anope Team <team@anope.org>
+ * (C) 2008-2016 Anope Team
+ * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  */
diff --git a/src/win32/resource.h b/src/win32/resource.h
index cccb0b4f5..0fb755b56 100644
--- a/src/win32/resource.h
+++ b/src/win32/resource.h
@@ -1,3 +1,11 @@
+/*
+ *
+ * (C) 2005-2016 Anope Team
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for further details.
+ */
+
 //{{NO_DEPENDENCIES}}
 // Microsoft Developer Studio generated include file.
 // Used by Win32GUI.rc
diff --git a/src/win32/sigaction/sigaction.cpp b/src/win32/sigaction/sigaction.cpp
index d5a2d87d1..17faaf2fb 100644
--- a/src/win32/sigaction/sigaction.cpp
+++ b/src/win32/sigaction/sigaction.cpp
@@ -1,19 +1,20 @@
- /* POSIX emulation layer for Windows.
+/* POSIX emulation layer for Windows.
  *
- * Copyright (C) 2008-2014 Anope Team <team@anope.org>
+ * (C) 2008-2016 Anope Team
+ * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
  */
- 
- #include <windows.h>
- #include "sigaction.h"
- #include <signal.h>
- 
- int sigaction(int sig, struct sigaction *action, struct sigaction *old)
- {
+
+#include <windows.h>
+#include "sigaction.h"
+#include <signal.h>
+
+int sigaction(int sig, struct sigaction *action, struct sigaction *old)
+{
 	if (sig == -1)
 		return 0;
 	if (old == NULL)
@@ -27,5 +28,4 @@
 			return -1;
 	}
 	return 0;
- }
- 
\ No newline at end of file
+}
diff --git a/src/win32/sigaction/sigaction.h b/src/win32/sigaction/sigaction.h
index 0e9c2f246..c517ba16d 100644
--- a/src/win32/sigaction/sigaction.h
+++ b/src/win32/sigaction/sigaction.h
@@ -1,28 +1,28 @@
- /* POSIX emulation layer for Windows.
+/* POSIX emulation layer for Windows.
  *
- * Copyright (C) 2008-2014 Anope Team <team@anope.org>
+ * (C) 2008-2016 Anope Team
+ * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
  */
- 
- #define sigemptyset(x) memset((x), 0, sizeof(*(x)))
- 
- #ifndef SIGHUP
- # define SIGHUP -1
- #endif
- #ifndef SIGPIPE
- # define SIGPIPE -1
- #endif
- 
- struct sigaction
- {
+
+#define sigemptyset(x) memset((x), 0, sizeof(*(x)))
+
+#ifndef SIGHUP
+# define SIGHUP -1
+#endif
+#ifndef SIGPIPE
+# define SIGPIPE -1
+#endif
+
+struct sigaction
+{
 	void (*sa_handler)(int);
 	int sa_flags;
 	int sa_mask;
- };
- 
- extern int sigaction(int, struct sigaction *, struct sigaction *);
- 
+};
+
+extern int sigaction(int, struct sigaction *, struct sigaction *);
diff --git a/src/win32/socket.cpp b/src/win32/socket.cpp
index 211999f9a..489192679 100644
--- a/src/win32/socket.cpp
+++ b/src/win32/socket.cpp
@@ -1,6 +1,7 @@
- /* POSIX emulation layer for Windows.
+/* POSIX emulation layer for Windows.
  *
- * Copyright (C) 2008-2014 Anope Team <team@anope.org>
+ * (C) 2008-2016 Anope Team
+ * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  */
diff --git a/src/win32/socket.h b/src/win32/socket.h
index d587618a9..a8064589e 100644
--- a/src/win32/socket.h
+++ b/src/win32/socket.h
@@ -1,6 +1,7 @@
- /* POSIX emulation layer for Windows.
+/* POSIX emulation layer for Windows.
  *
- * Copyright (C) 2008-2014 Anope Team <team@anope.org>
+ * (C) 2008-2016 Anope Team
+ * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  */
diff --git a/src/win32/win32.rc.cmake b/src/win32/win32.rc.cmake
index 4cca9d89d..1e86c7e0d 100644
--- a/src/win32/win32.rc.cmake
+++ b/src/win32/win32.rc.cmake
@@ -54,7 +54,7 @@ BEGIN
             VALUE "FileDescription", "Anope IRC Services"
             VALUE "FileVersion", "@VERSION_FULL@"
             VALUE "InternalName", "Anope"
-            VALUE "LegalCopyright", "Copyright (C) 2003-2014 Anope Team"
+            VALUE "LegalCopyright", "Copyright (C) 2003-2016 Anope Team"
             VALUE "OriginalFilename", "anope.exe"
             VALUE "ProductName", "Anope"
             VALUE "ProductVersion", "@VERSION_DOTTED@"
diff --git a/src/win32/windows.cpp b/src/win32/windows.cpp
index 997260581..ac6801cba 100644
--- a/src/win32/windows.cpp
+++ b/src/win32/windows.cpp
@@ -1,7 +1,7 @@
- /* POSIX emulation layer for Windows.
+/* POSIX emulation layer for Windows.
  *
- * Copyright (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * Copyright (C) 2008-2014 Anope Team <info@anope.org>
+ * (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
+ * (C) 2008-2016 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  *
diff --git a/src/xline.cpp b/src/xline.cpp
index 49341072f..21cbc2501 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -1,13 +1,12 @@
 /* XLine functions.
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2016 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
 #include "services.h"