diff --git a/ompi/attribute/attribute.h b/ompi/attribute/attribute.h
index 537894fa01..afd0d0ffb2 100644
--- a/ompi/attribute/attribute.h
+++ b/ompi/attribute/attribute.h
@@ -31,7 +31,6 @@
 #include "ompi_config.h"
 #include "ompi/include/constants.h"
 #include "opal/class/opal_object.h"
-#include "class/ompi_bitmap.h"
 #include "class/opal_hash_table.h"
 #include "mca/gpr/gpr_types.h"
 
@@ -173,11 +172,11 @@ int ompi_attr_hash_init(opal_hash_table_t **keyhash)
 {
    *keyhash = OBJ_NEW(opal_hash_table_t);
     if (NULL == keyhash) {
-	fprintf(stderr, "Error while creating the local attribute list\n");
-	return MPI_ERR_SYSRESOURCE;
+        fprintf(stderr, "Error while creating the local attribute list\n");
+        return MPI_ERR_SYSRESOURCE;
     }
     if (OMPI_SUCCESS != opal_hash_table_init(*keyhash, ATTR_HASH_SIZE)) {
-	return MPI_ERR_SYSRESOURCE;
+        return MPI_ERR_SYSRESOURCE;
     }
   
     return MPI_SUCCESS;
@@ -498,7 +497,7 @@ int ompi_attr_delete_all(ompi_attribute_type_t type, void *object,
  */
 int ompi_attr_create_predefined(void);
 
-
+struct orte_gpr_notify_data_t;
 /**
  * \internal
  * Callback function to get data from registry and create predefined attributes
diff --git a/ompi/communicator/communicator.h b/ompi/communicator/communicator.h
index 84196938a5..ffd673eea9 100644
--- a/ompi/communicator/communicator.h
+++ b/ompi/communicator/communicator.h
@@ -20,18 +20,13 @@
 #define OMPI_COMMUNICATOR_H
 
 #include "opal/class/opal_object.h"
-#include "class/opal_hash_table.h"
 #include "errhandler/errhandler.h"
 #include "opal/threads/mutex.h"
 
-#include "opal/util/output.h"
 #include "mpi.h"
 #include "group/group.h"
 #include "mca/coll/coll.h"
-#include "mca/topo/topo.h"
-#include "mca/gpr/gpr_types.h"
 #include "mca/oob/oob_types.h"
-#include "request/request.h"
 #include "ompi/proc/proc.h"
 
 #if defined(c_plusplus) || defined(__cplusplus)
@@ -105,7 +100,7 @@ struct ompi_communicator_t {
     ompi_group_t       *c_remote_group;
 
     /* Attributes */
-    opal_hash_table_t       *c_keyhash;
+    struct opal_hash_table_t       *c_keyhash;
 
     /**< inscribing cube dimension */
     int c_cube_dim;
@@ -113,10 +108,10 @@ struct ompi_communicator_t {
     /* Hooks for topo module to hang things */
     mca_base_component_t *c_topo_component;
 
-    const mca_topo_base_module_1_0_0_t *c_topo;
+    const struct mca_topo_base_module_1_0_0_t* c_topo; 
     /**< structure of function pointers */
 
-    mca_topo_base_comm_t *c_topo_comm;
+    struct mca_topo_base_comm_1_0_0_t* c_topo_comm; 
     /**< structure containing basic information about the topology */
 
     struct mca_topo_base_module_comm_t *c_topo_module;
@@ -488,10 +483,10 @@ struct ompi_communicator_t {
     */
 
     struct ompi_comm_disconnect_obj {
-        ompi_communicator_t *comm;
-        int                  size;
-        ompi_request_t     **reqs;
-        int                   buf;
+        ompi_communicator_t       *comm;
+        int                       size;
+        struct ompi_request_t     **reqs;
+        int                       buf;
     };
     typedef struct ompi_comm_disconnect_obj ompi_comm_disconnect_obj;
 
diff --git a/ompi/op/op.h b/ompi/op/op.h
index 69e323c7b0..3e27e2fa4c 100644
--- a/ompi/op/op.h
+++ b/ompi/op/op.h
@@ -29,7 +29,6 @@
 #include "mpi.h"
 #include "datatype/datatype.h"
 #include "opal/class/opal_object.h"
-#include "class/ompi_pointer_array.h"
 #include "mpi/f77/fint_2_int.h"
 
 
@@ -347,7 +346,7 @@ OMPI_DECLSPEC extern ompi_op_t ompi_mpi_op_replace;
 /**
  * Table for Fortran <-> C op handle conversion
  */
-OMPI_DECLSPEC extern ompi_pointer_array_t *ompi_op_f_to_c_table;
+OMPI_DECLSPEC extern struct ompi_pointer_array_t *ompi_op_f_to_c_table;
 
 
 #if defined(c_plusplus) || defined(__cplusplus)
diff --git a/ompi/request/request.h b/ompi/request/request.h
index 1c2ff3436e..9f529c4018 100644
--- a/ompi/request/request.h
+++ b/ompi/request/request.h
@@ -28,8 +28,6 @@
 #include "opal/class/opal_list.h"
 #include "class/ompi_pointer_array.h"
 #include "errhandler/errhandler.h"
-#include "opal/runtime/opal_progress.h"
-#include "opal/threads/mutex.h"
 #include "opal/threads/condition.h"
                                                                                                                             
 #if defined(c_plusplus) || defined(__cplusplus)
@@ -143,7 +141,6 @@ OMPI_DECLSPEC extern size_t                ompi_request_waiting;
 OMPI_DECLSPEC extern size_t                ompi_request_completed;
 OMPI_DECLSPEC extern opal_mutex_t          ompi_request_lock;
 OMPI_DECLSPEC extern opal_condition_t      ompi_request_cond;
-OMPI_DECLSPEC extern int                   ompi_request_poll_iterations;
 OMPI_DECLSPEC extern ompi_request_t        ompi_request_null;
 OMPI_DECLSPEC extern ompi_request_t        ompi_request_empty;
 OMPI_DECLSPEC extern ompi_status_public_t  ompi_status_empty;