diff --git a/ChangeLog b/ChangeLog
index 90ce9eb1a1..380ca3379f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun Apr  7 10:44:01 2013  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/defines.h: Simplify the logic to include sys/select.h.
+	  This fixes a compilation error on Haiku (gcc2 and gcc4).
+
+	* configure.in: Use shared linker as $(CC) for Haiku.
+	  This fixes a build error on Haiku (gcc2).
+
 Sun Apr  7 10:41:30 2013  Tanaka Akira  <akr@fsij.org>
 
 	* lib/resolv.rb (MDNSOneShot#sender): Delete an unused variable.
diff --git a/configure.in b/configure.in
index 9b28e2b1fe..ede3f9c3c3 100644
--- a/configure.in
+++ b/configure.in
@@ -2439,8 +2439,7 @@ if test "$with_dln_a_out" != yes; then
 			    DLDFLAGS="$DLDFLAGS -lroot glue-noinit.a init_term_dyn.o start_dyn.o"
                             ],
 			  [i586*], [
-			    : ${LDSHARED='$(LD) -shared'}
-			    DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -lroot"
+			    : ${LDSHARED='$(CC) -shared'}
 			    ])
 			: ${LIBPATHENV=LIBRARY_PATH}
 			rb_cv_dlopen=yes ],
diff --git a/include/ruby/defines.h b/include/ruby/defines.h
index 93b9025014..f6fe2c9832 100644
--- a/include/ruby/defines.h
+++ b/include/ruby/defines.h
@@ -57,6 +57,10 @@ extern "C" {
 # include <unistd.h>
 #endif
 
+#ifdef HAVE_SYS_SELECT_H
+# include <sys/select.h>
+#endif
+
 #define RUBY
 
 #ifdef __cplusplus
@@ -193,8 +197,6 @@ void xfree(void*);
 
 #if defined(__BEOS__) && !defined(__HAIKU__) && !defined(BONE)
 #include <net/socket.h> /* intern.h needs fd_set definition */
-#elif defined (__SYMBIAN32__) && defined (HAVE_SYS_SELECT_H)
-# include <sys/select.h>
 #endif
 
 #ifdef __SYMBIAN32__