diff --git a/src/cmfd_data.F90 b/src/cmfd_data.F90
index d0e80aaa90..8dd0fa35ff 100644
--- a/src/cmfd_data.F90
+++ b/src/cmfd_data.F90
@@ -934,7 +934,7 @@ contains
   subroutine compute_effective_downscatter()
 
     use constants, only: ZERO, CMFD_NOACCEL
-    use global,    only: cmfd, cmfd_downscatter
+    use global,    only: cmfd
 
     integer :: nx                ! number of mesh cells in x direction
     integer :: ny                ! number of mesh cells in y direction
diff --git a/src/cmfd_execute.F90 b/src/cmfd_execute.F90
index 7a35a12144..6234d9fcf9 100644
--- a/src/cmfd_execute.F90
+++ b/src/cmfd_execute.F90
@@ -117,9 +117,9 @@ contains
 
   subroutine process_cmfd_options()
 
+#ifdef PETSC
     use global,       only: cmfd_snes_monitor, cmfd_ksp_monitor, mpi_err
 
-#ifdef PETSC
     ! Check for snes monitor
     if (cmfd_snes_monitor) call PetscOptionsSetValue("-snes_monitor", &
          "stdout", mpi_err)
@@ -138,9 +138,10 @@ contains
   subroutine calc_fission_source()
 
     use constants,  only: CMFD_NOACCEL, ZERO, TWO
-    use global,     only: cmfd, cmfd_coremap, master, mpi_err, entropy_on, &
-                          current_batch
+    use global,     only: cmfd, cmfd_coremap, master, entropy_on, current_batch
+
 #ifdef MPI
+    use global,     only: mpi_err
     use mpi
 #endif
 
@@ -261,13 +262,14 @@ contains
 
     use constants,   only: ZERO, ONE
     use error,       only: warning, fatal_error
-    use global,      only: n_particles, meshes, source_bank, work,             &
-                           n_user_meshes, message, cmfd, master, mpi_err
+    use global,      only: meshes, source_bank, work, n_user_meshes, message, &
+                           cmfd, master
     use mesh_header, only: StructuredMesh
     use mesh,        only: count_bank_sites, get_mesh_indices
     use search,      only: binary_search
 
 #ifdef MPI
+    use global,      only: mpi_err
     use mpi
 #endif
 
diff --git a/src/cmfd_power_solver.F90 b/src/cmfd_power_solver.F90
index c1309b72cd..f2761d0a1f 100644
--- a/src/cmfd_power_solver.F90
+++ b/src/cmfd_power_solver.F90
@@ -102,7 +102,9 @@ contains
   subroutine init_data(adjoint)
 
     use constants, only: ONE, ZERO
+#ifdef PETSC
     use global,    only: cmfd_write_matrices
+#endif
 
     logical, intent(in) :: adjoint ! adjoint calcualtion