diff --git a/cmake/CompilationEnv.cmake b/cmake/CompilationEnv.cmake
index 2ddc191ade..3cc7ea514e 100644
--- a/cmake/CompilationEnv.cmake
+++ b/cmake/CompilationEnv.cmake
@@ -5,10 +5,7 @@
  # checks on CMAKE_* and built-in platform variables.
 
 # Only run once per configure step.
-if(DEFINED XRPL_COMPILATION_ENV_INCLUDED)
-  return()
-endif()
-set(XRPL_COMPILATION_ENV_INCLUDED TRUE)
+include_guard(GLOBAL)
 
 # --------------------------------------------------------------------
 # Compiler detection (C++)
diff --git a/src/libxrpl/protocol/BuildInfo.cpp b/src/libxrpl/protocol/BuildInfo.cpp
index b6df89e4b4..689dc8c5d5 100644
--- a/src/libxrpl/protocol/BuildInfo.cpp
+++ b/src/libxrpl/protocol/BuildInfo.cpp
@@ -3,6 +3,8 @@
 #include <xrpl/beast/core/SemanticVersion.h>
 #include <xrpl/protocol/BuildInfo.h>
 
+#include <boost/preprocessor/stringize.hpp>
+
 #include <algorithm>
 #include <cstdint>
 #include <string>