diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 18400da496b..dd1e4610798 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,12 @@
+2003-03-24  Michael Koch  <konqueror@gmx.de>
+
+	* java/net/natInetAddressNoNet.cc:
+	Include stddef.h.
+	* java/net/natPlainDatagramSocketImplNoNet.cc:
+	Fixed inlcude of java/net/DatagramPacket.h.
+	* java/net/natPlainSocketImplNoNet.cc:
+	Include some missing classes.
+
 2003-03-24  Michael Koch  <konqueror@gmx.de>
 
 	* java/awt/dnd/DropTarget.java
diff --git a/libjava/java/net/natInetAddressNoNet.cc b/libjava/java/net/natInetAddressNoNet.cc
index d28e6b35c22..0374af18f88 100644
--- a/libjava/java/net/natInetAddressNoNet.cc
+++ b/libjava/java/net/natInetAddressNoNet.cc
@@ -7,6 +7,7 @@ Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
 details.  */
 
 #include <config.h>
+#include <stddef.h>
 
 #include <java/net/InetAddress.h>
 
diff --git a/libjava/java/net/natPlainDatagramSocketImplNoNet.cc b/libjava/java/net/natPlainDatagramSocketImplNoNet.cc
index 7c05ee9aa73..a2a08d719c4 100644
--- a/libjava/java/net/natPlainDatagramSocketImplNoNet.cc
+++ b/libjava/java/net/natPlainDatagramSocketImplNoNet.cc
@@ -12,7 +12,7 @@ details.  */
 #include <java/io/IOException.h>
 #include <java/lang/Object.h>
 #include <java/net/BindException.h>
-#include <java/net/DatagramPacketInetAddress.h>
+#include <java/net/DatagramPacket.h>
 #include <java/net/InetAddress.h>
 #include <java/net/NetworkInterface.h>
 #include <java/net/PlainDatagramSocketImpl.h>
diff --git a/libjava/java/net/natPlainSocketImplNoNet.cc b/libjava/java/net/natPlainSocketImplNoNet.cc
index 67270df4445..e65438ef1d5 100644
--- a/libjava/java/net/natPlainSocketImplNoNet.cc
+++ b/libjava/java/net/natPlainSocketImplNoNet.cc
@@ -9,7 +9,11 @@ details.  */
 #include <config.h>
 #include <platform.h>
 
+#include <java/io/IOException.h>
+#include <java/net/BindException.h>
+#include <java/net/ConnectException.h>
 #include <java/net/PlainSocketImpl.h>
+#include <java/net/SocketException.h>
 
 void
 java::net::PlainSocketImpl::create (jboolean)