diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
index 0f162f12aec..efe40e22980 100644
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -457,11 +457,13 @@ endif()
 if(MPI_FOUND)
   list(APPEND MAIN_SOURCE_FILES opm/simulators/utils/MPIPacker.cpp
                                 opm/simulators/utils/ParallelEclipseState.cpp
-                                opm/simulators/utils/ParallelNLDDPartitioningZoltan.cpp
                                 opm/simulators/utils/ParallelSerialization.cpp
                                 opm/simulators/utils/SetupPartitioningParams.cpp)
   list(APPEND PUBLIC_HEADER_FILES opm/simulators/utils/MPIPacker.hpp
                                   opm/simulators/utils/MPISerializer.hpp)
+  if(ZOLTAN_FOUND)
+    list(APPEND MAIN_SOURCE_FILES opm/simulators/utils/ParallelNLDDPartitioningZoltan.cpp)
+  endif()
 endif()
 if(HDF5_FOUND)
   list(APPEND MAIN_SOURCE_FILES opm/simulators/utils/HDF5File.cpp)
diff --git a/opm/simulators/flow/partitionCells.cpp b/opm/simulators/flow/partitionCells.cpp
index 8d4e42e396c..b18e0a8c959 100644
--- a/opm/simulators/flow/partitionCells.cpp
+++ b/opm/simulators/flow/partitionCells.cpp
@@ -25,21 +25,21 @@
 
 #include <opm/simulators/utils/compressPartition.hpp>
 
-#if HAVE_MPI && HAVE_ZOLTAN
+#if HAVE_MPI
 #include <opm/simulators/utils/DeferredLogger.hpp>
 #include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
 #include <opm/simulators/utils/gatherDeferredLogger.hpp>
-#include <opm/simulators/utils/ParallelNLDDPartitioningZoltan.hpp>
-#include <opm/simulators/utils/SetupPartitioningParams.hpp>
+#include <opm/simulators/utils/MPISerializer.hpp>
 
 #include <opm/input/eclipse/Schedule/Well/Connection.hpp>
 #include <opm/input/eclipse/Schedule/Well/Well.hpp>
 #include <opm/input/eclipse/Schedule/Well/WellConnections.hpp>
-#endif // HAVE_MPI && HAVE_ZOLTAN
+#endif // HAVE_MPI
 
-#if HAVE_MPI
-#include <opm/simulators/utils/MPISerializer.hpp>
-#endif
+#if HAVE_MPI && HAVE_ZOLTAN
+#include <opm/simulators/utils/ParallelNLDDPartitioningZoltan.hpp>
+#include <opm/simulators/utils/SetupPartitioningParams.hpp>
+#endif // HAVE_MPI && HAVE_ZOLTAN
 
 #include <opm/grid/CpGrid.hpp>
 #include <opm/grid/polyhedralgrid.hh>