diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 749fe2a89..07eb14143 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,5 +1,13 @@
 Mon Apr 21 05:00:32 1997  Gary Houston  <ghouston@actrix.gen.nz>
 
+	* eq.c (scm_equal_p): use "SCM_TYP7SD", not "SCM (TYP7SD".
+
+	* stime.c: include both <sys/times.h> and <sys/timeb.h> if the
+	system has them.  Hope this is safe.  Previously
+	sys/timeb.h was included if HAVE_FTIME was defined or if
+	HAVE_SYS_TIMEB_H was defined but HAVE_SYS_TIMES_H was not,
+	but IRIX iris 5.3 apparently has ftime but not sys/timeb.h.
+
 	* ioext.c (scm_setfileno): add missing third argument to
 	scm_misc_error call.
 
diff --git a/libguile/eq.c b/libguile/eq.c
index d5ef0241e..a203e6dba 100644
--- a/libguile/eq.c
+++ b/libguile/eq.c
@@ -107,7 +107,7 @@ scm_equal_p (x, y)
 		goto tailrecurse;
 	}
 	if (SCM_TYP7SD (x) == scm_tc7_string
-	    && SCM (TYP7SD (x) == scm_tc7_string))
+	    && SCM_TYP7SD (x) == scm_tc7_string)
 	  return scm_string_equal_p (x, y);
 	/* This ensures that types and scm_length are the same.  */
 	if (SCM_CAR(x) != SCM_CAR(y)) return SCM_BOOL_F;
diff --git a/libguile/stime.c b/libguile/stime.c
index 2847c04aa..3781dd9ed 100644
--- a/libguile/stime.c
+++ b/libguile/stime.c
@@ -69,13 +69,13 @@
 #  endif
 # endif
 
-# ifdef HAVE_SYS_TIMES_H
-#  include <sys/times.h>
-# else
-#  ifdef HAVE_SYS_TIMEB_H
-#   include <sys/timeb.h>
-#  endif
-# endif
+#ifdef HAVE_SYS_TIMES_H
+# include <sys/times.h>
+#endif
+
+#ifdef HAVE_SYS_TIMEB_H
+# include <sys/timeb.h>
+#endif
 
 #ifndef tzname /* For SGI.  */
 extern char *tzname[]; /* RS6000 and others reject char **tzname.  */
@@ -105,12 +105,6 @@ char *strptime ();
 # endif
 #endif
 
-
-# ifdef HAVE_FTIME
-#   include <sys/timeb.h>
-# endif
-
-
 #ifdef __STDC__
 # define timet time_t
 #else