diff --git a/ChangeLog b/ChangeLog
index 4639f4e79..707411e33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,10 @@
    - stevesk@cvs.openbsd.org 2006/02/08 14:31:30
      [includes.h ssh-agent.c ssh-keyscan.c ssh.c]
      move #include <sys/resource.h> out of includes.h; ok markus@
+   - stevesk@cvs.openbsd.org 2006/02/08 14:38:18
+     [includes.h packet.c]
+     move #include <netinet/in_systm.h> and <netinet/ip.h> out of
+     includes.h; ok markus@
 
 20060313
  - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -3944,4 +3948,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4152 2006/03/15 00:22:47 djm Exp $
+$Id: ChangeLog,v 1.4153 2006/03/15 00:24:12 djm Exp $
diff --git a/includes.h b/includes.h
index 27792e10a..60053b8d3 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: includes.h,v 1.28 2006/02/08 14:31:30 stevesk Exp $	*/
+/*	$OpenBSD: includes.h,v 1.29 2006/02/08 14:38:18 stevesk Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -137,8 +137,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
 #endif
 
 #include <netinet/in_systm.h> /* For typedefs */
-#include <netinet/in.h> /* For IPv6 macros */
-#include <netinet/ip.h> /* For IPTOS macros */
 #include <arpa/inet.h>
 #if defined(HAVE_NETDB_H)
 # include <netdb.h>
diff --git a/packet.c b/packet.c
index db2aa2411..24d2bb312 100644
--- a/packet.c
+++ b/packet.c
@@ -37,9 +37,11 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: packet.c,v 1.120 2005/10/30 08:52:17 djm Exp $");
-
+RCSID("$OpenBSD: packet.c,v 1.121 2006/02/08 14:38:18 stevesk Exp $");
+ 
 #include "openbsd-compat/sys-queue.h"
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
 
 #include "xmalloc.h"
 #include "buffer.h"