diff --git a/src/mpi/f77/Makefile.am b/src/mpi/f77/Makefile.am
index aa97467032..8a396fb7e4 100644
--- a/src/mpi/f77/Makefile.am
+++ b/src/mpi/f77/Makefile.am
@@ -345,7 +345,9 @@ libmpi_f77_mpi_la_SOURCES = \
         win_start_f.c \
         win_test_f.c \
         win_unlock_f.c \
-        win_wait_f.c 
+        win_wait_f.c \
+        wtick_f.c \
+        wtime_f.c
 #
 EXTRA_DIST = $(libmpi_f77_mpi_la_SOURCES)
 #
diff --git a/src/mpi/f77/profile/Makefile.am b/src/mpi/f77/profile/Makefile.am
index 9ed79e9d7f..ed33ccd5c1 100644
--- a/src/mpi/f77/profile/Makefile.am
+++ b/src/mpi/f77/profile/Makefile.am
@@ -308,7 +308,9 @@ nodist_libmpi_f77_pmpi_la_SOURCES = \
         pwin_start_f.c \
         pwin_test_f.c \
         pwin_unlock_f.c \
-        pwin_wait_f.c 
+        pwin_wait_f.c \
+        pwtick_f.c \
+        pwtime_f.c 
 #
 # Sym link in the sources from the real MPI directory
 #
diff --git a/src/mpi/f77/profile/prototypes_pmpi.h b/src/mpi/f77/profile/prototypes_pmpi.h
index 7e241536ba..5428fffd02 100644
--- a/src/mpi/f77/profile/prototypes_pmpi.h
+++ b/src/mpi/f77/profile/prototypes_pmpi.h
@@ -300,8 +300,8 @@ void pmpi_win_start_f(MPI_Fint *group, MPI_Fint *assert, MPI_Fint *win, MPI_Fint
 void pmpi_win_test_f(MPI_Fint *win, MPI_Fint *flag, MPI_Fint *ierr);
 void pmpi_win_unlock_f(MPI_Fint *rank, MPI_Fint *win, MPI_Fint *ierr);
 void pmpi_win_wait_f(MPI_Fint *win, MPI_Fint *ierr);
-double pmpi_wtick_f(MPI_Fint *ierr);
-double pmpi_wtime_f(MPI_Fint *ierr);
+double *pmpi_wtick_f(void);
+double *pmpi_wtime_f(void);
 /*This is the all lower case prototypes*/
 
 void pmpi_abort(MPI_Fint *comm, MPI_Fint *errorcode, MPI_Fint *ierr);
@@ -587,8 +587,8 @@ void pmpi_win_start(MPI_Fint *group, MPI_Fint *assert, MPI_Fint *win, MPI_Fint *
 void pmpi_win_test(MPI_Fint *win, MPI_Fint *flag, MPI_Fint *ierr);
 void pmpi_win_unlock(MPI_Fint *rank, MPI_Fint *win, MPI_Fint *ierr);
 void pmpi_win_wait(MPI_Fint *win, MPI_Fint *ierr);
-double pmpi_wtick(MPI_Fint *ierr);
-double pmpi_wtime(MPI_Fint *ierr);
+double *pmpi_wtick(void);
+double *pmpi_wtime(void);
 /*This is the single underscore prototypes*/
 
 void pmpi_abort_(MPI_Fint *comm, MPI_Fint *errorcode, MPI_Fint *ierr);
@@ -874,8 +874,8 @@ void pmpi_win_start_(MPI_Fint *group, MPI_Fint *assert, MPI_Fint *win, MPI_Fint
 void pmpi_win_test_(MPI_Fint *win, MPI_Fint *flag, MPI_Fint *ierr);
 void pmpi_win_unlock_(MPI_Fint *rank, MPI_Fint *win, MPI_Fint *ierr);
 void pmpi_win_wait_(MPI_Fint *win, MPI_Fint *ierr);
-double pmpi_wtick_(MPI_Fint *ierr);
-double pmpi_wtime_(MPI_Fint *ierr);
+double *pmpi_wtick_(void);
+double *pmpi_wtime_(void);
 /*This is the double underscore prototypes*/
 
 void pmpi_abort__(MPI_Fint *comm, MPI_Fint *errorcode, MPI_Fint *ierr);
@@ -1161,8 +1161,8 @@ void pmpi_win_start__(MPI_Fint *group, MPI_Fint *assert, MPI_Fint *win, MPI_Fint
 void pmpi_win_test__(MPI_Fint *win, MPI_Fint *flag, MPI_Fint *ierr);
 void pmpi_win_unlock__(MPI_Fint *rank, MPI_Fint *win, MPI_Fint *ierr);
 void pmpi_win_wait__(MPI_Fint *win, MPI_Fint *ierr);
-double pmpi_wtick__(MPI_Fint *ierr);
-double pmpi_wtime__(MPI_Fint *ierr);
+double *pmpi_wtick__(void);
+double *pmpi_wtime__(void);
 /*This is the all upper case prototypes*/
 
 void PMPI_ABORT(MPI_Fint *comm, MPI_Fint *errorcode, MPI_Fint *ierr);
@@ -1448,7 +1448,7 @@ void PMPI_WIN_START(MPI_Fint *group, MPI_Fint *assert, MPI_Fint *win, MPI_Fint *
 void PMPI_WIN_TEST(MPI_Fint *win, MPI_Fint *flag, MPI_Fint *ierr);
 void PMPI_WIN_UNLOCK(MPI_Fint *rank, MPI_Fint *win, MPI_Fint *ierr);
 void PMPI_WIN_WAIT(MPI_Fint *win, MPI_Fint *ierr);
-double PMPI_WTICK(MPI_Fint *ierr);
-double PMPI_WTIME(MPI_Fint *ierr);
+double *PMPI_WTICK(void);
+double *PMPI_WTIME(void);
 #endif
 
diff --git a/src/mpi/f77/prototypes_mpi.h b/src/mpi/f77/prototypes_mpi.h
index db855f5865..71ac4a5944 100644
--- a/src/mpi/f77/prototypes_mpi.h
+++ b/src/mpi/f77/prototypes_mpi.h
@@ -301,8 +301,8 @@ void mpi_win_start_f(MPI_Fint *group, MPI_Fint *assert, MPI_Fint *win, MPI_Fint
 void mpi_win_test_f(MPI_Fint *win, MPI_Fint *flag, MPI_Fint *ierr);
 void mpi_win_unlock_f(MPI_Fint *rank, MPI_Fint *win, MPI_Fint *ierr);
 void mpi_win_wait_f(MPI_Fint *win, MPI_Fint *ierr);
-double mpi_wtick_f(MPI_Fint *ierr);
-double mpi_wtime_f(MPI_Fint *ierr);
+double *mpi_wtick_f(void);
+double *mpi_wtime_f(void);
 #endif
 
 /*These are the all lower case prototypes*/
@@ -590,8 +590,8 @@ void mpi_win_start(MPI_Fint *group, MPI_Fint *assert, MPI_Fint *win, MPI_Fint *i
 void mpi_win_test(MPI_Fint *win, MPI_Fint *flag, MPI_Fint *ierr);
 void mpi_win_unlock(MPI_Fint *rank, MPI_Fint *win, MPI_Fint *ierr);
 void mpi_win_wait(MPI_Fint *win, MPI_Fint *ierr);
-double mpi_wtick(MPI_Fint *ierr);
-double mpi_wtime(MPI_Fint *ierr);
+double *mpi_wtick(void);
+double *mpi_wtime(void);
 /*This is the single underscore prototypes*/
 
 void mpi_abort_(MPI_Fint *comm, MPI_Fint *errorcode, MPI_Fint *ierr);
@@ -877,8 +877,8 @@ void mpi_win_start_(MPI_Fint *group, MPI_Fint *assert, MPI_Fint *win, MPI_Fint *
 void mpi_win_test_(MPI_Fint *win, MPI_Fint *flag, MPI_Fint *ierr);
 void mpi_win_unlock_(MPI_Fint *rank, MPI_Fint *win, MPI_Fint *ierr);
 void mpi_win_wait_(MPI_Fint *win, MPI_Fint *ierr);
-double mpi_wtick_(MPI_Fint *ierr);
-double mpi_wtime_(MPI_Fint *ierr);
+double *mpi_wtick_(void);
+double *mpi_wtime_(void);
 /*This is the double underscore prototypes*/
 
 void mpi_abort__(MPI_Fint *comm, MPI_Fint *errorcode, MPI_Fint *ierr);
@@ -1164,8 +1164,8 @@ void mpi_win_start__(MPI_Fint *group, MPI_Fint *assert, MPI_Fint *win, MPI_Fint
 void mpi_win_test__(MPI_Fint *win, MPI_Fint *flag, MPI_Fint *ierr);
 void mpi_win_unlock__(MPI_Fint *rank, MPI_Fint *win, MPI_Fint *ierr);
 void mpi_win_wait__(MPI_Fint *win, MPI_Fint *ierr);
-double mpi_wtick__(MPI_Fint *ierr);
-double mpi_wtime__(MPI_Fint *ierr);
+double *mpi_wtick__(void);
+double *mpi_wtime__(void);
 /*This is the all upper case prototypes*/
 
 void MPI_ABORT(MPI_Fint *comm, MPI_Fint *errorcode, MPI_Fint *ierr);
@@ -1451,7 +1451,7 @@ void MPI_WIN_START(MPI_Fint *group, MPI_Fint *assert, MPI_Fint *win, MPI_Fint *i
 void MPI_WIN_TEST(MPI_Fint *win, MPI_Fint *flag, MPI_Fint *ierr);
 void MPI_WIN_UNLOCK(MPI_Fint *rank, MPI_Fint *win, MPI_Fint *ierr);
 void MPI_WIN_WAIT(MPI_Fint *win, MPI_Fint *ierr);
-double MPI_WTICK(MPI_Fint *ierr);
-double MPI_WTIME(MPI_Fint *ierr);
+double *MPI_WTICK(void);
+double *MPI_WTIME(void);
 #endif
 
diff --git a/src/mpi/f77/wtick_f.c b/src/mpi/f77/wtick_f.c
index 86c8ebc333..67ed5bf2ee 100644
--- a/src/mpi/f77/wtick_f.c
+++ b/src/mpi/f77/wtick_f.c
@@ -15,13 +15,23 @@
 #pragma weak pmpi_wtick_ = mpi_wtick_f
 #pragma weak pmpi_wtick__ = mpi_wtick_f
 #elif LAM_PROFILE_LAYER
-LAM_GENERATE_F77_BINDINGS (PMPI_WTICK,
-                           pmpi_wtick,
-                           pmpi_wtick_,
-                           pmpi_wtick__,
-                           pmpi_wtick_f,
-                           (MPI_Fint *ierr),
-                           (ierr) )
+
+    double *pmpi_wtick(void) {
+        return pmpi_wtick_f();
+    }
+
+    double *pmpi_wtick_(void) {
+        return pmpi_wtick_f();
+    }
+
+    double *pmpi_wtick__(void) {
+        return pmpi_wtick_f();
+    }
+
+    double *PMPI_WTICK(void) {
+        return pmpi_wtick_f();
+    }
+
 #endif
 
 #if LAM_HAVE_WEAK_SYMBOLS
@@ -32,16 +42,26 @@ LAM_GENERATE_F77_BINDINGS (PMPI_WTICK,
 #endif
 
 #if ! LAM_HAVE_WEAK_SYMBOLS && ! LAM_PROFILE_LAYER
-LAM_GENERATE_F77_BINDINGS (MPI_WTICK,
-                           mpi_wtick,
-                           mpi_wtick_,
-                           mpi_wtick__,
-                           mpi_wtick_f,
-                           (MPI_Fint *ierr),
-                           (ierr) )
+
+    double *mpi_wtick(void) {
+        return mpi_wtick_f();
+    }
+
+    double *mpi_wtick_(void) {
+        return mpi_wtick_f();
+    }
+
+    double *mpi_wtick__(void) {
+        return mpi_wtick_f();
+    }
+
+    double *MPI_WTICK(void) {
+        return mpi_wtick_f();
+    }
+
 #endif
 
-double mpi_wtick_f(MPI_Fint *ierr)
+double *mpi_wtick_f(void)
 {
-
+    return (double *)0;
 }
diff --git a/src/mpi/f77/wtime_f.c b/src/mpi/f77/wtime_f.c
index 41ecaaf728..d7b703d657 100644
--- a/src/mpi/f77/wtime_f.c
+++ b/src/mpi/f77/wtime_f.c
@@ -15,13 +15,23 @@
 #pragma weak pmpi_wtime_ = mpi_wtime_f
 #pragma weak pmpi_wtime__ = mpi_wtime_f
 #elif LAM_PROFILE_LAYER
-LAM_GENERATE_F77_BINDINGS (PMPI_WTIME,
-                           pmpi_wtime,
-                           pmpi_wtime_,
-                           pmpi_wtime__,
-                           pmpi_wtime_f,
-                           (MPI_Fint *ierr),
-                           (ierr) )
+
+    double *pmpi_wtime(void) {
+        return pmpi_wtime_f();
+    }
+
+    double *pmpi_wtime_(void) {
+        return pmpi_wtime_f();
+    }
+
+    double *pmpi_wtime__(void) {
+        return pmpi_wtime_f();
+    }
+
+    double *PMPI_WTIME(void) {
+        return pmpi_wtime_f();
+    }
+
 #endif
 
 #if LAM_HAVE_WEAK_SYMBOLS
@@ -32,16 +42,26 @@ LAM_GENERATE_F77_BINDINGS (PMPI_WTIME,
 #endif
 
 #if ! LAM_HAVE_WEAK_SYMBOLS && ! LAM_PROFILE_LAYER
-LAM_GENERATE_F77_BINDINGS (MPI_WTIME,
-                           mpi_wtime,
-                           mpi_wtime_,
-                           mpi_wtime__,
-                           mpi_wtime_f,
-                           (MPI_Fint *ierr),
-                           (ierr) )
+
+    double *mpi_wtime(void) {
+        return mpi_wtime_f();
+    }
+
+    double *mpi_wtime_(void) {
+        return mpi_wtime_f();
+    }
+
+    double *mpi_wtime__(void) {
+        return mpi_wtime_f();
+    }
+
+    double *MPI_WTIME(void) {
+        return mpi_wtime_f();
+    }
+
 #endif
 
-double mpi_wtime_f(MPI_Fint *ierr)
+double *mpi_wtime_f(void)
 {
-
+    return (double *)0;
 }