diff --git a/opal/mca/timer/aix/configure.m4 b/opal/mca/timer/aix/configure.m4
index 6820de5775..b7027275a1 100644
--- a/opal/mca/timer/aix/configure.m4
+++ b/opal/mca/timer/aix/configure.m4
@@ -26,6 +26,10 @@ AC_DEFUN([MCA_opal_timer_aix_COMPILE_MODE], [
     AC_MSG_RESULT([$$4])
 ])
 
+AC_DEFUN([MCA_opal_timer_aix_POST_CONFIG],[
+    AS_IF([test "$1" = "1"], [timer_base_include="aix/timer_aix.h"])
+])dnl
+
 
 # MCA_timer_aix_CONFIG(action-if-can-compile, 
 #                        [action-if-cant-compile])
@@ -70,7 +74,6 @@ AC_DEFUN([MCA_opal_timer_aix_CONFIG],[
 
     AS_IF([test "$timer_aix_happy" = "yes"], 
           [timer_aix_WRAPPER_EXTRA_LIBS="$timer_aix_LIBS"
-           timer_base_include="aix/timer_aix.h"
            $1], 
           [$2])
 ])
diff --git a/opal/mca/timer/altix/configure.m4 b/opal/mca/timer/altix/configure.m4
index 17853f28ce..e8208b070f 100644
--- a/opal/mca/timer/altix/configure.m4
+++ b/opal/mca/timer/altix/configure.m4
@@ -25,6 +25,9 @@ AC_DEFUN([MCA_opal_timer_altix_COMPILE_MODE], [
     AC_MSG_RESULT([$$4])
 ])
 
+AC_DEFUN([MCA_opal_timer_altix_POST_CONFIG],[
+    AS_IF([test "$1" = "1"], [timer_base_include="altix/timer_altix.h"])
+])dnl
 
 # MCA_timer_altix_CONFIG(action-if-can-compile, 
 #                        [action-if-cant-compile])
@@ -73,7 +76,6 @@ AC_DEFUN([MCA_opal_timer_altix_CONFIG],[
           [AC_MSG_ERROR([Altix timer requested but not available.  Aborting.])])
 
     AS_IF([test "$timer_altix_happy" = "yes"], 
-          [timer_base_include="altix/timer_altix.h"
-           $1], 
+          [$1], 
           [$2])
 ])
diff --git a/opal/mca/timer/catamount/configure.m4 b/opal/mca/timer/catamount/configure.m4
index 25b1cb88bb..2f91de0cac 100644
--- a/opal/mca/timer/catamount/configure.m4
+++ b/opal/mca/timer/catamount/configure.m4
@@ -25,6 +25,9 @@ AC_DEFUN([MCA_opal_timer_catamount_COMPILE_MODE], [
     AC_MSG_RESULT([$$4])
 ])
 
+AC_DEFUN([MCA_opal_timer_catamount_POST_CONFIG],[
+    AS_IF([test "$1" = "1"], [timer_base_include="catamount/timer_catamount.h"])
+])dnl
 
 # MCA_timer_catamount_CONFIG(action-if-can-compile, 
 #                        [action-if-cant-compile])
@@ -62,7 +65,6 @@ unsigned int a = __cpu_mhz;
          [AC_MSG_ERROR([Catamount timer requested but not available.  Aborting.])])
 
     AS_IF([test "$timer_catamount_happy" = "yes"], 
-          [timer_base_include="catamount/timer_catamount.h"
-           $1], 
+          [$1], 
           [$2])
 ])
diff --git a/opal/mca/timer/darwin/configure.m4 b/opal/mca/timer/darwin/configure.m4
index c35e894af6..b466ff51a1 100644
--- a/opal/mca/timer/darwin/configure.m4
+++ b/opal/mca/timer/darwin/configure.m4
@@ -25,6 +25,9 @@ AC_DEFUN([MCA_opal_timer_darwin_COMPILE_MODE], [
     AC_MSG_RESULT([$$4])
 ])
 
+AC_DEFUN([MCA_opal_timer_darwin_POST_CONFIG],[
+    AS_IF([test "$1" = "1"], [timer_base_include="darwin/timer_darwin.h"])
+])dnl
 
 # MCA_timer_darwin_CONFIG(action-if-can-compile, 
 #                        [action-if-cant-compile])
@@ -51,7 +54,6 @@ AC_DEFUN([MCA_opal_timer_darwin_CONFIG],[
          [AC_MSG_ERROR([Darwin timer requested but not available.  Aborting.])])
 
     AS_IF([test "$timer_darwin_happy" = "yes"], 
-          [timer_base_include="darwin/timer_darwin.h"
-           $1], 
+          [$1], 
           [$2])
 ])
diff --git a/opal/mca/timer/linux/configure.m4 b/opal/mca/timer/linux/configure.m4
index a4f9eebfaa..269426c682 100644
--- a/opal/mca/timer/linux/configure.m4
+++ b/opal/mca/timer/linux/configure.m4
@@ -25,6 +25,9 @@ AC_DEFUN([MCA_opal_timer_linux_COMPILE_MODE], [
     AC_MSG_RESULT([$$4])
 ])
 
+AC_DEFUN([MCA_opal_timer_linux_POST_CONFIG],[
+    AS_IF([test "$1" = "1"], [timer_base_include="linux/timer_linux.h"])
+])dnl
 
 # MCA_timer_linux_CONFIG(action-if-can-compile, 
 #                        [action-if-cant-compile])
@@ -57,7 +60,6 @@ AC_DEFUN([MCA_opal_timer_linux_CONFIG],[
          [AC_MSG_ERROR([Linux timer requested but not available.  Aborting.])])
 
     AS_IF([test "$timer_linux_happy" = "yes"], 
-          [timer_base_include="linux/timer_linux.h"
-           $1], 
+          [$1], 
           [$2])
 ])
diff --git a/opal/mca/timer/solaris/configure.m4 b/opal/mca/timer/solaris/configure.m4
index d6fb21ce47..2a3e5fdaf9 100644
--- a/opal/mca/timer/solaris/configure.m4
+++ b/opal/mca/timer/solaris/configure.m4
@@ -25,6 +25,9 @@ AC_DEFUN([MCA_opal_timer_solaris_COMPILE_MODE], [
     AC_MSG_RESULT([$$4])
 ])
 
+AC_DEFUN([MCA_opal_timer_solaris_POST_CONFIG],[
+    AS_IF([test "$1" = "1"], [timer_base_include="solaris/timer_solaris.h"])
+])dnl
 
 # MCA_timer_solaris_CONFIG(action-if-can-compile, 
 #                        [action-if-cant-compile])
@@ -50,7 +53,6 @@ AC_DEFUN([MCA_opal_timer_solaris_CONFIG],[
          [AC_MSG_ERROR([Solaris timer requested but not available.  Aborting.])])
 
     AS_IF([test "$timer_solaris_happy" = "yes"], 
-          [timer_base_include="solaris/timer_solaris.h"
-           $1], 
+          [$1], 
           [$2])
 ])
diff --git a/opal/mca/timer/windows/configure.m4 b/opal/mca/timer/windows/configure.m4
index fa5ee346e6..32b810e028 100644
--- a/opal/mca/timer/windows/configure.m4
+++ b/opal/mca/timer/windows/configure.m4
@@ -25,6 +25,9 @@ AC_DEFUN([MCA_opal_timer_windows_COMPILE_MODE], [
     AC_MSG_RESULT([$$4])
 ])
 
+AC_DEFUN([MCA_opal_timer_windows_POST_CONFIG],[
+    AS_IF([test "$1" = "1"], [timer_base_include="windows/timer_windows.h"])
+])dnl
 
 # MCA_timer_windows_CONFIG(action-if-can-compile, 
 #                          [action-if-cant-compile])
@@ -52,7 +55,6 @@ AC_DEFUN([MCA_opal_timer_windows_CONFIG],[
          [AC_MSG_ERROR([Windows timer requested but not available.  Aborting.])])
 
     AS_IF([test "$timer_windows_happy" = "yes"], 
-          [timer_base_include="windows/timer_windows.h"
-           $1], 
+          [$1], 
           [$2])
 ])