diff --git a/include/openmc/hdf5_interface.h b/include/openmc/hdf5_interface.h
index ddb2319ae4..88a73415ac 100644
--- a/include/openmc/hdf5_interface.h
+++ b/include/openmc/hdf5_interface.h
@@ -212,7 +212,7 @@ read_attribute(hid_t obj_id, const char* name, std::vector<std::string>& vec)
   // Read char data in attribute
   read_attr_string(obj_id, name, n, buffer);
 
-  for (int i = 0; i < m; ++i) {
+  for (decltype(m) i = 0; i < m; ++i) {
     // Determine proper length of string -- strlen doesn't work because
     // buffer[i] might not have any null characters
     std::size_t k = 0;
@@ -478,7 +478,7 @@ write_dataset(hid_t obj_id, const char* name,
   // Copy data into contiguous buffer
   char* temp = new char[n*m];
   std::fill(temp, temp + n*m, '\0');
-  for (int i = 0; i < n; ++i) {
+  for (decltype(n) i = 0; i < n; ++i) {
     std::copy(buffer[i].begin(), buffer[i].end(), temp + i*m);
   }
 
diff --git a/include/openmc/surface.h b/include/openmc/surface.h
index 2a62d81c88..0209b23246 100644
--- a/include/openmc/surface.h
+++ b/include/openmc/surface.h
@@ -137,7 +137,7 @@ public:
   virtual void to_hdf5(hid_t group_id) const = 0;
 
   //! Get the BoundingBox for this surface.
-  virtual BoundingBox bounding_box(bool pos_side) const { return {}; }
+  virtual BoundingBox bounding_box(bool /*pos_side*/) const { return {}; }
 };
 
 class CSGSurface : public Surface