diff --git a/src/mpi/f77/prototypes_mpi.h b/src/mpi/f77/prototypes_mpi.h
index 0224185b77..3540a4d1c2 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(void);
-double *mpi_wtime_f(void);
+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(void);
-double *mpi_wtime(void);
+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_(void);
-double *mpi_wtime_(void);
+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__(void);
-double *mpi_wtime__(void);
+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(void);
-double *MPI_WTIME(void);
+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 df2d6e9b4b..2cc9444229 100644
--- a/src/mpi/f77/wtick_f.c
+++ b/src/mpi/f77/wtick_f.c
@@ -16,19 +16,19 @@
 #pragma weak pmpi_wtick__ = mpi_wtick_f
 #elif OMPI_PROFILE_LAYER
 
-    double *pmpi_wtick(void) {
+    double pmpi_wtick(void) {
         return pmpi_wtick_f();
     }
 
-    double *pmpi_wtick_(void) {
+    double pmpi_wtick_(void) {
         return pmpi_wtick_f();
     }
 
-    double *pmpi_wtick__(void) {
+    double pmpi_wtick__(void) {
         return pmpi_wtick_f();
     }
 
-    double *PMPI_WTICK(void) {
+    double PMPI_WTICK(void) {
         return pmpi_wtick_f();
     }
 
@@ -43,25 +43,25 @@
 
 #if ! OMPI_HAVE_WEAK_SYMBOLS && ! OMPI_PROFILE_LAYER
 
-    double *mpi_wtick(void) {
+    double mpi_wtick(void) {
         return mpi_wtick_f();
     }
 
-    double *mpi_wtick_(void) {
+    double mpi_wtick_(void) {
         return mpi_wtick_f();
     }
 
-    double *mpi_wtick__(void) {
+    double mpi_wtick__(void) {
         return mpi_wtick_f();
     }
 
-    double *MPI_WTICK(void) {
+    double MPI_WTICK(void) {
         return mpi_wtick_f();
     }
 
 #endif
 
-double *mpi_wtick_f(void)
+double mpi_wtick_f(void)
 {
-    return (double *)0;
+    return MPI_Wtick();
 }
diff --git a/src/mpi/f77/wtime_f.c b/src/mpi/f77/wtime_f.c
index cd59ffe29e..f2522e20f0 100644
--- a/src/mpi/f77/wtime_f.c
+++ b/src/mpi/f77/wtime_f.c
@@ -16,19 +16,19 @@
 #pragma weak pmpi_wtime__ = mpi_wtime_f
 #elif OMPI_PROFILE_LAYER
 
-    double *pmpi_wtime(void) {
+    double pmpi_wtime(void) {
         return pmpi_wtime_f();
     }
 
-    double *pmpi_wtime_(void) {
+    double pmpi_wtime_(void) {
         return pmpi_wtime_f();
     }
 
-    double *pmpi_wtime__(void) {
+    double pmpi_wtime__(void) {
         return pmpi_wtime_f();
     }
 
-    double *PMPI_WTIME(void) {
+    double PMPI_WTIME(void) {
         return pmpi_wtime_f();
     }
 
@@ -43,25 +43,25 @@
 
 #if ! OMPI_HAVE_WEAK_SYMBOLS && ! OMPI_PROFILE_LAYER
 
-    double *mpi_wtime(void) {
+    double mpi_wtime(void) {
         return mpi_wtime_f();
     }
 
-    double *mpi_wtime_(void) {
+    double mpi_wtime_(void) {
         return mpi_wtime_f();
     }
 
-    double *mpi_wtime__(void) {
+    double mpi_wtime__(void) {
         return mpi_wtime_f();
     }
 
-    double *MPI_WTIME(void) {
+    double MPI_WTIME(void) {
         return mpi_wtime_f();
     }
 
 #endif
 
-double *mpi_wtime_f(void)
+double mpi_wtime_f(void)
 {
-    return (double *)0;
+    return MPI_Wtime();
 }