Make define guards on implementation shims more explicit

PiperOrigin-RevId: 293923454

iree/base/init.h

diff --git a/iree/base/init.h b/iree/base/init.h
index aeaf145..8d03ac1 100644
--- a/iree/base/init.h
+++ b/iree/base/init.h
@@ -18,7 +18,7 @@
 // Initialization happens automatically during InitializeEnvironment(), which
 // should be called early in main(), before other code runs.
 
-#ifdef IREE_CONFIG_GOOGLE_INTERNAL
+#if defined(IREE_CONFIG_GOOGLE_INTERNAL) && IREE_CONFIG_GOOGLE_INTERNAL
 #include "iree/base/google/init_google.h"
 #else
 #include "iree/base/internal/init_internal.h"

iree/base/logging.h

diff --git a/iree/base/logging.h b/iree/base/logging.h
index 1fe5c3f..95d5552 100644
--- a/iree/base/logging.h
+++ b/iree/base/logging.h
@@ -58,7 +58,7 @@
 //   They are useful when problems are definitely unrelated to program flow,
 //   e.g. when validating user input.
 
-#ifdef IREE_CONFIG_GOOGLE_INTERNAL
+#if defined(IREE_CONFIG_GOOGLE_INTERNAL) && IREE_CONFIG_GOOGLE_INTERNAL
 #include "iree/base/google/logging_google.h"
 #else
 #include "iree/base/internal/logging.h"

iree/base/source_location.h

diff --git a/iree/base/source_location.h b/iree/base/source_location.h
index d4a10ca..480f787 100644
--- a/iree/base/source_location.h
+++ b/iree/base/source_location.h
@@ -15,7 +15,7 @@
 #ifndef IREE_BASE_SOURCE_LOCATION_H_
 #define IREE_BASE_SOURCE_LOCATION_H_
 
-#ifdef IREE_CONFIG_GOOGLE_INTERNAL
+#if defined(IREE_CONFIG_GOOGLE_INTERNAL) && IREE_CONFIG_GOOGLE_INTERNAL
 #include "iree/base/google/source_location_google.h"
 #else
 #include "iree/base/internal/source_location.h"

iree/base/status.h

diff --git a/iree/base/status.h b/iree/base/status.h
index 4565101..414b166 100644
--- a/iree/base/status.h
+++ b/iree/base/status.h
@@ -15,7 +15,7 @@
 #ifndef IREE_BASE_STATUS_H_
 #define IREE_BASE_STATUS_H_
 
-#ifdef IREE_CONFIG_GOOGLE_INTERNAL
+#if defined(IREE_CONFIG_GOOGLE_INTERNAL) && IREE_CONFIG_GOOGLE_INTERNAL
 #include "iree/base/google/status_google.h"
 #else
 #include "iree/base/internal/status.h"

iree/base/status_matchers.h

diff --git a/iree/base/status_matchers.h b/iree/base/status_matchers.h
index 7920c57..20d410a 100644
--- a/iree/base/status_matchers.h
+++ b/iree/base/status_matchers.h
@@ -15,7 +15,7 @@
 #ifndef IREE_BASE_STATUS_MATCHERS_H_
 #define IREE_BASE_STATUS_MATCHERS_H_
 
-#ifdef IREE_CONFIG_GOOGLE_INTERNAL
+#if defined(IREE_CONFIG_GOOGLE_INTERNAL) && IREE_CONFIG_GOOGLE_INTERNAL
 
 #include "iree/base/google/status_matchers_google.h"  // IWYU pragma: export
 

iree/testing/gtest.h

diff --git a/iree/testing/gtest.h b/iree/testing/gtest.h
index e9e72b9..b246126 100644
--- a/iree/testing/gtest.h
+++ b/iree/testing/gtest.h
@@ -15,7 +15,7 @@
 #ifndef IREE_TESTING_GTEST_H_
 #define IREE_TESTING_GTEST_H_
 
-#ifdef IREE_CONFIG_GOOGLE_INTERNAL
+#if defined(IREE_CONFIG_GOOGLE_INTERNAL) && IREE_CONFIG_GOOGLE_INTERNAL
 #include "iree/testing/google/gtest_google.h"
 #else
 #include "iree/testing/internal/gtest_internal.h"