1 files changed, 47 insertions, 21 deletions
diff --git a/include/defs.h b/include/defs.h
index 5cc0cb7ac..bd4f2871e 100644
--- a/include/defs.h
+++ b/include/defs.h
@@ -1,53 +1,79 @@
 /*
+ * Anope IRC Services
  *
- * (C) 2003-2016 Anope Team
- * Contact us at team@anope.org
+ * Copyright (C) 2004-2016 Anope Team <team@anope.org>
  *
- * Please read COPYING and README for further details.
+ * This file is part of Anope. Anope is free software; you can
+ * redistribute it and/or modify it under the terms of the GNU
+ * General Public License as published by the Free Software
+ * Foundation, version 2.
  *
- * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church.
+ * This program is distributed in the hope that 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 see <http://www.gnu.org/licenses/>.
  */
 
-class AccessGroup;
+
 class AutoKick;
 class BotInfo;
-class CallBack;
-class ChanAccess;
 class Channel;
-class ChannelInfo;
+class ChannelMode;
 class ChannelStatus;
+namespace ChanServ
+{
+	class AccessGroup;
+	class ChanAccess;
+	class Channel;
+}
 struct ChanUserContainer;
 class ClientSocket;
 class Command;
 class CommandSource;
-namespace Configuration { struct Conf; }
 class ConnectionSocket;
-namespace DNS { struct Query; }
 class Entry;
-class IdentifyRequest;
+class ExtensibleBase;
 class InfoFormatter;
 class IRCDProto;
 class ListenSocket;
 class Log;
-class Memo;
+class LogInfo;
+class Logger;
+namespace NickServ
+{
+	class Account;
+	class Nick;
+	class IdentifyRequest;
+}
+namespace MemoServ
+{
+	class Memo;
+	class MemoInfo;
+}
 class MessageSource;
 class Module;
-class NickAlias;
-class NickCore;
 class OperType;
 class ReferenceBase;
 class Regex;
-class Serializable;
+class ServiceBot;
+namespace Serialize
+{
+	using ID = uint64_t;
+	struct Edge;
+	class FieldBase;
+	class TypeBase;
+	class Object;
+}
 class Server;
 class Socket;
 class Thread;
 class User;
 class XLine;
 class XLineManager;
-struct BadWord;
-struct Exception;
-struct MemoInfo;
-struct ModeLock;
-struct Oper;
+class Oper;
 namespace SASL { struct Message; }
+class UserMode;
+