diff --git a/Source/hydro/Make.package b/Source/hydro/Make.package
index 60f2c91c3c..b4d67b48fa 100644
--- a/Source/hydro/Make.package
+++ b/Source/hydro/Make.package
@@ -31,7 +31,7 @@ CEXE_headers += HLL_solvers.H
 CEXE_headers += riemann_solvers.H
 CEXE_headers += riemann_2shock_solvers.H
 CEXE_sources += riemann_util.cpp
-CEXE_headers += riemann.H
+CEXE_headers += riemann_type.H
 CEXE_headers += slope.H
 CEXE_headers += reconstruction.H
 CEXE_sources += trace_plm.cpp
diff --git a/Source/hydro/riemann_2shock_solvers.H b/Source/hydro/riemann_2shock_solvers.H
index 4f1485eef8..208e9878e0 100644
--- a/Source/hydro/riemann_2shock_solvers.H
+++ b/Source/hydro/riemann_2shock_solvers.H
@@ -5,7 +5,7 @@
 
 using namespace amrex::literals;
 
-#include <riemann.H>
+#include <riemann_type.H>
 #ifdef RADIATION
 #include <Radiation.H>
 #include <rad_util.H>
diff --git a/Source/hydro/riemann_solvers.H b/Source/hydro/riemann_solvers.H
index b3c3509dbf..19b93287a7 100644
--- a/Source/hydro/riemann_solvers.H
+++ b/Source/hydro/riemann_solvers.H
@@ -2,7 +2,7 @@
 #define riemann_solvers_H
 
 #include <Castro_util.H>
-#include <riemann.H>
+#include <riemann_type.H>
 #include <riemann_2shock_solvers.H>
 #ifdef HYBRID_MOMENTUM
 #include <hybrid.H>
diff --git a/Source/hydro/riemann.H b/Source/hydro/riemann_type.H
similarity index 100%
rename from Source/hydro/riemann.H
rename to Source/hydro/riemann_type.H
diff --git a/Source/hydro/riemann_util.cpp b/Source/hydro/riemann_util.cpp
index b72b25429f..2801dad8c2 100644
--- a/Source/hydro/riemann_util.cpp
+++ b/Source/hydro/riemann_util.cpp
@@ -14,8 +14,6 @@
 
 using namespace amrex;
 
-#include <riemann.H>
-
 void
 Castro::compute_flux_from_q(const Box& bx,
                             Array4<Real const> const& qint,