diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 3dbb9941e69..80f2eda464f 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-10  Adam Megacz <adam@xwt.org>
+
+        * java/net/natPlainSocketImpl.cc: Added #include <platform.h>.
+	
 2002-03-10  Tom Tromey  <tromey@redhat.com>
 
 	* java/awt/GridLayout.java (layoutContainer): Handle case where
@@ -55,6 +59,7 @@
 	* java/lang/natObject.cc: Move thread synchronization primitives to
 	system-dependent headers.
 
+>>>>>>> 1.1231
 2002-03-09  Adam Megacz  <adam@xwt.org>
 
         * java/io/natFileDescriptorWin32.cc (read): Return -1 if zero
diff --git a/libjava/java/net/natPlainSocketImpl.cc b/libjava/java/net/natPlainSocketImpl.cc
index dd8d2ccdd55..855965132b5 100644
--- a/libjava/java/net/natPlainSocketImpl.cc
+++ b/libjava/java/net/natPlainSocketImpl.cc
@@ -7,7 +7,7 @@ Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
 details.  */
 
 #include <config.h>
-
+#include <platform.h>
 
 #ifndef DISABLE_JAVA_NET
 #ifdef WIN32