diff --git a/common/eq_packet.cpp b/common/eq_packet.cpp
index 3ea622040..60d892c23 100644
--- a/common/eq_packet.cpp
+++ b/common/eq_packet.cpp
@@ -15,18 +15,21 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
+
+#include "crc16.h"
 #include "debug.h"
-#include <stdio.h>
-#include <iostream>
-#include <iomanip>
 #include "eq_packet.h"
 #include "misc.h"
 #include "op_codes.h"
-#include "crc16.h"
 #include "platform.h"
+#include <iomanip>
+#include <iostream>
+#include <stdio.h>
+
 #ifndef STATIC_OPCODE
 #include "opcodemgr.h"
 #endif
+
 #include "packet_dump.h"
 #include "packet_functions.h"
 #include <cstdlib>
diff --git a/common/eq_packet.h b/common/eq_packet.h
index 04418f733..dcd3747a0 100644
--- a/common/eq_packet.h
+++ b/common/eq_packet.h
@@ -19,8 +19,6 @@
 #define _EQPACKET_H
 
 #include "base_packet.h"
-#include "eq_stream_type.h"
-#include "op_codes.h"
 #include "platform.h"
 
 #ifdef STATIC_OPCODE
@@ -30,9 +28,6 @@
 #include "emu_opcodes.h"
 #endif
 
-class EQStream;
-class EQStreamPair;
-
 class EQPacket : public BasePacket {
 	friend class EQStream;
 public: