diff --git a/ChangeLog b/ChangeLog
index 594672fc46..512fd78d7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Dec 14 13:47:54 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (ruby.imp): fix for circular dependency.  a patch from
+	  Yutaka Kanemoto <kinpoco AT gmail.com> in [ruby-dev:32590].
+
+	* regint.h, st.c, ext/json/ext/generator/generator.c: suppress
+	  warnings on AIX.
+
 Fri Dec 14 12:36:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (RUBY_CHECK_VARTYPE): check if a variable is defined
diff --git a/common.mk b/common.mk
index 4fce91be38..1f2f25e96f 100644
--- a/common.mk
+++ b/common.mk
@@ -121,8 +121,8 @@ $(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
 	@$(RM) $@
 	$(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
 
-ruby.imp: $(OBJS)
-	@$(NM) -Pgp $(OBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
+ruby.imp: $(COMMONOBJS)
+	@$(NM) -Pgp $(COMMONOBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
 
 install: install-nodoc $(RDOCTARGET)
 install-all: install-nodoc install-doc
diff --git a/ext/json/ext/generator/generator.c b/ext/json/ext/generator/generator.c
index 5239cc31d4..6bc37e38cb 100644
--- a/ext/json/ext/generator/generator.c
+++ b/ext/json/ext/generator/generator.c
@@ -1,9 +1,9 @@
 /* vim: set cin et sw=4 ts=4: */
 
-#include <string.h>
 #include "ruby.h"
 #include "ruby/st.h"
 #include "unicode.h"
+#include <string.h>
 #include <math.h>
 
 #define check_max_nesting(state, depth) do {                                   \
diff --git a/regint.h b/regint.h
index 1705410eec..182eed2670 100644
--- a/regint.h
+++ b/regint.h
@@ -194,7 +194,7 @@
 #include <stdlib.h>
 #endif
 
-#if defined(HAVE_ALLOCA_H) && !defined(__GNUC__)
+#if defined(HAVE_ALLOCA_H) && (defined(_AIX) || !defined(__GNUC__))
 #include <alloca.h>
 #endif
 
diff --git a/st.c b/st.c
index 5efd57e439..4d21016a68 100644
--- a/st.c
+++ b/st.c
@@ -2,12 +2,6 @@
 
 /* static	char	sccsid[] = "@(#) st.c 5.1 89/12/14 Crucible"; */
 
-#include <stdio.h>
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#include <string.h>
-
 #ifdef NOT_RUBY
 #include "regint.h"
 #include "st.h"
@@ -17,6 +11,12 @@
 #include "ruby/st.h"
 #endif
 
+#include <stdio.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#include <string.h>
+
 typedef struct st_table_entry st_table_entry;
 
 struct st_table_entry {