diff --git a/src/mpi/f77/alltoallw_f.c b/src/mpi/f77/alltoallw_f.c
index abf15eedfe..c24c361fe7 100644
--- a/src/mpi/f77/alltoallw_f.c
+++ b/src/mpi/f77/alltoallw_f.c
@@ -16,8 +16,6 @@
 
 #include "ompi_config.h"
 
-#include <stdlib.h>
-
 #include "mpi/f77/bindings.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER
diff --git a/src/mpi/f77/comm_spawn_f.c b/src/mpi/f77/comm_spawn_f.c
index 36da5de0a6..9b07180d80 100644
--- a/src/mpi/f77/comm_spawn_f.c
+++ b/src/mpi/f77/comm_spawn_f.c
@@ -16,8 +16,6 @@
 
 #include "ompi_config.h"
 
-#include <stdio.h>
-
 #include "mpi/f77/bindings.h"
 #include "mpi/f77/constants.h"
 #include "mpi/f77/strings.h"
diff --git a/src/mpi/f77/comm_spawn_multiple_f.c b/src/mpi/f77/comm_spawn_multiple_f.c
index bf09f621a4..1d71a30ee0 100644
--- a/src/mpi/f77/comm_spawn_multiple_f.c
+++ b/src/mpi/f77/comm_spawn_multiple_f.c
@@ -16,9 +16,6 @@
 
 #include "ompi_config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "mpi/f77/bindings.h"
 #include "mpi/f77/constants.h"
 #include "mpi/f77/strings.h"
diff --git a/src/mpi/f77/startall_f.c b/src/mpi/f77/startall_f.c
index 5672091ba4..172ec0ad6b 100644
--- a/src/mpi/f77/startall_f.c
+++ b/src/mpi/f77/startall_f.c
@@ -16,9 +16,6 @@
 
 #include "ompi_config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "mpi/f77/bindings.h"
 #include "errhandler/errhandler.h"
 #include "communicator/communicator.h"
diff --git a/src/mpi/f77/strings.c b/src/mpi/f77/strings.c
index c12320500d..1f73b72bf7 100644
--- a/src/mpi/f77/strings.c
+++ b/src/mpi/f77/strings.c
@@ -42,25 +42,25 @@ int ompi_fortran_string_f2c(char *fstr, int len, char **cstr)
     }
 
     if (i >= len) {
-	len = 0;
+        len = 0;
     } else {
-	for (; (end > fstr) && (' ' == *end); --end) {
+        for (; (end > fstr) && (' ' == *end); --end) {
             continue;
         }
 
-	len = end - fstr + 1;
+        len = end - fstr + 1;
     }
 
     /* Allocate space for the C string. */
 
     if (NULL == (*cstr = malloc(len + 1))) {
-	return OMPI_ERR_OUT_OF_RESOURCE;
+        return OMPI_ERR_OUT_OF_RESOURCE;
     }
 
     /* Copy F77 string into C string and NULL terminate it. */
 
     if (len > 0) {
-	strncpy(*cstr, fstr, len);
+        strncpy(*cstr, fstr, len);
     }
     (*cstr)[len] = '\0';
 
@@ -77,7 +77,7 @@ int ompi_fortran_string_c2f(char *cstr, char *fstr, int len)
 
     strncpy(fstr, cstr, len);
     for (i = strlen(cstr); i < len; ++i) {
-	fstr[i] = ' ';
+        fstr[i] = ' ';
     }
 
     return OMPI_SUCCESS;
@@ -136,11 +136,11 @@ int ompi_fortran_multiple_argvs_f2c(int count, char *array, int len,
     argv_array = (char ***) malloc (count * sizeof(char **));
 
     for (i = 0; i < count; ++i) {
-	ret = ompi_fortran_argv_f2c(current_array, len, &argv_array[i]);
-	if (OMPI_SUCCESS != ret) {
-	    return ret;
-	}
-	current_array += len * i;
+        ret = ompi_fortran_argv_f2c(current_array, len, &argv_array[i]);
+        if (OMPI_SUCCESS != ret) {
+            return ret;
+        }
+        current_array += len * i;
     }
     *argv = argv_array;
     return OMPI_SUCCESS;
diff --git a/src/mpi/f77/testall_f.c b/src/mpi/f77/testall_f.c
index 96429dfe14..00542be657 100644
--- a/src/mpi/f77/testall_f.c
+++ b/src/mpi/f77/testall_f.c
@@ -16,9 +16,6 @@
 
 #include "ompi_config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "mpi/f77/bindings.h"
 #include "mpi/f77/constants.h"
 #include "errhandler/errhandler.h"
diff --git a/src/mpi/f77/testany_f.c b/src/mpi/f77/testany_f.c
index f3e57080d5..d2eac21900 100644
--- a/src/mpi/f77/testany_f.c
+++ b/src/mpi/f77/testany_f.c
@@ -16,8 +16,6 @@
 
 #include "ompi_config.h"
 
-#include <stdlib.h>
-
 #include "mpi/f77/bindings.h"
 #include "mpi/f77/constants.h"
 #include "errhandler/errhandler.h"
diff --git a/src/mpi/f77/testsome_f.c b/src/mpi/f77/testsome_f.c
index a91591e12a..38d75f0710 100644
--- a/src/mpi/f77/testsome_f.c
+++ b/src/mpi/f77/testsome_f.c
@@ -16,9 +16,6 @@
 
 #include "ompi_config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "mpi/f77/bindings.h"
 #include "mpi/f77/constants.h"
 #include "errhandler/errhandler.h"
diff --git a/src/mpi/f77/type_create_hindexed_f.c b/src/mpi/f77/type_create_hindexed_f.c
index 44d6498d09..6913085c16 100644
--- a/src/mpi/f77/type_create_hindexed_f.c
+++ b/src/mpi/f77/type_create_hindexed_f.c
@@ -16,9 +16,6 @@
 
 #include "ompi_config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "mpi/f77/bindings.h"
 #include "errhandler/errhandler.h"
 #include "communicator/communicator.h"
diff --git a/src/mpi/f77/type_create_struct_f.c b/src/mpi/f77/type_create_struct_f.c
index 15b27771c4..27e85fda1a 100644
--- a/src/mpi/f77/type_create_struct_f.c
+++ b/src/mpi/f77/type_create_struct_f.c
@@ -16,9 +16,6 @@
 
 #include "ompi_config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "mpi/f77/bindings.h"
 #include "errhandler/errhandler.h"
 #include "communicator/communicator.h"
diff --git a/src/mpi/f77/type_get_contents_f.c b/src/mpi/f77/type_get_contents_f.c
index 6383949b5c..1684e17cd3 100644
--- a/src/mpi/f77/type_get_contents_f.c
+++ b/src/mpi/f77/type_get_contents_f.c
@@ -16,9 +16,6 @@
 
 #include "ompi_config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "mpi/f77/bindings.h"
 #include "errhandler/errhandler.h"
 #include "communicator/communicator.h"
diff --git a/src/mpi/f77/type_hindexed_f.c b/src/mpi/f77/type_hindexed_f.c
index afdabc215a..3f741a90a7 100644
--- a/src/mpi/f77/type_hindexed_f.c
+++ b/src/mpi/f77/type_hindexed_f.c
@@ -16,9 +16,6 @@
 
 #include "ompi_config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "mpi/f77/bindings.h"
 #include "errhandler/errhandler.h"
 #include "communicator/communicator.h"
diff --git a/src/mpi/f77/type_struct_f.c b/src/mpi/f77/type_struct_f.c
index f5d1bc8d5e..19f8c9f1a1 100644
--- a/src/mpi/f77/type_struct_f.c
+++ b/src/mpi/f77/type_struct_f.c
@@ -16,9 +16,6 @@
 
 #include "ompi_config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "mpi/f77/bindings.h"
 #include "errhandler/errhandler.h"
 #include "communicator/communicator.h"
diff --git a/src/mpi/f77/waitall_f.c b/src/mpi/f77/waitall_f.c
index 3066e6ffdc..65e572b363 100644
--- a/src/mpi/f77/waitall_f.c
+++ b/src/mpi/f77/waitall_f.c
@@ -16,9 +16,6 @@
 
 #include "ompi_config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "mpi/f77/bindings.h"
 #include "mpi/f77/constants.h"
 #include "errhandler/errhandler.h"
diff --git a/src/mpi/f77/waitany_f.c b/src/mpi/f77/waitany_f.c
index 1f3ea8c87f..9223145dac 100644
--- a/src/mpi/f77/waitany_f.c
+++ b/src/mpi/f77/waitany_f.c
@@ -16,9 +16,6 @@
 
 #include "ompi_config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "mpi/f77/bindings.h"
 #include "mpi/f77/constants.h"
 #include "errhandler/errhandler.h"
diff --git a/src/mpi/f77/waitsome_f.c b/src/mpi/f77/waitsome_f.c
index a106897372..e09ce77000 100644
--- a/src/mpi/f77/waitsome_f.c
+++ b/src/mpi/f77/waitsome_f.c
@@ -16,9 +16,6 @@
 
 #include "ompi_config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "mpi/f77/bindings.h"
 #include "mpi/f77/constants.h"
 #include "errhandler/errhandler.h"