diff --git a/opal/mca/timer/darwin/configure.m4 b/opal/mca/timer/darwin/configure.m4
index 8a792e7daa..384361904d 100644
--- a/opal/mca/timer/darwin/configure.m4
+++ b/opal/mca/timer/darwin/configure.m4
@@ -28,7 +28,7 @@ AC_DEFUN([MCA_timer_darwin_COMPILE_MODE], [
 AC_DEFUN([MCA_timer_darwin_CONFIG],[
     AC_ARG_WITH([timer],
         [AC_HELP_STRING([--with-timer=TYPE],
-                        [blah blah blah])])
+                        [Build high resolution timer component TYPE])])
 
     AS_IF([test "$with_timer" = "darwin"],
           [timer_darwin_happy="yes"
diff --git a/opal/mca/timer/linux/configure.m4 b/opal/mca/timer/linux/configure.m4
index 570a67c651..82c7a927bb 100644
--- a/opal/mca/timer/linux/configure.m4
+++ b/opal/mca/timer/linux/configure.m4
@@ -28,7 +28,7 @@ AC_DEFUN([MCA_timer_linux_COMPILE_MODE], [
 AC_DEFUN([MCA_timer_linux_CONFIG],[
     AC_ARG_WITH([timer],
         [AC_HELP_STRING([--with-timer=TYPE],
-                        [blah blah blah])])
+                        [Build high resolution timer component TYPE])])
 
     AS_IF([test "$with_timer" = "linux"],
           [timer_linux_happy="yes"
diff --git a/opal/mca/timer/solaris/configure.m4 b/opal/mca/timer/solaris/configure.m4
index 451a49bd62..33b8bdbe0f 100644
--- a/opal/mca/timer/solaris/configure.m4
+++ b/opal/mca/timer/solaris/configure.m4
@@ -28,7 +28,7 @@ AC_DEFUN([MCA_timer_solaris_COMPILE_MODE], [
 AC_DEFUN([MCA_timer_solaris_CONFIG],[
     AC_ARG_WITH([timer],
         [AC_HELP_STRING([--with-timer=TYPE],
-                        [blah blah blah])])
+                        [Build high resolution timer component TYPE])])
 
     AS_IF([test "$with_timer" = "solaris"],
           [timer_solaris_happy="yes"
@@ -48,7 +48,7 @@ AC_DEFUN([MCA_timer_solaris_CONFIG],[
          [AC_MSG_ERROR([Solaris timer requested but not available.  Aborting.])])
 
     AS_IF([test "$timer_solaris_happy" = "yes"], 
-          [timer_base_include="darwin/timer_darwin.h"
+          [timer_base_include="solaris/timer_solaris.h"
            $1], 
           [$2])
 ])
diff --git a/opal/mca/timer/solaris/timer_solaris.h b/opal/mca/timer/solaris/timer_solaris.h
index 5648c8695b..1fb660ee3a 100644
--- a/opal/mca/timer/solaris/timer_solaris.h
+++ b/opal/mca/timer/solaris/timer_solaris.h
@@ -17,26 +17,26 @@
 #ifndef OPAL_MCA_TIMER_SOLARIS_TIMER_SOLARIS_H
 #define OPAL_MCA_TIMER_SOLARIS_TIMER_SOLARIS_H
 
-#include <mach/mach_time.h>
+#include <sys/time.h>
 
 typedef hrtime_t opal_timer_t;
 
 
 static inline opal_timer_t
-opal_timer_base_get_cycles()
+opal_timer_base_get_cycles(void)
 {
     return 0;
 }
 
 static inline opal_timer_t
-opal_timer_base_get_usec()
+opal_timer_base_get_usec(void)
 {
     /* gethrtime returns nanoseconds */
     return gethrtime() / 1000;
 }    
 
 static inline opal_timer_t
-opal_timer_base_get_freq()
+opal_timer_base_get_freq(void)
 {
     return 0;
 }
diff --git a/opal/mca/timer/solaris/timer_solaris_component.c b/opal/mca/timer/solaris/timer_solaris_component.c
index 8933f204b0..f1b386ed4b 100644
--- a/opal/mca/timer/solaris/timer_solaris_component.c
+++ b/opal/mca/timer/solaris/timer_solaris_component.c
@@ -19,7 +19,6 @@
 #include "opal/mca/timer/timer.h"
 #include "opal/mca/timer/solaris/timer_solaris.h"
 
-static int opal_timer_solaris_open(void);
 
 const opal_timer_base_component_1_0_0_t mca_timer_solaris_component = {
     /* First, the mca_component_t struct containing meta information
diff --git a/opal/threads/thread.c b/opal/threads/thread.c
index da5fca50dc..c47def2ee8 100644
--- a/opal/threads/thread.c
+++ b/opal/threads/thread.c
@@ -179,7 +179,7 @@ int opal_thread_start(opal_thread_t *t)
 
 int opal_thread_join(opal_thread_t *t, void **thr_return)
 {
-    int rc = thread_join(t->t_handle, NULL, thr_return);
+    int rc = thr_join(t->t_handle, NULL, thr_return);
     return (rc == 0) ? OMPI_SUCCESS : OMPI_ERROR;
 }