Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2 files changed, 22 insertions, 3 deletions

diff --git a/src/server/shared/Packets/ByteBuffer.cpp b/src/server/shared/Packets/ByteBuffer.cpp
index a14cf3477af..3b4be003858 100644
--- a/src/server/shared/Packets/ByteBuffer.cpp
+++ b/src/server/shared/Packets/ByteBuffer.cpp
@@ -1,4 +1,23 @@
+/*
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
+ *
+ * This program 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; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
 #include "ByteBuffer.h"
+#include "Common.h"
 #include "Log.h"
 
 #include <ace/Stack_Trace.h>
diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h
index 0f4221b53ff..0bbaff38be1 100644
--- a/src/server/shared/Packets/ByteBuffer.h
+++ b/src/server/shared/Packets/ByteBuffer.h
@@ -20,16 +20,16 @@
 #define _BYTEBUFFER_H
 
 #include "Define.h"
-#include "Debugging/Errors.h"
-#include "Utilities/ByteConverter.h"
+#include "Errors.h"
+#include "ByteConverter.h"
 
 #include <exception>
 #include <list>
 #include <map>
 #include <string>
 #include <vector>
-
 #include <cstring>
+#include <time.h>
 
 // Root of ByteBuffer exception hierarchy
 class ByteBufferException : public std::exception