diff --git a/mlprec/mld_c_mumps_solver.F90 b/mlprec/mld_c_mumps_solver.F90
index 724ed706..aaa418e4 100644
--- a/mlprec/mld_c_mumps_solver.F90
+++ b/mlprec/mld_c_mumps_solver.F90
@@ -50,10 +50,13 @@
 !       current image or distributed (and thus exact)
 !
 module mld_c_mumps_solver
-#if defined(HAVE_MUMPS_)
+  use mld_c_base_solver_mod
+#if defined(HAVE_MUMPS_) && defined(HAVE_MUMPS_MODULES_)
   use cmumps_struc_def
 #endif
-  use mld_c_base_solver_mod
+#if defined(HAVE_MUMPS_) && defined(HAVE_MUMPS_INCLUDES_)
+  include 'cmumps_struc.h'
+#endif  
   
 #if defined(LONG_INTEGERS)
   
diff --git a/mlprec/mld_d_mumps_solver.F90 b/mlprec/mld_d_mumps_solver.F90
index 84f32715..25114c85 100644
--- a/mlprec/mld_d_mumps_solver.F90
+++ b/mlprec/mld_d_mumps_solver.F90
@@ -50,10 +50,13 @@
 !       current image or distributed (and thus exact)
 !
 module mld_d_mumps_solver
-#if defined(HAVE_MUMPS_)
+  use mld_d_base_solver_mod
+#if defined(HAVE_MUMPS_) && defined(HAVE_MUMPS_MODULES_)
   use dmumps_struc_def
 #endif
-  use mld_d_base_solver_mod
+#if defined(HAVE_MUMPS_) && defined(HAVE_MUMPS_INCLUDES_)
+  include 'dmumps_struc.h'
+#endif  
   
 #if defined(LONG_INTEGERS)
   
diff --git a/mlprec/mld_s_mumps_solver.F90 b/mlprec/mld_s_mumps_solver.F90
index 22ae5e7a..b59b6e88 100644
--- a/mlprec/mld_s_mumps_solver.F90
+++ b/mlprec/mld_s_mumps_solver.F90
@@ -50,10 +50,13 @@
 !       current image or distributed (and thus exact)
 !
 module mld_s_mumps_solver
-#if defined(HAVE_MUMPS_)
+  use mld_s_base_solver_mod
+#if defined(HAVE_MUMPS_) && defined(HAVE_MUMPS_MODULES_)
   use smumps_struc_def
 #endif
-  use mld_s_base_solver_mod
+#if defined(HAVE_MUMPS_) && defined(HAVE_MUMPS_INCLUDES_)
+  include 'smumps_struc.h'
+#endif  
   
 #if defined(LONG_INTEGERS)
   
diff --git a/mlprec/mld_z_mumps_solver.F90 b/mlprec/mld_z_mumps_solver.F90
index 837fe889..9ce08922 100644
--- a/mlprec/mld_z_mumps_solver.F90
+++ b/mlprec/mld_z_mumps_solver.F90
@@ -50,10 +50,13 @@
 !       current image or distributed (and thus exact)
 !
 module mld_z_mumps_solver
-#if defined(HAVE_MUMPS_)
+  use mld_z_base_solver_mod
+#if defined(HAVE_MUMPS_) && defined(HAVE_MUMPS_MODULES_)
   use zmumps_struc_def
 #endif
-  use mld_z_base_solver_mod
+#if defined(HAVE_MUMPS_) && defined(HAVE_MUMPS_INCLUDES_)
+  include 'zmumps_struc.h'
+#endif  
   
 #if defined(LONG_INTEGERS)