diff --git a/ChangeLog b/ChangeLog
index 2fa429e958..565868d41d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-30  Tor Lillqvist  <tml@iki.fi>
+
+	* modules/input/Makefile.am (im_ime_la_LIBADD): Link with -limm32.
+
+	* modules/input/gtkimcontextime.c: Use quotes in #includes, to
+	find headers when building inside GTK+ sources.
+
 2004-08-27  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkdnd-win32.c (GdkDragContextPrivateWin32): Add
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2fa429e958..565868d41d 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2004-08-30  Tor Lillqvist  <tml@iki.fi>
+
+	* modules/input/Makefile.am (im_ime_la_LIBADD): Link with -limm32.
+
+	* modules/input/gtkimcontextime.c: Use quotes in #includes, to
+	find headers when building inside GTK+ sources.
+
 2004-08-27  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkdnd-win32.c (GdkDragContextPrivateWin32): Add
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2fa429e958..565868d41d 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2004-08-30  Tor Lillqvist  <tml@iki.fi>
+
+	* modules/input/Makefile.am (im_ime_la_LIBADD): Link with -limm32.
+
+	* modules/input/gtkimcontextime.c: Use quotes in #includes, to
+	find headers when building inside GTK+ sources.
+
 2004-08-27  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkdnd-win32.c (GdkDragContextPrivateWin32): Add
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2fa429e958..565868d41d 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2004-08-30  Tor Lillqvist  <tml@iki.fi>
+
+	* modules/input/Makefile.am (im_ime_la_LIBADD): Link with -limm32.
+
+	* modules/input/gtkimcontextime.c: Use quotes in #includes, to
+	find headers when building inside GTK+ sources.
+
 2004-08-27  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkdnd-win32.c (GdkDragContextPrivateWin32): Add
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index b234f0b2e6..42c6e89978 100644
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -82,7 +82,7 @@ im_ime_la_SOURCES = \
 	gtkimcontextime.h \
 	imime.c 	  \
 	imm-extra.h
-im_ime_la_LIBADD = $(LDADDS)
+im_ime_la_LIBADD = -limm32 $(LDADDS)
 if PLATFORM_WIN32
 IM_IME_MODULE=im-ime.la 
 endif
diff --git a/modules/input/gtkimcontextime.c b/modules/input/gtkimcontextime.c
index b441d53c57..82397bbb90 100644
--- a/modules/input/gtkimcontextime.c
+++ b/modules/input/gtkimcontextime.c
@@ -30,9 +30,9 @@
 
 #include "imm-extra.h"
 
-#include <gdk/gdkwin32.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwidget.h>
+#include "gdk/win32/gdkwin32.h"
+#include "gdk/gdkkeysyms.h"
+#include "gtk/gtkwidget.h"
 
 /* avoid warning */
 #ifdef STRICT