diff --git a/cpp/src/phonenumbers/phonenumbermatcher.cc b/cpp/src/phonenumbers/phonenumbermatcher.cc
index 631bd956f..adcc384e3 100644
--- a/cpp/src/phonenumbers/phonenumbermatcher.cc
+++ b/cpp/src/phonenumbers/phonenumbermatcher.cc
@@ -53,7 +53,7 @@
 
 #ifdef I18N_PHONENUMBERS_USE_RE2
 #include "phonenumbers/regexp_adapter_re2.h"
-#endif  // I18N_PHONENUMBERS_USE_RE2_AND_ICU
+#endif  // I18N_PHONENUMBERS_USE_RE2
 
 using std::map;
 using std::numeric_limits;
diff --git a/cpp/test/phonenumbers/regexp_adapter_test.cc b/cpp/test/phonenumbers/regexp_adapter_test.cc
index a75cc69f1..6376c97cd 100644
--- a/cpp/test/phonenumbers/regexp_adapter_test.cc
+++ b/cpp/test/phonenumbers/regexp_adapter_test.cc
@@ -26,11 +26,11 @@
 #include "phonenumbers/stl_util.h"
 #include "phonenumbers/stringutil.h"
 
-#ifdef USE_RE2
+#ifdef I18N_PHONENUMBERS_USE_RE2
 #include "phonenumbers/regexp_adapter_re2.h"
 #else
 #include "phonenumbers/regexp_adapter_icu.h"
-#endif  // USE_RE2
+#endif  // I18N_PHONENUMBERS_USE_RE2
 
 namespace i18n {
 namespace phonenumbers {
@@ -60,13 +60,13 @@ struct RegExpTestContext {
 class RegExpAdapterTest : public testing::Test {
  protected:
   RegExpAdapterTest() {
-#ifdef USE_RE2
+#ifdef I18N_PHONENUMBERS_USE_RE2
     contexts_.push_back(
         new RegExpTestContext("RE2", new RE2RegExpFactory()));
 #else
     contexts_.push_back(
         new RegExpTestContext("ICU Regex", new ICURegExpFactory()));
-#endif  // USE_RE2
+#endif  // I18N_PHONENUMBERS_USE_RE2
   }
 
   ~RegExpAdapterTest() {