3 files changed, 13 insertions, 3 deletions
diff --git a/src/buildtool/common/remote/remote_common.hpp b/src/buildtool/common/remote/remote_common.hpp
index 92adda0b..9df0db5c 100644
--- a/src/buildtool/common/remote/remote_common.hpp
+++ b/src/buildtool/common/remote/remote_common.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef INCLUDED_SRC_BUILDTOOL_COMMON_REMOTE_ADDRESS_HPP
-#define INCLUDED_SRC_BUILDTOOL_COMMON_REMOTE_ADDRESS_HPP
+#ifndef INCLUDED_SRC_BUILDTOOL_COMMON_REMOTE_COMMON_HPP
+#define INCLUDED_SRC_BUILDTOOL_COMMON_REMOTE_COMMON_HPP
 
 #include <map>
 #include <optional>
@@ -131,4 +131,4 @@ using DispatchEndpoint = std::pair<ExecutionProperties, ServerAddress>;
     return parsed;
 }
 
-#endif  // INCLUDED_SRC_BUILDTOOL_COMMON_REMOTE_ADDRESS_HPP
+#endif  // INCLUDED_SRC_BUILDTOOL_COMMON_REMOTE_COMMON_HPP
diff --git a/src/buildtool/common/remote/retry.hpp b/src/buildtool/common/remote/retry.hpp
index 0f82a48f..b9298588 100644
--- a/src/buildtool/common/remote/retry.hpp
+++ b/src/buildtool/common/remote/retry.hpp
@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifndef INCLUDED_SRC_BUILDTOOL_COMMON_RETRY_HPP
+#define INCLUDED_SRC_BUILDTOOL_COMMON_RETRY_HPP
+
 #include <optional>
 #include <thread>
 #include <utility>  // std::move
@@ -145,3 +148,5 @@ template <CallableReturningGrpcStatus F>
     }
     return {false, std::move(status)};
 }
+
+#endif  // INCLUDED_SRC_BUILDTOOL_COMMON_RETRY_HPP
diff --git a/src/buildtool/common/remote/retry_parameters.hpp b/src/buildtool/common/remote/retry_parameters.hpp
index 6a9beedf..bc4c474a 100644
--- a/src/buildtool/common/remote/retry_parameters.hpp
+++ b/src/buildtool/common/remote/retry_parameters.hpp
@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifndef INCLUDED_SRC_BUILDTOOL_COMMON_RETRY_PARAMETERS_HPP
+#define INCLUDED_SRC_BUILDTOOL_COMMON_RETRY_PARAMETERS_HPP
+
 #include <mutex>
 #include <random>
 
@@ -126,3 +129,5 @@ class Retry {
     std::random_device dev_;
     std::mt19937 rng_{dev_()};
 };
+
+#endif  // INCLUDED_SRC_BUILDTOOL_COMMON_RETRY_PARAMETERS_HPP