diff --git a/include/openmc/dagmc.h b/include/openmc/dagmc.h
index 0e5fc4064c..afbd9cbc6c 100644
--- a/include/openmc/dagmc.h
+++ b/include/openmc/dagmc.h
@@ -17,9 +17,9 @@ extern "C" void free_memory_dagmc();
 
 }
 
-#endif // OPENMC_DAGMC_H
+#endif // DAGMC
 
-#endif
+#endif // OPENMC_DAGMC_H
 
 #ifdef DAGMC
 extern "C" constexpr bool dagmc_enabled = true;
diff --git a/src/settings.cpp b/src/settings.cpp
index 19b8a72a50..b5f2bf5c63 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -409,7 +409,7 @@ void read_settings_xml()
   }
 
 #ifdef _OPENMP
-  if (dagmc) {
+  if (dagmc && omp_get_max_threads() > 1) {
     warning("Forcing number of threads to 1 for DAGMC simulation.");
     omp_set_num_threads(1);
   }