diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst
index 46b49d1fe5..6efab161fb 100644
--- a/doc/CHANGELOG.rst
+++ b/doc/CHANGELOG.rst
@@ -35,6 +35,8 @@ Next version
    * Tweak conda environment for Windows build to avoid conflicting gtest headers (#888)
    * Restrict cython version for MOAB (#893)
    * Various documentation updates (#869)
+   * cleaned up headers to include fewer upstream headers (#800)
+
 
 v3.2.2
 ====================
@@ -45,25 +47,9 @@ v3.2.2
    * Removing build of static libs as a default option (#802)
    * Adding PYTHONPATH to linux CI images and creating pymoab installation directories (#802)
 
-v3.2.1
-====================
-
 **Added:**
 
-   * Added link to latest Conda package in GitHub README.md
-
-**Changed:**
-
-**Deprecated:**
-
-**Removed:**
-
-**Fixed:**
-
-**Security:**
-
-**Maintenance:**
-
+   * Added link to latest Conda package in GitHub README.md (#801)
 
 v3.2.1
 ====================
diff --git a/src/dagmc/DagMC.cpp b/src/dagmc/DagMC.cpp
index c4e0494e41..6118158d11 100644
--- a/src/dagmc/DagMC.cpp
+++ b/src/dagmc/DagMC.cpp
@@ -16,6 +16,14 @@
 #include <sstream>
 #include <string>
 
+
+#include "moab/CartVect.hpp"
+#include "moab/FileOptions.hpp"
+#include "moab/GeomTopoTool.hpp"
+#include "moab/GeomQueryTool.hpp"
+#include "moab/GeomUtil.hpp"
+#include "moab/Range.hpp"
+
 #ifdef DOUBLE_DOWN
 #include "double_down/RTI.hpp"
 #endif
diff --git a/src/dagmc/DagMC.hpp b/src/dagmc/DagMC.hpp
index c4f28f2bcd..76cb152c9c 100644
--- a/src/dagmc/DagMC.hpp
+++ b/src/dagmc/DagMC.hpp
@@ -11,18 +11,7 @@
 #include <vector>
 
 #include "DagMCVersion.hpp"
-#include "MBTagConventions.hpp"
-#include "logger.hpp"
-#include "moab/CartVect.hpp"
-#include "moab/Core.hpp"
-#include "moab/FileOptions.hpp"
-#include "moab/GeomQueryTool.hpp"
-#include "moab/GeomTopoTool.hpp"
-#include "moab/GeomUtil.hpp"
 #include "moab/Interface.hpp"
-#include "moab/Range.hpp"
-
-class RefEntity;
 
 struct DagmcVolData {
   int mat_id;
@@ -45,6 +34,7 @@ static const std::string GRAVEYARD_NAME = "mat:graveyard";
 
 class CartVect;
 class GeomQueryTool;
+class GeomQueryTool::RayHistory;
 
 /**\brief
  *