diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 3100d2fc262..45ad53b79d3 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-25  Bryce McKinlay  <bryce@mckinlay.net.nz>
+
+	* gnu/java/net/natPlainSocketImplWin32.cc: Add missing #includes.
+	PR libgcj/12388.
+
 2003-09-24  Bryce McKinlay  <bryce@mckinlay.net.nz>
 
 	* java/lang/StringBuffer.java (substring): Don't set `shared' on small
diff --git a/libjava/gnu/java/net/natPlainSocketImplWin32.cc b/libjava/gnu/java/net/natPlainSocketImplWin32.cc
index fc93e5713c7..57607e85696 100644
--- a/libjava/gnu/java/net/natPlainSocketImplWin32.cc
+++ b/libjava/gnu/java/net/natPlainSocketImplWin32.cc
@@ -14,6 +14,8 @@ details.  */
 #undef MIN_PRIORITY
 
 #include <gnu/java/net/PlainSocketImpl.h>
+#include <gnu/java/net/PlainSocketImpl$SocketInputStream.h>
+#include <gnu/java/net/PlainSocketImpl$SocketOutputStream.h>
 #include <java/io/IOException.h>
 #include <java/io/InterruptedIOException.h>
 #include <java/net/BindException.h>