diff --git a/admob/src/android/ad_request_converter.h b/admob/src/android/ad_request_converter.h
index 649fd5b44b..2e9ebffb83 100644
--- a/admob/src/android/ad_request_converter.h
+++ b/admob/src/android/ad_request_converter.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_AD_REQUEST_CONVERTER_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_AD_REQUEST_CONVERTER_H_
+#ifndef FIREBASE_ADMOB_SRC_ANDROID_AD_REQUEST_CONVERTER_H_
+#define FIREBASE_ADMOB_SRC_ANDROID_AD_REQUEST_CONVERTER_H_
 
 #include <jni.h>
 
@@ -82,4 +82,4 @@ class AdRequestConverter {
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_AD_REQUEST_CONVERTER_H_
+#endif  // FIREBASE_ADMOB_SRC_ANDROID_AD_REQUEST_CONVERTER_H_
diff --git a/admob/src/android/admob_android.h b/admob/src/android/admob_android.h
index 7bd56f4ca9..889d9cc2fe 100644
--- a/admob/src/android/admob_android.h
+++ b/admob/src/android/admob_android.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_ADMOB_ANDROID_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_ADMOB_ANDROID_H_
+#ifndef FIREBASE_ADMOB_SRC_ANDROID_ADMOB_ANDROID_H_
+#define FIREBASE_ADMOB_SRC_ANDROID_ADMOB_ANDROID_H_
 
 #include <jni.h>
 
@@ -47,4 +47,4 @@ void ReleaseClasses(JNIEnv* env);
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_ADMOB_ANDROID_H_
+#endif  // FIREBASE_ADMOB_SRC_ANDROID_ADMOB_ANDROID_H_
diff --git a/admob/src/android/banner_view_internal_android.h b/admob/src/android/banner_view_internal_android.h
index aaed0a2256..4e85198d12 100644
--- a/admob/src/android/banner_view_internal_android.h
+++ b/admob/src/android/banner_view_internal_android.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_BANNER_VIEW_INTERNAL_ANDROID_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_BANNER_VIEW_INTERNAL_ANDROID_H_
+#ifndef FIREBASE_ADMOB_SRC_ANDROID_BANNER_VIEW_INTERNAL_ANDROID_H_
+#define FIREBASE_ADMOB_SRC_ANDROID_BANNER_VIEW_INTERNAL_ANDROID_H_
 
 #include "admob/src/common/banner_view_internal.h"
 #include "app/src/util_android.h"
@@ -87,4 +87,4 @@ class BannerViewInternalAndroid : public BannerViewInternal {
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_BANNER_VIEW_INTERNAL_ANDROID_H_
+#endif  // FIREBASE_ADMOB_SRC_ANDROID_BANNER_VIEW_INTERNAL_ANDROID_H_
diff --git a/admob/src/android/interstitial_ad_internal_android.h b/admob/src/android/interstitial_ad_internal_android.h
index 5f5ecd3928..659fc6b845 100644
--- a/admob/src/android/interstitial_ad_internal_android.h
+++ b/admob/src/android/interstitial_ad_internal_android.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_INTERSTITIAL_AD_INTERNAL_ANDROID_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_INTERSTITIAL_AD_INTERNAL_ANDROID_H_
+#ifndef FIREBASE_ADMOB_SRC_ANDROID_INTERSTITIAL_AD_INTERNAL_ANDROID_H_
+#define FIREBASE_ADMOB_SRC_ANDROID_INTERSTITIAL_AD_INTERNAL_ANDROID_H_
 
 #include "admob/src/common/interstitial_ad_internal.h"
 #include "app/src/util_android.h"
@@ -60,4 +60,4 @@ class InterstitialAdInternalAndroid : public InterstitialAdInternal {
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_INTERSTITIAL_AD_INTERNAL_ANDROID_H_
+#endif  // FIREBASE_ADMOB_SRC_ANDROID_INTERSTITIAL_AD_INTERNAL_ANDROID_H_
diff --git a/admob/src/android/native_express_ad_view_internal_android.h b/admob/src/android/native_express_ad_view_internal_android.h
index 42e3cd4a05..62f2da20da 100644
--- a/admob/src/android/native_express_ad_view_internal_android.h
+++ b/admob/src/android/native_express_ad_view_internal_android.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_NATIVE_EXPRESS_AD_VIEW_INTERNAL_ANDROID_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_NATIVE_EXPRESS_AD_VIEW_INTERNAL_ANDROID_H_
+#ifndef FIREBASE_ADMOB_SRC_ANDROID_NATIVE_EXPRESS_AD_VIEW_INTERNAL_ANDROID_H_
+#define FIREBASE_ADMOB_SRC_ANDROID_NATIVE_EXPRESS_AD_VIEW_INTERNAL_ANDROID_H_
 
 #include "admob/src/common/native_express_ad_view_internal.h"
 #include "app/src/util_android.h"
@@ -85,4 +85,4 @@ class NativeExpressAdViewInternalAndroid : public NativeExpressAdViewInternal {
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_NATIVE_EXPRESS_AD_VIEW_INTERNAL_ANDROID_H_
+#endif  // FIREBASE_ADMOB_SRC_ANDROID_NATIVE_EXPRESS_AD_VIEW_INTERNAL_ANDROID_H_
diff --git a/admob/src/android/rewarded_video_internal_android.h b/admob/src/android/rewarded_video_internal_android.h
index d7b9ed17e5..eb03bbbf55 100644
--- a/admob/src/android/rewarded_video_internal_android.h
+++ b/admob/src/android/rewarded_video_internal_android.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_REWARDED_VIDEO_INTERNAL_ANDROID_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_REWARDED_VIDEO_INTERNAL_ANDROID_H_
+#ifndef FIREBASE_ADMOB_SRC_ANDROID_REWARDED_VIDEO_INTERNAL_ANDROID_H_
+#define FIREBASE_ADMOB_SRC_ANDROID_REWARDED_VIDEO_INTERNAL_ANDROID_H_
 
 #include "admob/src/common/rewarded_video_internal.h"
 #include "app/src/util_android.h"
@@ -74,4 +74,4 @@ class RewardedVideoInternalAndroid : public RewardedVideoInternal {
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_ANDROID_REWARDED_VIDEO_INTERNAL_ANDROID_H_
+#endif  // FIREBASE_ADMOB_SRC_ANDROID_REWARDED_VIDEO_INTERNAL_ANDROID_H_
diff --git a/admob/src/common/admob_common.h b/admob/src/common/admob_common.h
index 873e3f4937..baa977df9e 100644
--- a/admob/src/common/admob_common.h
+++ b/admob/src/common/admob_common.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_COMMON_ADMOB_COMMON_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_SRC_COMMON_ADMOB_COMMON_H_
+#ifndef FIREBASE_ADMOB_SRC_COMMON_ADMOB_COMMON_H_
+#define FIREBASE_ADMOB_SRC_COMMON_ADMOB_COMMON_H_
 
 #include <stdarg.h>
 
@@ -86,4 +86,4 @@ FutureCallbackData* CreateFutureCallbackData(FutureData* future_data,
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_COMMON_ADMOB_COMMON_H_
+#endif  // FIREBASE_ADMOB_SRC_COMMON_ADMOB_COMMON_H_
diff --git a/admob/src/common/banner_view_internal.h b/admob/src/common/banner_view_internal.h
index ed966ac999..51f2416244 100644
--- a/admob/src/common/banner_view_internal.h
+++ b/admob/src/common/banner_view_internal.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_COMMON_BANNER_VIEW_INTERNAL_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_SRC_COMMON_BANNER_VIEW_INTERNAL_H_
+#ifndef FIREBASE_ADMOB_SRC_COMMON_BANNER_VIEW_INTERNAL_H_
+#define FIREBASE_ADMOB_SRC_COMMON_BANNER_VIEW_INTERNAL_H_
 
 #include "admob/src/common/admob_common.h"
 #include "admob/src/include/firebase/admob/banner_view.h"
@@ -122,4 +122,4 @@ class BannerViewInternal {
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_COMMON_BANNER_VIEW_INTERNAL_H_
+#endif  // FIREBASE_ADMOB_SRC_COMMON_BANNER_VIEW_INTERNAL_H_
diff --git a/admob/src/common/interstitial_ad_internal.h b/admob/src/common/interstitial_ad_internal.h
index 53357e074e..9bf3bb9d04 100644
--- a/admob/src/common/interstitial_ad_internal.h
+++ b/admob/src/common/interstitial_ad_internal.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_COMMON_INTERSTITIAL_AD_INTERNAL_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_SRC_COMMON_INTERSTITIAL_AD_INTERNAL_H_
+#ifndef FIREBASE_ADMOB_SRC_COMMON_INTERSTITIAL_AD_INTERNAL_H_
+#define FIREBASE_ADMOB_SRC_COMMON_INTERSTITIAL_AD_INTERNAL_H_
 
 #include "admob/src/common/admob_common.h"
 #include "admob/src/include/firebase/admob/interstitial_ad.h"
@@ -88,4 +88,4 @@ class InterstitialAdInternal {
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_COMMON_INTERSTITIAL_AD_INTERNAL_H_
+#endif  // FIREBASE_ADMOB_SRC_COMMON_INTERSTITIAL_AD_INTERNAL_H_
diff --git a/admob/src/common/native_express_ad_view_internal.h b/admob/src/common/native_express_ad_view_internal.h
index be3858f46a..462d8f5d0f 100644
--- a/admob/src/common/native_express_ad_view_internal.h
+++ b/admob/src/common/native_express_ad_view_internal.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_COMMON_NATIVE_EXPRESS_AD_VIEW_INTERNAL_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_SRC_COMMON_NATIVE_EXPRESS_AD_VIEW_INTERNAL_H_
+#ifndef FIREBASE_ADMOB_SRC_COMMON_NATIVE_EXPRESS_AD_VIEW_INTERNAL_H_
+#define FIREBASE_ADMOB_SRC_COMMON_NATIVE_EXPRESS_AD_VIEW_INTERNAL_H_
 
 #include "admob/src/common/admob_common.h"
 #include "admob/src/include/firebase/admob/native_express_ad_view.h"
@@ -124,4 +124,4 @@ class NativeExpressAdViewInternal {
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_COMMON_NATIVE_EXPRESS_AD_VIEW_INTERNAL_H_
+#endif  // FIREBASE_ADMOB_SRC_COMMON_NATIVE_EXPRESS_AD_VIEW_INTERNAL_H_
diff --git a/admob/src/common/rewarded_video_internal.h b/admob/src/common/rewarded_video_internal.h
index 2a9233ac64..be8bdac1ab 100644
--- a/admob/src/common/rewarded_video_internal.h
+++ b/admob/src/common/rewarded_video_internal.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_COMMON_REWARDED_VIDEO_INTERNAL_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_SRC_COMMON_REWARDED_VIDEO_INTERNAL_H_
+#ifndef FIREBASE_ADMOB_SRC_COMMON_REWARDED_VIDEO_INTERNAL_H_
+#define FIREBASE_ADMOB_SRC_COMMON_REWARDED_VIDEO_INTERNAL_H_
 
 #include "admob/src/common/admob_common.h"
 #include "admob/src/include/firebase/admob/rewarded_video.h"
@@ -109,4 +109,4 @@ class RewardedVideoInternal {
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_COMMON_REWARDED_VIDEO_INTERNAL_H_
+#endif  // FIREBASE_ADMOB_SRC_COMMON_REWARDED_VIDEO_INTERNAL_H_
diff --git a/admob/src/include/firebase/admob.h b/admob/src/include/firebase/admob.h
index 3af42fe5ee..739402af5d 100644
--- a/admob/src/include/firebase/admob.h
+++ b/admob/src/include/firebase/admob.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_H_
+#ifndef FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_H_
+#define FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_H_
 
 #include "firebase/internal/platform.h"
 
@@ -154,4 +154,4 @@ void Terminate();
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_H_
+#endif  // FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_H_
diff --git a/admob/src/include/firebase/admob/banner_view.h b/admob/src/include/firebase/admob/banner_view.h
index 2703e4378f..3bfc7080f6 100644
--- a/admob/src/include/firebase/admob/banner_view.h
+++ b/admob/src/include/firebase/admob/banner_view.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_INCLUDE_FIREBASE_ADMOB_BANNER_VIEW_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_INCLUDE_FIREBASE_ADMOB_BANNER_VIEW_H_
+#ifndef FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_BANNER_VIEW_H_
+#define FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_BANNER_VIEW_H_
 
 #include "firebase/admob/types.h"
 #include "firebase/future.h"
@@ -239,4 +239,4 @@ class BannerView {
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_INCLUDE_FIREBASE_ADMOB_BANNER_VIEW_H_
+#endif  // FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_BANNER_VIEW_H_
diff --git a/admob/src/include/firebase/admob/interstitial_ad.h b/admob/src/include/firebase/admob/interstitial_ad.h
index ad4d5a4dc4..6e280eec88 100644
--- a/admob/src/include/firebase/admob/interstitial_ad.h
+++ b/admob/src/include/firebase/admob/interstitial_ad.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_INCLUDE_FIREBASE_ADMOB_INTERSTITIAL_AD_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_INCLUDE_FIREBASE_ADMOB_INTERSTITIAL_AD_H_
+#ifndef FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_INTERSTITIAL_AD_H_
+#define FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_INTERSTITIAL_AD_H_
 
 #include "firebase/admob/types.h"
 #include "firebase/future.h"
@@ -160,4 +160,4 @@ class InterstitialAd {
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_INCLUDE_FIREBASE_ADMOB_INTERSTITIAL_AD_H_
+#endif  // FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_INTERSTITIAL_AD_H_
diff --git a/admob/src/include/firebase/admob/native_express_ad_view.h b/admob/src/include/firebase/admob/native_express_ad_view.h
index 1f2caf8355..416aebf276 100644
--- a/admob/src/include/firebase/admob/native_express_ad_view.h
+++ b/admob/src/include/firebase/admob/native_express_ad_view.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_NATIVE_EXPRESS_AD_VIEW_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_NATIVE_EXPRESS_AD_VIEW_H_
+#ifndef FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_NATIVE_EXPRESS_AD_VIEW_H_
+#define FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_NATIVE_EXPRESS_AD_VIEW_H_
 
 #include "firebase/admob/types.h"
 #include "firebase/future.h"
@@ -313,4 +313,4 @@ class NativeExpressAdView {
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_NATIVE_EXPRESS_AD_VIEW_H_
+#endif  // FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_NATIVE_EXPRESS_AD_VIEW_H_
diff --git a/admob/src/include/firebase/admob/rewarded_video.h b/admob/src/include/firebase/admob/rewarded_video.h
index 5f59657f78..ac77c19dc1 100644
--- a/admob/src/include/firebase/admob/rewarded_video.h
+++ b/admob/src/include/firebase/admob/rewarded_video.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_REWARDED_VIDEO_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_REWARDED_VIDEO_H_
+#ifndef FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_REWARDED_VIDEO_H_
+#define FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_REWARDED_VIDEO_H_
 
 #include <queue>
 #include <string>
@@ -227,4 +227,4 @@ void SetListener(Listener* listener);
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_REWARDED_VIDEO_H_
+#endif  // FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_REWARDED_VIDEO_H_
diff --git a/admob/src/include/firebase/admob/types.h b/admob/src/include/firebase/admob/types.h
index e8f6af73ce..c6cd485edd 100644
--- a/admob/src/include/firebase/admob/types.h
+++ b/admob/src/include/firebase/admob/types.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_TYPES_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_TYPES_H_
+#ifndef FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_TYPES_H_
+#define FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_TYPES_H_
 
 #include "firebase/internal/platform.h"
 
@@ -177,4 +177,4 @@ struct BoundingBox {
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_TYPES_H_
+#endif  // FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_TYPES_H_
diff --git a/admob/src/ios/banner_view_internal_ios.h b/admob/src/ios/banner_view_internal_ios.h
index d21466f440..953b0b3c3b 100644
--- a/admob/src/ios/banner_view_internal_ios.h
+++ b/admob/src/ios/banner_view_internal_ios.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_IOS_BANNER_VIEW_INTERNAL_IOS_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_SRC_IOS_BANNER_VIEW_INTERNAL_IOS_H_
+#ifndef FIREBASE_ADMOB_SRC_IOS_BANNER_VIEW_INTERNAL_IOS_H_
+#define FIREBASE_ADMOB_SRC_IOS_BANNER_VIEW_INTERNAL_IOS_H_
 
 extern "C" {
 #include <objc/objc.h>
@@ -69,4 +69,4 @@ class BannerViewInternalIOS : public BannerViewInternal {
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_IOS_BANNER_VIEW_INTERNAL_IOS_H_
+#endif  // FIREBASE_ADMOB_SRC_IOS_BANNER_VIEW_INTERNAL_IOS_H_
diff --git a/admob/src/ios/interstitial_ad_internal_ios.h b/admob/src/ios/interstitial_ad_internal_ios.h
index e69a1fc27e..0d5407995f 100644
--- a/admob/src/ios/interstitial_ad_internal_ios.h
+++ b/admob/src/ios/interstitial_ad_internal_ios.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_IOS_INTERSTITIAL_AD_INTERNAL_IOS_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_SRC_IOS_INTERSTITIAL_AD_INTERNAL_IOS_H_
+#ifndef FIREBASE_ADMOB_SRC_IOS_INTERSTITIAL_AD_INTERNAL_IOS_H_
+#define FIREBASE_ADMOB_SRC_IOS_INTERSTITIAL_AD_INTERNAL_IOS_H_
 
 #ifdef __OBJC__
 #import "admob/src/ios/FADInterstitialDelegate.h"
@@ -82,4 +82,4 @@ class InterstitialAdInternalIOS : public InterstitialAdInternal {
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_IOS_INTERSTITIAL_AD_INTERNAL_IOS_H_
+#endif  // FIREBASE_ADMOB_SRC_IOS_INTERSTITIAL_AD_INTERNAL_IOS_H_
diff --git a/admob/src/ios/native_express_ad_view_internal_ios.h b/admob/src/ios/native_express_ad_view_internal_ios.h
index 9d0561e153..fd26e6a0aa 100644
--- a/admob/src/ios/native_express_ad_view_internal_ios.h
+++ b/admob/src/ios/native_express_ad_view_internal_ios.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_IOS_NATIVE_EXPRESS_AD_VIEW_INTERNAL_IOS_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_SRC_IOS_NATIVE_EXPRESS_AD_VIEW_INTERNAL_IOS_H_
+#ifndef FIREBASE_ADMOB_SRC_IOS_NATIVE_EXPRESS_AD_VIEW_INTERNAL_IOS_H_
+#define FIREBASE_ADMOB_SRC_IOS_NATIVE_EXPRESS_AD_VIEW_INTERNAL_IOS_H_
 
 extern "C" {
 #include <objc/objc.h>
@@ -69,4 +69,4 @@ class NativeExpressAdViewInternalIOS : public NativeExpressAdViewInternal {
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_IOS_NATIVE_EXPRESS_AD_VIEW_INTERNAL_IOS_H_
+#endif  // FIREBASE_ADMOB_SRC_IOS_NATIVE_EXPRESS_AD_VIEW_INTERNAL_IOS_H_
diff --git a/admob/src/ios/rewarded_video_internal_ios.h b/admob/src/ios/rewarded_video_internal_ios.h
index 26ce454ea7..13a4ea16bb 100644
--- a/admob/src/ios/rewarded_video_internal_ios.h
+++ b/admob/src/ios/rewarded_video_internal_ios.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_IOS_REWARDED_VIDEO_INTERNAL_IOS_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_SRC_IOS_REWARDED_VIDEO_INTERNAL_IOS_H_
+#ifndef FIREBASE_ADMOB_SRC_IOS_REWARDED_VIDEO_INTERNAL_IOS_H_
+#define FIREBASE_ADMOB_SRC_IOS_REWARDED_VIDEO_INTERNAL_IOS_H_
 
 #ifdef __OBJC__
 #import "admob/src/ios/FADRewardBasedVideoAdDelegate.h"
@@ -72,4 +72,4 @@ class RewardedVideoInternalIOS : public RewardedVideoInternal {
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_IOS_REWARDED_VIDEO_INTERNAL_IOS_H_
+#endif  // FIREBASE_ADMOB_SRC_IOS_REWARDED_VIDEO_INTERNAL_IOS_H_
diff --git a/admob/src/stub/banner_view_internal_stub.h b/admob/src/stub/banner_view_internal_stub.h
index e35ded7518..06c27a247a 100644
--- a/admob/src/stub/banner_view_internal_stub.h
+++ b/admob/src/stub/banner_view_internal_stub.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_STUB_BANNER_VIEW_INTERNAL_STUB_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_SRC_STUB_BANNER_VIEW_INTERNAL_STUB_H_
+#ifndef FIREBASE_ADMOB_SRC_STUB_BANNER_VIEW_INTERNAL_STUB_H_
+#define FIREBASE_ADMOB_SRC_STUB_BANNER_VIEW_INTERNAL_STUB_H_
 
 #include "admob/src/common/banner_view_internal.h"
 
@@ -87,4 +87,4 @@ class BannerViewInternalStub : public BannerViewInternal {
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_STUB_BANNER_VIEW_INTERNAL_STUB_H_
+#endif  // FIREBASE_ADMOB_SRC_STUB_BANNER_VIEW_INTERNAL_STUB_H_
diff --git a/admob/src/stub/interstitial_ad_internal_stub.h b/admob/src/stub/interstitial_ad_internal_stub.h
index 194e08ac3d..12d5bc43e8 100644
--- a/admob/src/stub/interstitial_ad_internal_stub.h
+++ b/admob/src/stub/interstitial_ad_internal_stub.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_STUB_INTERSTITIAL_AD_INTERNAL_STUB_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_SRC_STUB_INTERSTITIAL_AD_INTERNAL_STUB_H_
+#ifndef FIREBASE_ADMOB_SRC_STUB_INTERSTITIAL_AD_INTERNAL_STUB_H_
+#define FIREBASE_ADMOB_SRC_STUB_INTERSTITIAL_AD_INTERNAL_STUB_H_
 
 #include "admob/src/common/interstitial_ad_internal.h"
 
@@ -60,4 +60,4 @@ class InterstitialAdInternalStub : public InterstitialAdInternal {
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_STUB_INTERSTITIAL_AD_INTERNAL_STUB_H_
+#endif  // FIREBASE_ADMOB_SRC_STUB_INTERSTITIAL_AD_INTERNAL_STUB_H_
diff --git a/admob/src/stub/native_express_ad_view_internal_stub.h b/admob/src/stub/native_express_ad_view_internal_stub.h
index 7288135d8f..3f040e1e57 100644
--- a/admob/src/stub/native_express_ad_view_internal_stub.h
+++ b/admob/src/stub/native_express_ad_view_internal_stub.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_STUB_NATIVE_EXPRESS_AD_VIEW_INTERNAL_STUB_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_SRC_STUB_NATIVE_EXPRESS_AD_VIEW_INTERNAL_STUB_H_
+#ifndef FIREBASE_ADMOB_SRC_STUB_NATIVE_EXPRESS_AD_VIEW_INTERNAL_STUB_H_
+#define FIREBASE_ADMOB_SRC_STUB_NATIVE_EXPRESS_AD_VIEW_INTERNAL_STUB_H_
 
 #include "admob/src/common/native_express_ad_view_internal.h"
 
@@ -87,4 +87,4 @@ class NativeExpressAdViewInternalStub : public NativeExpressAdViewInternal {
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_STUB_NATIVE_EXPRESS_AD_VIEW_INTERNAL_STUB_H_
+#endif  // FIREBASE_ADMOB_SRC_STUB_NATIVE_EXPRESS_AD_VIEW_INTERNAL_STUB_H_
diff --git a/admob/src/stub/rewarded_video_internal_stub.h b/admob/src/stub/rewarded_video_internal_stub.h
index 8256c47459..096e0e4448 100644
--- a/admob/src/stub/rewarded_video_internal_stub.h
+++ b/admob/src/stub/rewarded_video_internal_stub.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_STUB_REWARDED_VIDEO_INTERNAL_STUB_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_SRC_STUB_REWARDED_VIDEO_INTERNAL_STUB_H_
+#ifndef FIREBASE_ADMOB_SRC_STUB_REWARDED_VIDEO_INTERNAL_STUB_H_
+#define FIREBASE_ADMOB_SRC_STUB_REWARDED_VIDEO_INTERNAL_STUB_H_
 
 #include "admob/src/common/rewarded_video_internal.h"
 
@@ -72,4 +72,4 @@ class RewardedVideoInternalStub : public RewardedVideoInternal {
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_STUB_REWARDED_VIDEO_INTERNAL_STUB_H_
+#endif  // FIREBASE_ADMOB_SRC_STUB_REWARDED_VIDEO_INTERNAL_STUB_H_
diff --git a/analytics/src/analytics_common.h b/analytics/src/analytics_common.h
index 208212f62d..bf7d112336 100644
--- a/analytics/src/analytics_common.h
+++ b/analytics/src/analytics_common.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ANALYTICS_CLIENT_CPP_SRC_ANALYTICS_COMMON_H__
-#define FIREBASE_ANALYTICS_CLIENT_CPP_SRC_ANALYTICS_COMMON_H__
+#ifndef FIREBASE_ANALYTICS_SRC_ANALYTICS_COMMON_H__
+#define FIREBASE_ANALYTICS_SRC_ANALYTICS_COMMON_H__
 
 #include "app/src/reference_counted_future_impl.h"
 
@@ -63,4 +63,4 @@ bool IsInitialized();
 }  // namespace analytics
 }  // namespace firebase
 
-#endif  // FIREBASE_ANALYTICS_CLIENT_CPP_SRC_ANALYTICS_COMMON_H__
+#endif  // FIREBASE_ANALYTICS_SRC_ANALYTICS_COMMON_H__
diff --git a/analytics/src/include/firebase/analytics.h b/analytics/src/include/firebase/analytics.h
index 7eee15f124..223f6bc4e6 100644
--- a/analytics/src/include/firebase/analytics.h
+++ b/analytics/src/include/firebase/analytics.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ANALYTICS_CLIENT_CPP_INCLUDE_FIREBASE_ANALYTICS_H_
-#define FIREBASE_ANALYTICS_CLIENT_CPP_INCLUDE_FIREBASE_ANALYTICS_H_
+#ifndef FIREBASE_ANALYTICS_SRC_INCLUDE_FIREBASE_ANALYTICS_H_
+#define FIREBASE_ANALYTICS_SRC_INCLUDE_FIREBASE_ANALYTICS_H_
 
 #include <cstddef>
 #include <cstdint>
@@ -521,4 +521,4 @@ Future<std::string> GetAnalyticsInstanceIdLastResult();
 }  // namespace analytics
 }  // namespace firebase
 
-#endif  // FIREBASE_ANALYTICS_CLIENT_CPP_INCLUDE_FIREBASE_ANALYTICS_H_
+#endif  // FIREBASE_ANALYTICS_SRC_INCLUDE_FIREBASE_ANALYTICS_H_
diff --git a/app/memory/atomic.h b/app/memory/atomic.h
index 047e7004e4..f63ffebca3 100644
--- a/app/memory/atomic.h
+++ b/app/memory/atomic.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_MEMORY_ATOMIC_H_
-#define FIREBASE_APP_CLIENT_CPP_MEMORY_ATOMIC_H_
+#ifndef FIREBASE_APP_MEMORY_ATOMIC_H_
+#define FIREBASE_APP_MEMORY_ATOMIC_H_
 #include <cstddef>
 #include <cstdint>
 #if !defined(_STLPORT_VERSION)
@@ -146,4 +146,4 @@ T Atomic<T>::fetch_sub(T arg) {
 }  // namespace compat
 // NOLINTNEXTLINE - allow namespace overridden
 }  // namespace firebase
-#endif  // FIREBASE_APP_CLIENT_CPP_MEMORY_ATOMIC_H_
+#endif  // FIREBASE_APP_MEMORY_ATOMIC_H_
diff --git a/app/memory/shared_ptr.h b/app/memory/shared_ptr.h
index 6e3cc66100..6657576ebe 100644
--- a/app/memory/shared_ptr.h
+++ b/app/memory/shared_ptr.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_MEMORY_SHARED_PTR_H_
-#define FIREBASE_APP_CLIENT_CPP_MEMORY_SHARED_PTR_H_
+#ifndef FIREBASE_APP_MEMORY_SHARED_PTR_H_
+#define FIREBASE_APP_MEMORY_SHARED_PTR_H_
 #include <cstdint>
 
 #include "app/memory/atomic.h"
@@ -226,4 +226,4 @@ void SharedPtr<T>::Clear() {
 }
 // NOLINTNEXTLINE - allow namespace overridden
 }  // namespace firebase
-#endif  // FIREBASE_APP_CLIENT_CPP_MEMORY_SHARED_PTR_H_
+#endif  // FIREBASE_APP_MEMORY_SHARED_PTR_H_
diff --git a/app/memory/unique_ptr.h b/app/memory/unique_ptr.h
index 9ef48e31ce..4cb1e7504a 100644
--- a/app/memory/unique_ptr.h
+++ b/app/memory/unique_ptr.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_MEMORY_UNIQUE_PTR_H_
-#define FIREBASE_APP_CLIENT_CPP_MEMORY_UNIQUE_PTR_H_
+#ifndef FIREBASE_APP_MEMORY_UNIQUE_PTR_H_
+#define FIREBASE_APP_MEMORY_UNIQUE_PTR_H_
 
 #include "app/meta/move.h"
 #include "app/src/include/firebase/internal/type_traits.h"
@@ -121,4 +121,4 @@ UniquePtr<T> MakeUnique(Args&&... args) {
 // NOLINTNEXTLINE - allow namespace overridden
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_MEMORY_UNIQUE_PTR_H_
+#endif  // FIREBASE_APP_MEMORY_UNIQUE_PTR_H_
diff --git a/app/meta/move.h b/app/meta/move.h
index 5abba84f7e..edcae602b1 100644
--- a/app/meta/move.h
+++ b/app/meta/move.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_META_MOVE_H_
-#define FIREBASE_APP_CLIENT_CPP_META_MOVE_H_
+#ifndef FIREBASE_APP_META_MOVE_H_
+#define FIREBASE_APP_META_MOVE_H_
 
 #include "app/src/include/firebase/internal/type_traits.h"
 
@@ -49,4 +49,4 @@ inline T&& Forward(typename remove_reference<T>::type&& arg) {
 // NOLINTNEXTLINE - allow namespace overridden
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_META_MOVE_H_
+#endif  // FIREBASE_APP_META_MOVE_H_
diff --git a/app/rest/controller_curl.h b/app/rest/controller_curl.h
index 3a25ad1b72..75c9644a47 100644
--- a/app/rest/controller_curl.h
+++ b/app/rest/controller_curl.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_REST_CONTROLLER_CURL_H_
-#define FIREBASE_APP_CLIENT_CPP_REST_CONTROLLER_CURL_H_
+#ifndef FIREBASE_APP_REST_CONTROLLER_CURL_H_
+#define FIREBASE_APP_REST_CONTROLLER_CURL_H_
 
 #include <cstdint>
 
@@ -134,4 +134,4 @@ class ControllerCurl : public Controller {
 }  // namespace rest
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_REST_CONTROLLER_CURL_H_
+#endif  // FIREBASE_APP_REST_CONTROLLER_CURL_H_
diff --git a/app/rest/controller_interface.h b/app/rest/controller_interface.h
index d605e19dd8..829f98fb2b 100644
--- a/app/rest/controller_interface.h
+++ b/app/rest/controller_interface.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_REST_CONTROLLER_INTERFACE_H_
-#define FIREBASE_APP_CLIENT_CPP_REST_CONTROLLER_INTERFACE_H_
+#ifndef FIREBASE_APP_REST_CONTROLLER_INTERFACE_H_
+#define FIREBASE_APP_REST_CONTROLLER_INTERFACE_H_
 
 #include <cstdint>
 
@@ -56,4 +56,4 @@ class Controller {
 }  // namespace rest
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_REST_CONTROLLER_INTERFACE_H_
+#endif  // FIREBASE_APP_REST_CONTROLLER_INTERFACE_H_
diff --git a/app/rest/gzipheader.h b/app/rest/gzipheader.h
index 146b83ae88..487afa5d9e 100644
--- a/app/rest/gzipheader.h
+++ b/app/rest/gzipheader.h
@@ -1,5 +1,5 @@
-#ifndef FIREBASE_APP_CLIENT_CPP_REST_GZIPHEADER_H_
-#define FIREBASE_APP_CLIENT_CPP_REST_GZIPHEADER_H_
+#ifndef FIREBASE_APP_REST_GZIPHEADER_H_
+#define FIREBASE_APP_REST_GZIPHEADER_H_
 
 //
 // Copyright 2000 Google LLC
@@ -106,4 +106,4 @@ class GZipHeader {
 
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_REST_GZIPHEADER_H_
+#endif  // FIREBASE_APP_REST_GZIPHEADER_H_
diff --git a/app/rest/request.h b/app/rest/request.h
index ade5899e1b..850def05f3 100644
--- a/app/rest/request.h
+++ b/app/rest/request.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_REST_REQUEST_H_
-#define FIREBASE_APP_CLIENT_CPP_REST_REQUEST_H_
+#ifndef FIREBASE_APP_REST_REQUEST_H_
+#define FIREBASE_APP_REST_REQUEST_H_
 
 #include <cstddef>
 #include <string>
@@ -118,4 +118,4 @@ class Request : public Transfer {
 }  // namespace rest
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_REST_REQUEST_H_
+#endif  // FIREBASE_APP_REST_REQUEST_H_
diff --git a/app/rest/request_binary.h b/app/rest/request_binary.h
index 18a4ba9ceb..5d65227337 100644
--- a/app/rest/request_binary.h
+++ b/app/rest/request_binary.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_REST_REQUEST_BINARY_H_
-#define FIREBASE_APP_CLIENT_CPP_REST_REQUEST_BINARY_H_
+#ifndef FIREBASE_APP_REST_REQUEST_BINARY_H_
+#define FIREBASE_APP_REST_REQUEST_BINARY_H_
 
 #include <cstddef>
 
@@ -45,4 +45,4 @@ class RequestBinary : public Request {
 }  // namespace rest
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_REST_REQUEST_BINARY_H_
+#endif  // FIREBASE_APP_REST_REQUEST_BINARY_H_
diff --git a/app/rest/request_binary_gzip.h b/app/rest/request_binary_gzip.h
index a5c80b3e7d..cfca76ca90 100644
--- a/app/rest/request_binary_gzip.h
+++ b/app/rest/request_binary_gzip.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_REST_REQUEST_BINARY_GZIP_H_
-#define FIREBASE_APP_CLIENT_CPP_REST_REQUEST_BINARY_GZIP_H_
+#ifndef FIREBASE_APP_REST_REQUEST_BINARY_GZIP_H_
+#define FIREBASE_APP_REST_REQUEST_BINARY_GZIP_H_
 
 #include <cstddef>
 #include <string>
@@ -70,4 +70,4 @@ class RequestBinaryGzip : public RequestBinary {
 }  // namespace rest
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_REST_REQUEST_BINARY_GZIP_H_
+#endif  // FIREBASE_APP_REST_REQUEST_BINARY_GZIP_H_
diff --git a/app/rest/request_file.h b/app/rest/request_file.h
index bd7096de45..4e30a7054f 100644
--- a/app/rest/request_file.h
+++ b/app/rest/request_file.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_REST_REQUEST_FILE_H_
-#define FIREBASE_APP_CLIENT_CPP_REST_REQUEST_FILE_H_
+#ifndef FIREBASE_APP_REST_REQUEST_FILE_H_
+#define FIREBASE_APP_REST_REQUEST_FILE_H_
 
 #include <stdio.h>
 
@@ -61,4 +61,4 @@ class RequestFile : public Request {
 }  // namespace rest
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_REST_REQUEST_FILE_H_
+#endif  // FIREBASE_APP_REST_REQUEST_FILE_H_
diff --git a/app/rest/request_json.h b/app/rest/request_json.h
index 6a5391a133..9f37830b27 100644
--- a/app/rest/request_json.h
+++ b/app/rest/request_json.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_REST_REQUEST_JSON_H_
-#define FIREBASE_APP_CLIENT_CPP_REST_REQUEST_JSON_H_
+#ifndef FIREBASE_APP_REST_REQUEST_JSON_H_
+#define FIREBASE_APP_REST_REQUEST_JSON_H_
 
 #include <string>
 
@@ -80,4 +80,4 @@ class RequestJson : public Request {
 }  // namespace rest
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_REST_REQUEST_JSON_H_
+#endif  // FIREBASE_APP_REST_REQUEST_JSON_H_
diff --git a/app/rest/request_options.h b/app/rest/request_options.h
index a083bdb45d..4faf75a7c8 100644
--- a/app/rest/request_options.h
+++ b/app/rest/request_options.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_REST_REQUEST_OPTIONS_H_
-#define FIREBASE_APP_CLIENT_CPP_REST_REQUEST_OPTIONS_H_
+#ifndef FIREBASE_APP_REST_REQUEST_OPTIONS_H_
+#define FIREBASE_APP_REST_REQUEST_OPTIONS_H_
 
 #include <map>
 #include <string>
@@ -56,4 +56,4 @@ struct RequestOptions {
 }  // namespace rest
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_REST_REQUEST_OPTIONS_H_
+#endif  // FIREBASE_APP_REST_REQUEST_OPTIONS_H_
diff --git a/app/rest/response.h b/app/rest/response.h
index 140ae839dd..d4cea7fece 100644
--- a/app/rest/response.h
+++ b/app/rest/response.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_REST_RESPONSE_H_
-#define FIREBASE_APP_CLIENT_CPP_REST_RESPONSE_H_
+#ifndef FIREBASE_APP_REST_RESPONSE_H_
+#define FIREBASE_APP_REST_RESPONSE_H_
 
 #include <cstddef>
 #include <ctime>
@@ -121,4 +121,4 @@ class Response : public Transfer {
 }  // namespace rest
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_REST_RESPONSE_H_
+#endif  // FIREBASE_APP_REST_RESPONSE_H_
diff --git a/app/rest/response_binary.h b/app/rest/response_binary.h
index ef155ef194..be02bb61f4 100644
--- a/app/rest/response_binary.h
+++ b/app/rest/response_binary.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_REST_RESPONSE_BINARY_H_
-#define FIREBASE_APP_CLIENT_CPP_REST_RESPONSE_BINARY_H_
+#ifndef FIREBASE_APP_REST_RESPONSE_BINARY_H_
+#define FIREBASE_APP_REST_RESPONSE_BINARY_H_
 
 #include <string>
 
@@ -47,4 +47,4 @@ class ResponseBinary : public Response {
 }  // namespace rest
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_REST_RESPONSE_BINARY_H_
+#endif  // FIREBASE_APP_REST_RESPONSE_BINARY_H_
diff --git a/app/rest/response_json.h b/app/rest/response_json.h
index 96b3da6f15..7ed1aa64ae 100644
--- a/app/rest/response_json.h
+++ b/app/rest/response_json.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_REST_RESPONSE_JSON_H_
-#define FIREBASE_APP_CLIENT_CPP_REST_RESPONSE_JSON_H_
+#ifndef FIREBASE_APP_REST_RESPONSE_JSON_H_
+#define FIREBASE_APP_REST_RESPONSE_JSON_H_
 
 #include <string>
 #include <utility>
@@ -100,4 +100,4 @@ class ResponseJson : public Response {
 }  // namespace rest
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_REST_RESPONSE_JSON_H_
+#endif  // FIREBASE_APP_REST_RESPONSE_JSON_H_
diff --git a/app/rest/tests/request_test.h b/app/rest/tests/request_test.h
index 0e32bdf6aa..be5383c9f5 100644
--- a/app/rest/tests/request_test.h
+++ b/app/rest/tests/request_test.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_REST_TESTS_REQUEST_TEST_H_
-#define FIREBASE_APP_CLIENT_CPP_REST_TESTS_REQUEST_TEST_H_
+#ifndef FIREBASE_APP_REST_TESTS_REQUEST_TEST_H_
+#define FIREBASE_APP_REST_TESTS_REQUEST_TEST_H_
 
 #include <cstddef>
 #include <memory>
@@ -113,4 +113,4 @@ static const std::string CreateLargeBinaryData() {
 }  // namespace rest
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_REST_TESTS_REQUEST_TEST_H_
+#endif  // FIREBASE_APP_REST_TESTS_REQUEST_TEST_H_
diff --git a/app/rest/transfer_interface.h b/app/rest/transfer_interface.h
index 0b14775475..11db88b9de 100644
--- a/app/rest/transfer_interface.h
+++ b/app/rest/transfer_interface.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_REST_TRANSFER_INTERFACE_H_
-#define FIREBASE_APP_CLIENT_CPP_REST_TRANSFER_INTERFACE_H_
+#ifndef FIREBASE_APP_REST_TRANSFER_INTERFACE_H_
+#define FIREBASE_APP_REST_TRANSFER_INTERFACE_H_
 
 namespace firebase {
 namespace rest {
@@ -34,4 +34,4 @@ class Transfer {
 }  // namespace rest
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_REST_TRANSFER_INTERFACE_H_
+#endif  // FIREBASE_APP_REST_TRANSFER_INTERFACE_H_
diff --git a/app/rest/transport_builder.h b/app/rest/transport_builder.h
index 6f248d8923..0260a98077 100644
--- a/app/rest/transport_builder.h
+++ b/app/rest/transport_builder.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_REST_TRANSPORT_BUILDER_H_
-#define FIREBASE_APP_CLIENT_CPP_REST_TRANSPORT_BUILDER_H_
+#ifndef FIREBASE_APP_REST_TRANSPORT_BUILDER_H_
+#define FIREBASE_APP_REST_TRANSPORT_BUILDER_H_
 
 #include <limits>
 #include <memory>
@@ -38,4 +38,4 @@ void SetTransportBuilder(flatbuffers::unique_ptr<Transport> (*builder)());
 }  // namespace rest
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_REST_TRANSPORT_BUILDER_H_
+#endif  // FIREBASE_APP_REST_TRANSPORT_BUILDER_H_
diff --git a/app/rest/transport_curl.h b/app/rest/transport_curl.h
index 3232ed3edc..19de88f14f 100644
--- a/app/rest/transport_curl.h
+++ b/app/rest/transport_curl.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_REST_TRANSPORT_CURL_H_
-#define FIREBASE_APP_CLIENT_CPP_REST_TRANSPORT_CURL_H_
+#ifndef FIREBASE_APP_REST_TRANSPORT_CURL_H_
+#define FIREBASE_APP_REST_TRANSPORT_CURL_H_
 
 #include <limits>
 #include <memory>
@@ -104,4 +104,4 @@ class TransportCurl : public Transport {
 }  // namespace rest
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_REST_TRANSPORT_CURL_H_
+#endif  // FIREBASE_APP_REST_TRANSPORT_CURL_H_
diff --git a/app/rest/transport_interface.h b/app/rest/transport_interface.h
index b968dad158..6798aefadd 100644
--- a/app/rest/transport_interface.h
+++ b/app/rest/transport_interface.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_REST_TRANSPORT_INTERFACE_H_
-#define FIREBASE_APP_CLIENT_CPP_REST_TRANSPORT_INTERFACE_H_
+#ifndef FIREBASE_APP_REST_TRANSPORT_INTERFACE_H_
+#define FIREBASE_APP_REST_TRANSPORT_INTERFACE_H_
 
 #include <limits>
 #include <memory>
@@ -63,4 +63,4 @@ class Transport {
 }  // namespace rest
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_REST_TRANSPORT_INTERFACE_H_
+#endif  // FIREBASE_APP_REST_TRANSPORT_INTERFACE_H_
diff --git a/app/rest/transport_mock.h b/app/rest/transport_mock.h
index 6ad799fbf7..343868fd03 100644
--- a/app/rest/transport_mock.h
+++ b/app/rest/transport_mock.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_REST_TRANSPORT_MOCK_H_
-#define FIREBASE_APP_CLIENT_CPP_REST_TRANSPORT_MOCK_H_
+#ifndef FIREBASE_APP_REST_TRANSPORT_MOCK_H_
+#define FIREBASE_APP_REST_TRANSPORT_MOCK_H_
 
 #include "app/rest/transport_interface.h"
 
@@ -35,4 +35,4 @@ class TransportMock : public Transport {
 
 }  // namespace rest
 }  // namespace firebase
-#endif  // FIREBASE_APP_CLIENT_CPP_REST_TRANSPORT_MOCK_H_
+#endif  // FIREBASE_APP_REST_TRANSPORT_MOCK_H_
diff --git a/app/rest/util.h b/app/rest/util.h
index 230dd2b5c7..e4a8576549 100644
--- a/app/rest/util.h
+++ b/app/rest/util.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_REST_UTIL_H_
-#define FIREBASE_APP_CLIENT_CPP_REST_UTIL_H_
+#ifndef FIREBASE_APP_REST_UTIL_H_
+#define FIREBASE_APP_REST_UTIL_H_
 
 #include <string>
 
@@ -101,4 +101,4 @@ class JsonData {
 }  // namespace rest
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_REST_UTIL_H_
+#endif  // FIREBASE_APP_REST_UTIL_H_
diff --git a/app/rest/www_form_url_encoded.h b/app/rest/www_form_url_encoded.h
index 1262353700..63be39966c 100644
--- a/app/rest/www_form_url_encoded.h
+++ b/app/rest/www_form_url_encoded.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_REST_WWW_FORM_URL_ENCODED_H_
-#define FIREBASE_APP_CLIENT_CPP_REST_WWW_FORM_URL_ENCODED_H_
+#ifndef FIREBASE_APP_REST_WWW_FORM_URL_ENCODED_H_
+#define FIREBASE_APP_REST_WWW_FORM_URL_ENCODED_H_
 
 #include <string>
 #include <vector>
@@ -61,4 +61,4 @@ class WwwFormUrlEncoded {
 }  // namespace rest
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_REST_WWW_FORM_URL_ENCODED_H_
+#endif  // FIREBASE_APP_REST_WWW_FORM_URL_ENCODED_H_
diff --git a/app/rest/zlibwrapper.h b/app/rest/zlibwrapper.h
index f96c65f90c..70bc70f9e6 100644
--- a/app/rest/zlibwrapper.h
+++ b/app/rest/zlibwrapper.h
@@ -1,5 +1,5 @@
-#ifndef FIREBASE_APP_CLIENT_CPP_REST_ZLIBWRAPPER_H_
-#define FIREBASE_APP_CLIENT_CPP_REST_ZLIBWRAPPER_H_
+#ifndef FIREBASE_APP_REST_ZLIBWRAPPER_H_
+#define FIREBASE_APP_REST_ZLIBWRAPPER_H_
 
 /*
  * Copyright 1999 Google LLC
@@ -317,4 +317,4 @@ class ZLib {
 
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_REST_ZLIBWRAPPER_H_
+#endif  // FIREBASE_APP_REST_ZLIBWRAPPER_H_
diff --git a/app/src/app_common.h b/app/src/app_common.h
index 0c75801d13..c404e7a825 100644
--- a/app/src/app_common.h
+++ b/app/src/app_common.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_APP_COMMON_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_APP_COMMON_H_
+#ifndef FIREBASE_APP_SRC_APP_COMMON_H_
+#define FIREBASE_APP_SRC_APP_COMMON_H_
 
 #include <stddef.h>
 
@@ -100,4 +100,4 @@ Logger* FindAppLoggerByName(const char* name);
 // NOLINTNEXTLINE - allow namespace overridden
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_APP_COMMON_H_
+#endif  // FIREBASE_APP_SRC_APP_COMMON_H_
diff --git a/app/src/app_identifier.h b/app/src/app_identifier.h
index 1d43b85477..d35589ea11 100644
--- a/app/src/app_identifier.h
+++ b/app/src/app_identifier.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_APP_IDENTIFIER_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_APP_IDENTIFIER_H_
+#ifndef FIREBASE_APP_SRC_APP_IDENTIFIER_H_
+#define FIREBASE_APP_SRC_APP_IDENTIFIER_H_
 
 #include <string>
 
@@ -30,4 +30,4 @@ std::string CreateAppIdentifierFromOptions(const AppOptions& options);
 }  // namespace internal
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_APP_IDENTIFIER_H_
+#endif  // FIREBASE_APP_SRC_APP_IDENTIFIER_H_
diff --git a/app/src/app_ios.h b/app/src/app_ios.h
index 6398f0bcc2..e8de63f878 100644
--- a/app/src/app_ios.h
+++ b/app/src/app_ios.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_APP_IOS_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_APP_IOS_H_
+#ifndef FIREBASE_APP_SRC_APP_IOS_H_
+#define FIREBASE_APP_SRC_APP_IOS_H_
 #include "FIRApp.h"
 #include "app/src/util_ios.h"
 
@@ -27,4 +27,4 @@ OBJ_C_PTR_WRAPPER_NAMED(AppInternal, FIRApp);
 
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_APP_IOS_H_
+#endif  // FIREBASE_APP_SRC_APP_IOS_H_
diff --git a/app/src/assert.h b/app/src/assert.h
index 0095f0053e..8c928053ed 100644
--- a/app/src/assert.h
+++ b/app/src/assert.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_ASSERT_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_ASSERT_H_
+#ifndef FIREBASE_APP_SRC_ASSERT_H_
+#define FIREBASE_APP_SRC_ASSERT_H_
 
 #include <cstdlib>
 
@@ -181,4 +181,4 @@
   { (void)(expression); }
 #endif  // !defined(NDEBUG)
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_ASSERT_H_
+#endif  // FIREBASE_APP_SRC_ASSERT_H_
diff --git a/app/src/base64.h b/app/src/base64.h
index 301f64aa6c..5d4a8225cf 100644
--- a/app/src/base64.h
+++ b/app/src/base64.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_BASE64_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_BASE64_H_
+#ifndef FIREBASE_APP_SRC_BASE64_H_
+#define FIREBASE_APP_SRC_BASE64_H_
 
 #include <string>
 
@@ -56,4 +56,4 @@ size_t GetBase64DecodedSize(const std::string& input);
 }  // namespace internal
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_BASE64_H_
+#endif  // FIREBASE_APP_SRC_BASE64_H_
diff --git a/app/src/callback.h b/app/src/callback.h
index 6b2f0bedcf..2f4f555f2d 100644
--- a/app/src/callback.h
+++ b/app/src/callback.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_CALLBACK_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_CALLBACK_H_
+#ifndef FIREBASE_APP_SRC_CALLBACK_H_
+#define FIREBASE_APP_SRC_CALLBACK_H_
 
 #include "app/meta/move.h"
 #include "firebase/internal/common.h"
@@ -397,4 +397,4 @@ void PollCallbacks();
 }  // namespace firebase
 /// @endcond
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_CALLBACK_H_
+#endif  // FIREBASE_APP_SRC_CALLBACK_H_
diff --git a/app/src/cleanup_notifier.h b/app/src/cleanup_notifier.h
index 383ca702d1..821de1b684 100644
--- a/app/src/cleanup_notifier.h
+++ b/app/src/cleanup_notifier.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_CLEANUP_NOTIFIER_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_CLEANUP_NOTIFIER_H_
+#ifndef FIREBASE_APP_SRC_CLEANUP_NOTIFIER_H_
+#define FIREBASE_APP_SRC_CLEANUP_NOTIFIER_H_
 
 #include <map>
 #include <vector>
@@ -129,4 +129,4 @@ class TypedCleanupNotifier {
 // NOLINTNEXTLINE - allow namespace overridden
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_CLEANUP_NOTIFIER_H_
+#endif  // FIREBASE_APP_SRC_CLEANUP_NOTIFIER_H_
diff --git a/app/src/embedded_file.h b/app/src/embedded_file.h
index 2571cc993b..e420f24d85 100644
--- a/app/src/embedded_file.h
+++ b/app/src/embedded_file.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_EMBEDDED_FILE_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_EMBEDDED_FILE_H_
+#ifndef FIREBASE_APP_SRC_EMBEDDED_FILE_H_
+#define FIREBASE_APP_SRC_EMBEDDED_FILE_H_
 
 #include <stddef.h>
 
@@ -47,4 +47,4 @@ struct EmbeddedFile {
 }  // namespace internal
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_EMBEDDED_FILE_H_
+#endif  // FIREBASE_APP_SRC_EMBEDDED_FILE_H_
diff --git a/app/src/filesystem.h b/app/src/filesystem.h
index 6ed6bf634c..bf55f3fa8b 100644
--- a/app/src/filesystem.h
+++ b/app/src/filesystem.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_FILESYSTEM_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_FILESYSTEM_H_
+#ifndef FIREBASE_APP_SRC_FILESYSTEM_H_
+#define FIREBASE_APP_SRC_FILESYSTEM_H_
 
 #include <string>
 
@@ -56,4 +56,4 @@ std::string AppDataDir(const char* app_name, bool should_create = true,
 
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_FILESYSTEM_H_
+#endif  // FIREBASE_APP_SRC_FILESYSTEM_H_
diff --git a/app/src/function_registry.h b/app/src/function_registry.h
index a6d5121973..647e08c606 100644
--- a/app/src/function_registry.h
+++ b/app/src/function_registry.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_FUNCTION_REGISTRY_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_FUNCTION_REGISTRY_H_
+#ifndef FIREBASE_APP_SRC_FUNCTION_REGISTRY_H_
+#define FIREBASE_APP_SRC_FUNCTION_REGISTRY_H_
 
 #include <map>
 
@@ -71,4 +71,4 @@ class FunctionRegistry {
 // NOLINTNEXTLINE - allow namespace overridden
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_FUNCTION_REGISTRY_H_
+#endif  // FIREBASE_APP_SRC_FUNCTION_REGISTRY_H_
diff --git a/app/src/future_manager.h b/app/src/future_manager.h
index 90fe8a2a0f..991594932e 100644
--- a/app/src/future_manager.h
+++ b/app/src/future_manager.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_FUTURE_MANAGER_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_FUTURE_MANAGER_H_
+#ifndef FIREBASE_APP_SRC_FUTURE_MANAGER_H_
+#define FIREBASE_APP_SRC_FUTURE_MANAGER_H_
 
 #include <map>
 #include <set>
@@ -84,4 +84,4 @@ class FutureManager {
 // NOLINTNEXTLINE - allow namespace overridden
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_FUTURE_MANAGER_H_
+#endif  // FIREBASE_APP_SRC_FUTURE_MANAGER_H_
diff --git a/app/src/google_play_services/availability_android.h b/app/src/google_play_services/availability_android.h
index 0dbee09e6c..902b38a6ea 100644
--- a/app/src/google_play_services/availability_android.h
+++ b/app/src/google_play_services/availability_android.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_GOOGLE_PLAY_SERVICES_AVAILABILITY_ANDROID_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_GOOGLE_PLAY_SERVICES_AVAILABILITY_ANDROID_H_
+#ifndef FIREBASE_APP_SRC_GOOGLE_PLAY_SERVICES_AVAILABILITY_ANDROID_H_
+#define FIREBASE_APP_SRC_GOOGLE_PLAY_SERVICES_AVAILABILITY_ANDROID_H_
 
 #include <jni.h>
 
@@ -31,4 +31,4 @@ void Terminate(JNIEnv* env);
 
 }  // namespace google_play_services
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_GOOGLE_PLAY_SERVICES_AVAILABILITY_ANDROID_H_
+#endif  // FIREBASE_APP_SRC_GOOGLE_PLAY_SERVICES_AVAILABILITY_ANDROID_H_
diff --git a/app/src/heartbeat_date_storage_desktop.h b/app/src/heartbeat_date_storage_desktop.h
index e1dd1aece5..4ea44643ca 100644
--- a/app/src/heartbeat_date_storage_desktop.h
+++ b/app/src/heartbeat_date_storage_desktop.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_HEARTBEAT_DATE_STORAGE_DESKTOP_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_HEARTBEAT_DATE_STORAGE_DESKTOP_H_
+#ifndef FIREBASE_APP_SRC_HEARTBEAT_DATE_STORAGE_DESKTOP_H_
+#define FIREBASE_APP_SRC_HEARTBEAT_DATE_STORAGE_DESKTOP_H_
 
 #include <ctime>
 #include <map>
@@ -72,4 +72,4 @@ class HeartbeatDateStorage {
 
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_HEARTBEAT_DATE_STORAGE_DESKTOP_H_
+#endif  // FIREBASE_APP_SRC_HEARTBEAT_DATE_STORAGE_DESKTOP_H_
diff --git a/app/src/heartbeat_info_desktop.h b/app/src/heartbeat_info_desktop.h
index 1345c1b66f..b82ce086ce 100644
--- a/app/src/heartbeat_info_desktop.h
+++ b/app/src/heartbeat_info_desktop.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_HEARTBEAT_INFO_DESKTOP_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_HEARTBEAT_INFO_DESKTOP_H_
+#ifndef FIREBASE_APP_SRC_HEARTBEAT_INFO_DESKTOP_H_
+#define FIREBASE_APP_SRC_HEARTBEAT_INFO_DESKTOP_H_
 
 namespace firebase {
 
@@ -39,4 +39,4 @@ class HeartbeatInfo {
 
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_HEARTBEAT_INFO_DESKTOP_H_
+#endif  // FIREBASE_APP_SRC_HEARTBEAT_INFO_DESKTOP_H_
diff --git a/app/src/include/firebase/app.h b/app/src/include/firebase/app.h
index fd857d8ac9..29c502e2f2 100644
--- a/app/src/include/firebase/app.h
+++ b/app/src/include/firebase/app.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_APP_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_APP_H_
+#ifndef FIREBASE_APP_SRC_INCLUDE_FIREBASE_APP_H_
+#define FIREBASE_APP_SRC_INCLUDE_FIREBASE_APP_H_
 
 #include "firebase/internal/platform.h"
 
@@ -766,4 +766,4 @@ class App {
 
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_APP_H_
+#endif  // FIREBASE_APP_SRC_INCLUDE_FIREBASE_APP_H_
diff --git a/app/src/include/firebase/future.h b/app/src/include/firebase/future.h
index 4f7b87ec99..15c42d5352 100644
--- a/app/src/include/firebase/future.h
+++ b/app/src/include/firebase/future.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FUTURE_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FUTURE_H_
+#ifndef FIREBASE_APP_SRC_INCLUDE_FIREBASE_FUTURE_H_
+#define FIREBASE_APP_SRC_INCLUDE_FIREBASE_FUTURE_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -523,4 +523,4 @@ class Future : public FutureBase {
 // Include the inline implementation.
 #include "firebase/internal/future_impl.h"
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FUTURE_H_
+#endif  // FIREBASE_APP_SRC_INCLUDE_FIREBASE_FUTURE_H_
diff --git a/app/src/include/firebase/internal/common.h b/app/src/include/firebase/internal/common.h
index 8242269229..2e2878a0bd 100644
--- a/app/src/include/firebase/internal/common.h
+++ b/app/src/include/firebase/internal/common.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_INTERNAL_COMMON_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_INTERNAL_COMMON_H_
+#ifndef FIREBASE_APP_SRC_INCLUDE_FIREBASE_INTERNAL_COMMON_H_
+#define FIREBASE_APP_SRC_INCLUDE_FIREBASE_INTERNAL_COMMON_H_
 
 // This file contains definitions that configure the SDK.
 
@@ -125,4 +125,4 @@ struct AlignedStorage {
 // Guaranteed compile time strlen.
 #define FIREBASE_STRLEN(s) (FIREBASE_ARRAYSIZE(s) - sizeof((s)[0]))
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_INTERNAL_COMMON_H_
+#endif  // FIREBASE_APP_SRC_INCLUDE_FIREBASE_INTERNAL_COMMON_H_
diff --git a/app/src/include/firebase/internal/future_impl.h b/app/src/include/firebase/internal/future_impl.h
index 492e772066..5e4d0a74a0 100644
--- a/app/src/include/firebase/internal/future_impl.h
+++ b/app/src/include/firebase/internal/future_impl.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_INTERNAL_FUTURE_IMPL_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_INTERNAL_FUTURE_IMPL_H_
+#ifndef FIREBASE_APP_SRC_INCLUDE_FIREBASE_INTERNAL_FUTURE_IMPL_H_
+#define FIREBASE_APP_SRC_INCLUDE_FIREBASE_INTERNAL_FUTURE_IMPL_H_
 
 /// @cond FIREBASE_APP_INTERNAL
 
@@ -321,4 +321,4 @@ inline FutureBase::CompletionCallbackHandle FutureBase::AddOnCompletion(
 
 /// @endcond
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_INTERNAL_FUTURE_IMPL_H_
+#endif  // FIREBASE_APP_SRC_INCLUDE_FIREBASE_INTERNAL_FUTURE_IMPL_H_
diff --git a/app/src/include/firebase/internal/platform.h b/app/src/include/firebase/internal/platform.h
index 37fdba5caa..17d64e32d0 100644
--- a/app/src/include/firebase/internal/platform.h
+++ b/app/src/include/firebase/internal/platform.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_INTERNAL_PLATFORM_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_INTERNAL_PLATFORM_H_
+#ifndef FIREBASE_APP_SRC_INCLUDE_FIREBASE_INTERNAL_PLATFORM_H_
+#define FIREBASE_APP_SRC_INCLUDE_FIREBASE_INTERNAL_PLATFORM_H_
 
 // This header serts exactly one of these FIREBASE_PLATFORM macros to 1, and the
 // rest to 0:
@@ -107,4 +107,4 @@
   (FIREBASE_PLATFORM_LINUX || FIREBASE_PLATFORM_WINDOWS || \
    FIREBASE_PLATFORM_OSX)
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_INTERNAL_PLATFORM_H_
+#endif  // FIREBASE_APP_SRC_INCLUDE_FIREBASE_INTERNAL_PLATFORM_H_
diff --git a/app/src/include/firebase/internal/type_traits.h b/app/src/include/firebase/internal/type_traits.h
index c985379b08..7c465ea27c 100644
--- a/app/src/include/firebase/internal/type_traits.h
+++ b/app/src/include/firebase/internal/type_traits.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_INTERNAL_TYPE_TRAITS_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_INTERNAL_TYPE_TRAITS_H_
+#ifndef FIREBASE_APP_SRC_INCLUDE_FIREBASE_INTERNAL_TYPE_TRAITS_H_
+#define FIREBASE_APP_SRC_INCLUDE_FIREBASE_INTERNAL_TYPE_TRAITS_H_
 
 #include <cstdlib>
 #include <type_traits>
@@ -131,4 +131,4 @@ struct is_integer {
 
 #endif  // DOXYGEN
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_INTERNAL_TYPE_TRAITS_H_
+#endif  // FIREBASE_APP_SRC_INCLUDE_FIREBASE_INTERNAL_TYPE_TRAITS_H_
diff --git a/app/src/include/firebase/log.h b/app/src/include/firebase/log.h
index 831e348fda..3d36ce37dc 100644
--- a/app/src/include/firebase/log.h
+++ b/app/src/include/firebase/log.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_LOG_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_LOG_H_
+#ifndef FIREBASE_APP_SRC_INCLUDE_FIREBASE_LOG_H_
+#define FIREBASE_APP_SRC_INCLUDE_FIREBASE_LOG_H_
 
 /// @brief Namespace that encompasses all Firebase APIs.
 namespace firebase {
@@ -51,4 +51,4 @@ LogLevel GetLogLevel();
 // NOLINTNEXTLINE - allow namespace overridden
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_LOG_H_
+#endif  // FIREBASE_APP_SRC_INCLUDE_FIREBASE_LOG_H_
diff --git a/app/src/include/firebase/util.h b/app/src/include/firebase/util.h
index 6fdac9138f..4c78d45f3a 100644
--- a/app/src/include/firebase/util.h
+++ b/app/src/include/firebase/util.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_UTIL_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_UTIL_H_
+#ifndef FIREBASE_APP_SRC_INCLUDE_FIREBASE_UTIL_H_
+#define FIREBASE_APP_SRC_INCLUDE_FIREBASE_UTIL_H_
 
 #include "firebase/app.h"
 #include "firebase/future.h"
@@ -98,4 +98,4 @@ class ModuleInitializer {
 // NOLINTNEXTLINE - allow namespace overridden
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_UTIL_H_
+#endif  // FIREBASE_APP_SRC_INCLUDE_FIREBASE_UTIL_H_
diff --git a/app/src/include/firebase/variant.h b/app/src/include/firebase/variant.h
index e7e8d08ead..ef1d552dff 100644
--- a/app/src/include/firebase/variant.h
+++ b/app/src/include/firebase/variant.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_VARIANT_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_VARIANT_H_
+#ifndef FIREBASE_APP_SRC_INCLUDE_FIREBASE_VARIANT_H_
+#define FIREBASE_APP_SRC_INCLUDE_FIREBASE_VARIANT_H_
 
 #include <stdint.h>
 
@@ -1194,4 +1194,4 @@ inline void Variant::set_value_t<char*>(char* value) {
 // NOLINTNEXTLINE - allow namespace overridden
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_FIREBASE_VARIANT_H_
+#endif  // FIREBASE_APP_SRC_INCLUDE_FIREBASE_VARIANT_H_
diff --git a/app/src/include/google_play_services/availability.h b/app/src/include/google_play_services/availability.h
index 570943bece..2625abec79 100644
--- a/app/src/include/google_play_services/availability.h
+++ b/app/src/include/google_play_services/availability.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_GOOGLE_PLAY_SERVICES_AVAILABILITY_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_GOOGLE_PLAY_SERVICES_AVAILABILITY_H_
+#ifndef FIREBASE_APP_SRC_INCLUDE_GOOGLE_PLAY_SERVICES_AVAILABILITY_H_
+#define FIREBASE_APP_SRC_INCLUDE_GOOGLE_PLAY_SERVICES_AVAILABILITY_H_
 
 #if defined(__ANDROID__) || defined(DOXYGEN)
 
@@ -90,4 +90,4 @@ ::firebase::Future<void> MakeAvailableLastResult();
 
 #endif  // defined(__ANDROID__) || defined(DOXYGEN)
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_GOOGLE_PLAY_SERVICES_AVAILABILITY_H_
+#endif  // FIREBASE_APP_SRC_INCLUDE_GOOGLE_PLAY_SERVICES_AVAILABILITY_H_
diff --git a/app/src/intrusive_list.h b/app/src/intrusive_list.h
index 2b05554be2..e600d9c937 100644
--- a/app/src/intrusive_list.h
+++ b/app/src/intrusive_list.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_INTRUSIVE_LIST_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_INTRUSIVE_LIST_H_
+#ifndef FIREBASE_APP_SRC_INTRUSIVE_LIST_H_
+#define FIREBASE_APP_SRC_INTRUSIVE_LIST_H_
 
 // This code is essentially a copy of
 // https://github.com/google/fplutil/blob/master/libfplutil/include/fplutil/intrusive_list.h
@@ -674,4 +674,4 @@ class intrusive_list {
 #pragma warning(pop)
 #endif  // defined(_MSC_VER)
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_INTRUSIVE_LIST_H_
+#endif  // FIREBASE_APP_SRC_INTRUSIVE_LIST_H_
diff --git a/app/src/invites/android/invites_android_helper.h b/app/src/invites/android/invites_android_helper.h
index 887767be6c..707b63764b 100644
--- a/app/src/invites/android/invites_android_helper.h
+++ b/app/src/invites/android/invites_android_helper.h
@@ -16,8 +16,8 @@
 
 // Internal header file for shared Android functionality.
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_INVITES_ANDROID_INVITES_ANDROID_HELPER_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_INVITES_ANDROID_INVITES_ANDROID_HELPER_H_
+#ifndef FIREBASE_APP_SRC_INVITES_ANDROID_INVITES_ANDROID_HELPER_H_
+#define FIREBASE_APP_SRC_INVITES_ANDROID_INVITES_ANDROID_HELPER_H_
 
 #include <jni.h>
 
@@ -97,4 +97,4 @@ class AndroidHelper {
 }  // namespace invites
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_INVITES_ANDROID_INVITES_ANDROID_HELPER_H_
+#endif  // FIREBASE_APP_SRC_INVITES_ANDROID_INVITES_ANDROID_HELPER_H_
diff --git a/app/src/invites/android/invites_receiver_internal_android.h b/app/src/invites/android/invites_receiver_internal_android.h
index 6532f11c52..2a31652dac 100644
--- a/app/src/invites/android/invites_receiver_internal_android.h
+++ b/app/src/invites/android/invites_receiver_internal_android.h
@@ -16,8 +16,8 @@
 
 // Internal header file for Android Firebase invites sending functionality.
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_INVITES_ANDROID_INVITES_RECEIVER_INTERNAL_ANDROID_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_INVITES_ANDROID_INVITES_RECEIVER_INTERNAL_ANDROID_H_
+#ifndef FIREBASE_APP_SRC_INVITES_ANDROID_INVITES_RECEIVER_INTERNAL_ANDROID_H_
+#define FIREBASE_APP_SRC_INVITES_ANDROID_INVITES_RECEIVER_INTERNAL_ANDROID_H_
 
 #include <jni.h>
 
@@ -47,4 +47,4 @@ class InvitesReceiverInternalAndroid : public InvitesReceiverInternal {
 }  // namespace invites
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_INVITES_ANDROID_INVITES_RECEIVER_INTERNAL_ANDROID_H_
+#endif  // FIREBASE_APP_SRC_INVITES_ANDROID_INVITES_RECEIVER_INTERNAL_ANDROID_H_
diff --git a/app/src/invites/cached_receiver.h b/app/src/invites/cached_receiver.h
index 6216a0ff8f..2519af1223 100644
--- a/app/src/invites/cached_receiver.h
+++ b/app/src/invites/cached_receiver.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_INVITES_CACHED_RECEIVER_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_INVITES_CACHED_RECEIVER_H_
+#ifndef FIREBASE_APP_SRC_INVITES_CACHED_RECEIVER_H_
+#define FIREBASE_APP_SRC_INVITES_CACHED_RECEIVER_H_
 
 #include <string>
 
@@ -83,4 +83,4 @@ class CachedReceiver : public ReceiverInterface {
 }  // namespace invites
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_INVITES_CACHED_RECEIVER_H_
+#endif  // FIREBASE_APP_SRC_INVITES_CACHED_RECEIVER_H_
diff --git a/app/src/invites/invites_receiver_internal.h b/app/src/invites/invites_receiver_internal.h
index 8f6fc4d555..e9a3c754ba 100644
--- a/app/src/invites/invites_receiver_internal.h
+++ b/app/src/invites/invites_receiver_internal.h
@@ -16,8 +16,8 @@
 
 // Internal header file for Android InvitesReceiver functionality.
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_INVITES_INVITES_RECEIVER_INTERNAL_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_INVITES_INVITES_RECEIVER_INTERNAL_H_
+#ifndef FIREBASE_APP_SRC_INVITES_INVITES_RECEIVER_INTERNAL_H_
+#define FIREBASE_APP_SRC_INVITES_INVITES_RECEIVER_INTERNAL_H_
 
 #include <string>
 
@@ -151,4 +151,4 @@ class InvitesReceiverInternal : public SenderReceiverInterface {
 }  // namespace invites
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_INVITES_INVITES_RECEIVER_INTERNAL_H_
+#endif  // FIREBASE_APP_SRC_INVITES_INVITES_RECEIVER_INTERNAL_H_
diff --git a/app/src/invites/ios/invites_ios_startup.h b/app/src/invites/ios/invites_ios_startup.h
index 1be2dccae6..eff85b3980 100644
--- a/app/src/invites/ios/invites_ios_startup.h
+++ b/app/src/invites/ios/invites_ios_startup.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_INVITES_CLIENT_CPP_SRC_IOS_INVITES_IOS_STARTUP_H_
-#define FIREBASE_INVITES_CLIENT_CPP_SRC_IOS_INVITES_IOS_STARTUP_H_
+#ifndef FIREBASE_APP_SRC_INVITES_IOS_INVITES_IOS_STARTUP_H_
+#define FIREBASE_APP_SRC_INVITES_IOS_INVITES_IOS_STARTUP_H_
 
 #include <vector>
 
@@ -101,4 +101,4 @@ class InvitesIosStartup {
 }  // namespace invites
 }  // namespace firebase
 
-#endif  // FIREBASE_INVITES_CLIENT_CPP_SRC_IOS_INVITES_IOS_STARTUP_H_
+#endif  // FIREBASE_APP_SRC_INVITES_IOS_INVITES_IOS_STARTUP_H_
diff --git a/app/src/invites/ios/invites_receiver_internal_ios.h b/app/src/invites/ios/invites_receiver_internal_ios.h
index 336e9b387e..a1f825a213 100644
--- a/app/src/invites/ios/invites_receiver_internal_ios.h
+++ b/app/src/invites/ios/invites_receiver_internal_ios.h
@@ -16,8 +16,8 @@
 
 // Internal header file for iOS Firebase invites sending functionality.
 
-#ifndef FIREBASE_INVITES_CLIENT_CPP_SRC_IOS_INVITES_RECEIVER_INTERNAL_IOS_H_
-#define FIREBASE_INVITES_CLIENT_CPP_SRC_IOS_INVITES_RECEIVER_INTERNAL_IOS_H_
+#ifndef FIREBASE_APP_SRC_INVITES_IOS_INVITES_RECEIVER_INTERNAL_IOS_H_
+#define FIREBASE_APP_SRC_INVITES_IOS_INVITES_RECEIVER_INTERNAL_IOS_H_
 
 #include <string>
 
@@ -148,4 +148,4 @@ class InvitesReceiverInternalIos : public InvitesReceiverInternal {
 }  // namespace invites
 }  // namespace firebase
 
-#endif  // FIREBASE_INVITES_CLIENT_CPP_SRC_IOS_INVITES_RECEIVER_INTERNAL_IOS_H_
+#endif  // FIREBASE_APP_SRC_INVITES_IOS_INVITES_RECEIVER_INTERNAL_IOS_H_
diff --git a/app/src/invites/receiver_interface.h b/app/src/invites/receiver_interface.h
index ef159ac2e9..da070ab239 100644
--- a/app/src/invites/receiver_interface.h
+++ b/app/src/invites/receiver_interface.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_INVITES_RECEIVER_INTERFACE_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_INVITES_RECEIVER_INTERFACE_H_
+#ifndef FIREBASE_APP_SRC_INVITES_RECEIVER_INTERFACE_H_
+#define FIREBASE_APP_SRC_INVITES_RECEIVER_INTERFACE_H_
 
 #include <string>
 
@@ -65,4 +65,4 @@ class ReceiverInterface {
 }  // namespace invites
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_INVITES_RECEIVER_INTERFACE_H_
+#endif  // FIREBASE_APP_SRC_INVITES_RECEIVER_INTERFACE_H_
diff --git a/app/src/invites/sender_receiver_interface.h b/app/src/invites/sender_receiver_interface.h
index 4dde68fa1a..ea83faa16e 100644
--- a/app/src/invites/sender_receiver_interface.h
+++ b/app/src/invites/sender_receiver_interface.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_INVITES_SENDER_RECEIVER_INTERFACE_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_INVITES_SENDER_RECEIVER_INTERFACE_H_
+#ifndef FIREBASE_APP_SRC_INVITES_SENDER_RECEIVER_INTERFACE_H_
+#define FIREBASE_APP_SRC_INVITES_SENDER_RECEIVER_INTERFACE_H_
 
 #include <string>
 #include <vector>
@@ -52,4 +52,4 @@ class SenderReceiverInterface : public ReceiverInterface {
 }  // namespace invites
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_INVITES_SENDER_RECEIVER_INTERFACE_H_
+#endif  // FIREBASE_APP_SRC_INVITES_SENDER_RECEIVER_INTERFACE_H_
diff --git a/app/src/invites/stub/invites_receiver_internal_stub.h b/app/src/invites/stub/invites_receiver_internal_stub.h
index a2f592a0a2..763139c105 100644
--- a/app/src/invites/stub/invites_receiver_internal_stub.h
+++ b/app/src/invites/stub/invites_receiver_internal_stub.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_INVITES_STUB_INVITES_RECEIVER_INTERNAL_STUB_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_INVITES_STUB_INVITES_RECEIVER_INTERNAL_STUB_H_
+#ifndef FIREBASE_APP_SRC_INVITES_STUB_INVITES_RECEIVER_INTERNAL_STUB_H_
+#define FIREBASE_APP_SRC_INVITES_STUB_INVITES_RECEIVER_INTERNAL_STUB_H_
 
 #include "app/src/invites/invites_receiver_internal.h"
 
@@ -40,4 +40,4 @@ class InvitesReceiverInternalStub : public InvitesReceiverInternal {
 }  // namespace invites
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_INVITES_STUB_INVITES_RECEIVER_INTERNAL_STUB_H_
+#endif  // FIREBASE_APP_SRC_INVITES_STUB_INVITES_RECEIVER_INTERNAL_STUB_H_
diff --git a/app/src/jobject_reference.h b/app/src/jobject_reference.h
index d895d626df..63ea63ca62 100644
--- a/app/src/jobject_reference.h
+++ b/app/src/jobject_reference.h
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_JOBJECT_REFERENCE_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_JOBJECT_REFERENCE_H_
+#ifndef FIREBASE_APP_SRC_JOBJECT_REFERENCE_H_
+#define FIREBASE_APP_SRC_JOBJECT_REFERENCE_H_
 
 #include <jni.h>
 
@@ -113,4 +113,4 @@ class JObjectReference {
 }  // namespace internal
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_JOBJECT_REFERENCE_H_
+#endif  // FIREBASE_APP_SRC_JOBJECT_REFERENCE_H_
diff --git a/app/src/locale.h b/app/src/locale.h
index d3d0467cb9..bf904f4278 100644
--- a/app/src/locale.h
+++ b/app/src/locale.h
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_LOCALE_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_LOCALE_H_
+#ifndef FIREBASE_APP_SRC_LOCALE_H_
+#define FIREBASE_APP_SRC_LOCALE_H_
 
 #include <string>
 
@@ -33,4 +33,4 @@ std::string GetTimezone();
 }  // namespace internal
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_LOCALE_H_
+#endif  // FIREBASE_APP_SRC_LOCALE_H_
diff --git a/app/src/log.h b/app/src/log.h
index 4b799db03f..ba499b53ce 100644
--- a/app/src/log.h
+++ b/app/src/log.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_LOG_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_LOG_H_
+#ifndef FIREBASE_APP_SRC_LOG_H_
+#define FIREBASE_APP_SRC_LOG_H_
 
 #include <stdarg.h>
 
@@ -71,4 +71,4 @@ void LogInitialize();
 // NOLINTNEXTLINE - allow namespace overridden
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_LOG_H_
+#endif  // FIREBASE_APP_SRC_LOG_H_
diff --git a/app/src/logger.h b/app/src/logger.h
index a2952146d4..44865748ad 100644
--- a/app/src/logger.h
+++ b/app/src/logger.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_LOGGER_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_LOGGER_H_
+#ifndef FIREBASE_APP_SRC_LOGGER_H_
+#define FIREBASE_APP_SRC_LOGGER_H_
 
 #include <stdarg.h>
 
@@ -120,4 +120,4 @@ class Logger : public LoggerBase {
 
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_LOGGER_H_
+#endif  // FIREBASE_APP_SRC_LOGGER_H_
diff --git a/app/src/mutex.h b/app/src/mutex.h
index fb65dbbee9..9a3624d7c8 100644
--- a/app/src/mutex.h
+++ b/app/src/mutex.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_MUTEX_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_MUTEX_H_
+#ifndef FIREBASE_APP_SRC_MUTEX_H_
+#define FIREBASE_APP_SRC_MUTEX_H_
 #include <errno.h>
 
 #include "app/src/include/firebase/internal/platform.h"
@@ -161,4 +161,4 @@ class MutexLock {
 // NOLINTNEXTLINE - allow namespace overridden
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_MUTEX_H_
+#endif  // FIREBASE_APP_SRC_MUTEX_H_
diff --git a/app/src/optional.h b/app/src/optional.h
index 5d4865ac96..21753d83bf 100644
--- a/app/src/optional.h
+++ b/app/src/optional.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_OPTIONAL_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_OPTIONAL_H_
+#ifndef FIREBASE_APP_SRC_OPTIONAL_H_
+#define FIREBASE_APP_SRC_OPTIONAL_H_
 
 #include <cassert>
 #include <cstdint>
@@ -209,4 +209,4 @@ bool operator!=(const Optional<T>& lhs, const Optional<T>& rhs) {
 
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_OPTIONAL_H_
+#endif  // FIREBASE_APP_SRC_OPTIONAL_H_
diff --git a/app/src/path.h b/app/src/path.h
index 26e0d1197b..f321afc0a8 100644
--- a/app/src/path.h
+++ b/app/src/path.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_PATH_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_PATH_H_
+#ifndef FIREBASE_APP_SRC_PATH_H_
+#define FIREBASE_APP_SRC_PATH_H_
 
 #include <string>
 #include <vector>
@@ -127,4 +127,4 @@ class Path {
 
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_PATH_H_
+#endif  // FIREBASE_APP_SRC_PATH_H_
diff --git a/app/src/pthread_condvar.h b/app/src/pthread_condvar.h
index c465169041..b265500c14 100644
--- a/app/src/pthread_condvar.h
+++ b/app/src/pthread_condvar.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_PTHREAD_CONDVAR_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_PTHREAD_CONDVAR_H_
+#ifndef FIREBASE_APP_SRC_PTHREAD_CONDVAR_H_
+#define FIREBASE_APP_SRC_PTHREAD_CONDVAR_H_
 
 #include "app/src/include/firebase/internal/platform.h"
 
@@ -89,4 +89,4 @@ class ConditionVariable {
 
 #endif  // !FIREBASE_PLATFORM_WINDOWS
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_PTHREAD_CONDVAR_H_
+#endif  // FIREBASE_APP_SRC_PTHREAD_CONDVAR_H_
diff --git a/app/src/reference_count.h b/app/src/reference_count.h
index 1424295d3e..adc98ce916 100644
--- a/app/src/reference_count.h
+++ b/app/src/reference_count.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_REFERENCE_COUNT_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_REFERENCE_COUNT_H_
+#ifndef FIREBASE_APP_SRC_REFERENCE_COUNT_H_
+#define FIREBASE_APP_SRC_REFERENCE_COUNT_H_
 
 #include "app/src/mutex.h"
 
@@ -254,4 +254,4 @@ class ReferenceCountedInitializer {
 }  // namespace internal
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_REFERENCE_COUNT_H_
+#endif  // FIREBASE_APP_SRC_REFERENCE_COUNT_H_
diff --git a/app/src/reference_counted_future_impl.h b/app/src/reference_counted_future_impl.h
index 969c4a16e4..0517f6c084 100644
--- a/app/src/reference_counted_future_impl.h
+++ b/app/src/reference_counted_future_impl.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_REFERENCE_COUNTED_FUTURE_IMPL_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_REFERENCE_COUNTED_FUTURE_IMPL_H_
+#ifndef FIREBASE_APP_SRC_REFERENCE_COUNTED_FUTURE_IMPL_H_
+#define FIREBASE_APP_SRC_REFERENCE_COUNTED_FUTURE_IMPL_H_
 
 #include <functional>
 #include <map>
@@ -619,4 +619,4 @@ Future<T> MakeFuture(ReferenceCountedFutureImpl* api,
 // NOLINTNEXTLINE - allow namespace overridden
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_REFERENCE_COUNTED_FUTURE_IMPL_H_
+#endif  // FIREBASE_APP_SRC_REFERENCE_COUNTED_FUTURE_IMPL_H_
diff --git a/app/src/safe_reference.h b/app/src/safe_reference.h
index b8d734e846..485e90a03a 100644
--- a/app/src/safe_reference.h
+++ b/app/src/safe_reference.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_SAFE_REFERENCE_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_SAFE_REFERENCE_H_
+#ifndef FIREBASE_APP_SRC_SAFE_REFERENCE_H_
+#define FIREBASE_APP_SRC_SAFE_REFERENCE_H_
 
 #include "app/memory/shared_ptr.h"
 #include "app/src/mutex.h"
@@ -82,4 +82,4 @@ class SafeReferenceLock {
 }  // namespace internal
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_SAFE_REFERENCE_H_
+#endif  // FIREBASE_APP_SRC_SAFE_REFERENCE_H_
diff --git a/app/src/scheduler.h b/app/src/scheduler.h
index 90977e88ba..6fd11e984a 100644
--- a/app/src/scheduler.h
+++ b/app/src/scheduler.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_SCHEDULER_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_SCHEDULER_H_
+#ifndef FIREBASE_APP_SRC_SCHEDULER_H_
+#define FIREBASE_APP_SRC_SCHEDULER_H_
 
 #include <queue>
 
@@ -212,4 +212,4 @@ class Scheduler {
 // NOLINTNEXTLINE - allow namespace overridden
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_SCHEDULER_H_
+#endif  // FIREBASE_APP_SRC_SCHEDULER_H_
diff --git a/app/src/secure/user_secure_darwin_internal.h b/app/src/secure/user_secure_darwin_internal.h
index 2c0d910be9..5a9623954d 100644
--- a/app/src/secure/user_secure_darwin_internal.h
+++ b/app/src/secure/user_secure_darwin_internal.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_SECURE_USER_SECURE_DARWIN_INTERNAL_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_SECURE_USER_SECURE_DARWIN_INTERNAL_H_
+#ifndef FIREBASE_APP_SRC_SECURE_USER_SECURE_DARWIN_INTERNAL_H_
+#define FIREBASE_APP_SRC_SECURE_USER_SECURE_DARWIN_INTERNAL_H_
 
 #include <string>
 
@@ -64,4 +64,4 @@ class UserSecureDarwinInternal : public UserSecureInternal {
 }  // namespace app
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_SECURE_USER_SECURE_DARWIN_INTERNAL_H_
+#endif  // FIREBASE_APP_SRC_SECURE_USER_SECURE_DARWIN_INTERNAL_H_
diff --git a/app/src/secure/user_secure_darwin_internal_testlib.h b/app/src/secure/user_secure_darwin_internal_testlib.h
index ff103d0b3c..22c7ce8fa3 100644
--- a/app/src/secure/user_secure_darwin_internal_testlib.h
+++ b/app/src/secure/user_secure_darwin_internal_testlib.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_SECURE_USER_SECURE_DARWIN_INTERNAL_TESTLIB_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_SECURE_USER_SECURE_DARWIN_INTERNAL_TESTLIB_H_
+#ifndef FIREBASE_APP_SRC_SECURE_USER_SECURE_DARWIN_INTERNAL_TESTLIB_H_
+#define FIREBASE_APP_SRC_SECURE_USER_SECURE_DARWIN_INTERNAL_TESTLIB_H_
 
 #include <string>
 
@@ -36,4 +36,4 @@ class UserSecureDarwinTestHelper {
 }  // namespace app
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_SECURE_USER_SECURE_DARWIN_INTERNAL_TESTLIB_H_
+#endif  // FIREBASE_APP_SRC_SECURE_USER_SECURE_DARWIN_INTERNAL_TESTLIB_H_
diff --git a/app/src/secure/user_secure_data_handle.h b/app/src/secure/user_secure_data_handle.h
index 1eab23b6bb..e621c1bfcd 100644
--- a/app/src/secure/user_secure_data_handle.h
+++ b/app/src/secure/user_secure_data_handle.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_SECURE_USER_SECURE_DATA_HANDLE_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_SECURE_USER_SECURE_DATA_HANDLE_H_
+#ifndef FIREBASE_APP_SRC_SECURE_USER_SECURE_DATA_HANDLE_H_
+#define FIREBASE_APP_SRC_SECURE_USER_SECURE_DATA_HANDLE_H_
 
 #include <string>
 
@@ -57,4 +57,4 @@ struct UserSecureDataHandle {
 }  // namespace app
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_SECURE_USER_SECURE_DATA_HANDLE_H_
+#endif  // FIREBASE_APP_SRC_SECURE_USER_SECURE_DATA_HANDLE_H_
diff --git a/app/src/secure/user_secure_fake_internal.h b/app/src/secure/user_secure_fake_internal.h
index 400af6065e..a8ed423944 100644
--- a/app/src/secure/user_secure_fake_internal.h
+++ b/app/src/secure/user_secure_fake_internal.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_SECURE_USER_SECURE_FAKE_INTERNAL_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_SECURE_USER_SECURE_FAKE_INTERNAL_H_
+#ifndef FIREBASE_APP_SRC_SECURE_USER_SECURE_FAKE_INTERNAL_H_
+#define FIREBASE_APP_SRC_SECURE_USER_SECURE_FAKE_INTERNAL_H_
 
 #include <string>
 
@@ -50,4 +50,4 @@ class UserSecureFakeInternal : public UserSecureInternal {
 }  // namespace app
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_SECURE_USER_SECURE_FAKE_INTERNAL_H_
+#endif  // FIREBASE_APP_SRC_SECURE_USER_SECURE_FAKE_INTERNAL_H_
diff --git a/app/src/secure/user_secure_internal.h b/app/src/secure/user_secure_internal.h
index ade8337c6f..db526e1054 100644
--- a/app/src/secure/user_secure_internal.h
+++ b/app/src/secure/user_secure_internal.h
@@ -13,8 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_SECURE_USER_SECURE_INTERNAL_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_SECURE_USER_SECURE_INTERNAL_H_
+#ifndef FIREBASE_APP_SRC_SECURE_USER_SECURE_INTERNAL_H_
+#define FIREBASE_APP_SRC_SECURE_USER_SECURE_INTERNAL_H_
 
 #include <string>
 
@@ -50,4 +50,4 @@ class UserSecureInternal {
 }  // namespace app
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_SECURE_USER_SECURE_INTERNAL_H_
+#endif  // FIREBASE_APP_SRC_SECURE_USER_SECURE_INTERNAL_H_
diff --git a/app/src/secure/user_secure_linux_internal.h b/app/src/secure/user_secure_linux_internal.h
index 9acb7fd278..4f7b2f67f8 100644
--- a/app/src/secure/user_secure_linux_internal.h
+++ b/app/src/secure/user_secure_linux_internal.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_SECURE_USER_SECURE_LINUX_INTERNAL_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_SECURE_USER_SECURE_LINUX_INTERNAL_H_
+#ifndef FIREBASE_APP_SRC_SECURE_USER_SECURE_LINUX_INTERNAL_H_
+#define FIREBASE_APP_SRC_SECURE_USER_SECURE_LINUX_INTERNAL_H_
 
 #include <string>
 
@@ -60,4 +60,4 @@ class UserSecureLinuxInternal : public UserSecureInternal {
 }  // namespace app
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_SECURE_USER_SECURE_LINUX_INTERNAL_H_
+#endif  // FIREBASE_APP_SRC_SECURE_USER_SECURE_LINUX_INTERNAL_H_
diff --git a/app/src/secure/user_secure_manager.h b/app/src/secure/user_secure_manager.h
index 74d7737b9b..015b3a39da 100644
--- a/app/src/secure/user_secure_manager.h
+++ b/app/src/secure/user_secure_manager.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_SECURE_USER_SECURE_MANAGER_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_SECURE_USER_SECURE_MANAGER_H_
+#ifndef FIREBASE_APP_SRC_SECURE_USER_SECURE_MANAGER_H_
+#define FIREBASE_APP_SRC_SECURE_USER_SECURE_MANAGER_H_
 
 #include <string>
 
@@ -94,4 +94,4 @@ class UserSecureManager {
 }  // namespace app
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_SECURE_USER_SECURE_MANAGER_H_
+#endif  // FIREBASE_APP_SRC_SECURE_USER_SECURE_MANAGER_H_
diff --git a/app/src/secure/user_secure_manager_fake.h b/app/src/secure/user_secure_manager_fake.h
index b02f795300..12fc437c97 100644
--- a/app/src/secure/user_secure_manager_fake.h
+++ b/app/src/secure/user_secure_manager_fake.h
@@ -13,8 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_SECURE_USER_SECURE_MANAGER_FAKE_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_SECURE_USER_SECURE_MANAGER_FAKE_H_
+#ifndef FIREBASE_APP_SRC_SECURE_USER_SECURE_MANAGER_FAKE_H_
+#define FIREBASE_APP_SRC_SECURE_USER_SECURE_MANAGER_FAKE_H_
 
 #include "app/src/secure/user_secure_manager.h"
 
@@ -32,4 +32,4 @@ class UserSecureManagerFake : public UserSecureManager {
 }  // namespace app
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_SECURE_USER_SECURE_MANAGER_FAKE_H_
+#endif  // FIREBASE_APP_SRC_SECURE_USER_SECURE_MANAGER_FAKE_H_
diff --git a/app/src/secure/user_secure_windows_internal.h b/app/src/secure/user_secure_windows_internal.h
index 89d7b93d36..fe3abbdde6 100644
--- a/app/src/secure/user_secure_windows_internal.h
+++ b/app/src/secure/user_secure_windows_internal.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_SECURE_USER_SECURE_WINDOWS_INTERNAL_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_SECURE_USER_SECURE_WINDOWS_INTERNAL_H_
+#ifndef FIREBASE_APP_SRC_SECURE_USER_SECURE_WINDOWS_INTERNAL_H_
+#define FIREBASE_APP_SRC_SECURE_USER_SECURE_WINDOWS_INTERNAL_H_
 
 #include <string>
 
@@ -53,4 +53,4 @@ class UserSecureWindowsInternal : public UserSecureInternal {
 }  // namespace app
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_SECURE_USER_SECURE_WINDOWS_INTERNAL_H_
+#endif  // FIREBASE_APP_SRC_SECURE_USER_SECURE_WINDOWS_INTERNAL_H_
diff --git a/app/src/semaphore.h b/app/src/semaphore.h
index 186942a8ac..67f37c8c47 100644
--- a/app/src/semaphore.h
+++ b/app/src/semaphore.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_SEMAPHORE_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_SEMAPHORE_H_
+#ifndef FIREBASE_APP_SRC_SEMAPHORE_H_
+#define FIREBASE_APP_SRC_SEMAPHORE_H_
 
 #include <errno.h>
 
@@ -197,4 +197,4 @@ class Semaphore {
 // NOLINTNEXTLINE - allow namespace overridden
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_SEMAPHORE_H_
+#endif  // FIREBASE_APP_SRC_SEMAPHORE_H_
diff --git a/app/src/thread.h b/app/src/thread.h
index 30191e8e9f..5a7c1ad661 100644
--- a/app/src/thread.h
+++ b/app/src/thread.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_THREAD_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_THREAD_H_
+#ifndef FIREBASE_APP_SRC_THREAD_H_
+#define FIREBASE_APP_SRC_THREAD_H_
 
 #include <utility>
 
@@ -152,4 +152,4 @@ Thread::Thread(Thread::OneArgRoutine<T> start_routine, T* arg)
 // NOLINTNEXTLINE - allow namespace overridden
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_THREAD_H_
+#endif  // FIREBASE_APP_SRC_THREAD_H_
diff --git a/app/src/time.h b/app/src/time.h
index 96607b31ea..c52bd2ad67 100644
--- a/app/src/time.h
+++ b/app/src/time.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_TIME_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_TIME_H_
+#ifndef FIREBASE_APP_SRC_TIME_H_
+#define FIREBASE_APP_SRC_TIME_H_
 #include <cassert>
 #include <cstdint>
 
@@ -237,4 +237,4 @@ class Timer {
 // NOLINTNEXTLINE - allow namespace overridden
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_TIME_H_
+#endif  // FIREBASE_APP_SRC_TIME_H_
diff --git a/app/src/util.h b/app/src/util.h
index 53f2e7e4f4..c1526b6772 100644
--- a/app/src/util.h
+++ b/app/src/util.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_UTIL_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_UTIL_H_
+#ifndef FIREBASE_APP_SRC_UTIL_H_
+#define FIREBASE_APP_SRC_UTIL_H_
 
 #include <map>
 #include <string>
@@ -237,4 +237,4 @@ std::vector<std::string> SplitString(const std::string& s, char delimiter);
 // NOLINTNEXTLINE - allow namespace overridden
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_UTIL_H_
+#endif  // FIREBASE_APP_SRC_UTIL_H_
diff --git a/app/src/util_android.h b/app/src/util_android.h
index af90d57bb3..8df7d8f9b5 100644
--- a/app/src/util_android.h
+++ b/app/src/util_android.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_UTIL_ANDROID_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_UTIL_ANDROID_H_
+#ifndef FIREBASE_APP_SRC_UTIL_ANDROID_H_
+#define FIREBASE_APP_SRC_UTIL_ANDROID_H_
 
 #include <jni.h>
 #include <stddef.h>
@@ -1112,4 +1112,4 @@ JNIEnv* GetJNIEnvFromApp();
 // NOLINTNEXTLINE - allow namespace overridden
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_UTIL_ANDROID_H_
+#endif  // FIREBASE_APP_SRC_UTIL_ANDROID_H_
diff --git a/app/src/util_ios.h b/app/src/util_ios.h
index 303e29c89e..00d8161934 100644
--- a/app/src/util_ios.h
+++ b/app/src/util_ios.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_UTIL_IOS_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_UTIL_IOS_H_
+#ifndef FIREBASE_APP_SRC_UTIL_IOS_H_
+#define FIREBASE_APP_SRC_UTIL_IOS_H_
 
 #ifdef __OBJC__
 
@@ -337,4 +337,4 @@ NS_ASSUME_NONNULL_END
 #define OBJ_C_PTR_WRAPPER(objc_type_name) \
   OBJ_C_PTR_WRAPPER_NAMED(objc_type_name##Pointer, objc_type_name)
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_UTIL_IOS_H_
+#endif  // FIREBASE_APP_SRC_UTIL_IOS_H_
diff --git a/app/src/uuid.h b/app/src/uuid.h
index 674784ed6e..c2935ee7fb 100644
--- a/app/src/uuid.h
+++ b/app/src/uuid.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_UUID_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_UUID_H_
+#ifndef FIREBASE_APP_SRC_UUID_H_
+#define FIREBASE_APP_SRC_UUID_H_
 
 #include <stdint.h>
 
@@ -33,4 +33,4 @@ struct Uuid {
 }  // namespace internal
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_UUID_H_
+#endif  // FIREBASE_APP_SRC_UUID_H_
diff --git a/app/src/variant_util.h b/app/src/variant_util.h
index 121a35cbb1..ddf591cc5d 100644
--- a/app/src/variant_util.h
+++ b/app/src/variant_util.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_SRC_VARIANT_UTIL_H_
-#define FIREBASE_APP_CLIENT_CPP_SRC_VARIANT_UTIL_H_
+#ifndef FIREBASE_APP_SRC_VARIANT_UTIL_H_
+#define FIREBASE_APP_SRC_VARIANT_UTIL_H_
 
 #include <string>
 
@@ -76,4 +76,4 @@ bool VariantVectorToFlexbuffer(const std::vector<Variant>& vector,
 // NOLINTNEXTLINE - allow namespace overridden
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_SRC_VARIANT_UTIL_H_
+#endif  // FIREBASE_APP_SRC_VARIANT_UTIL_H_
diff --git a/app/tests/flexbuffer_matcher.h b/app/tests/flexbuffer_matcher.h
index 40b6f8e653..d3226c5c14 100644
--- a/app/tests/flexbuffer_matcher.h
+++ b/app/tests/flexbuffer_matcher.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_APP_CLIENT_CPP_TESTS_FLEXBUFFER_MATCHER_H_
-#define FIREBASE_APP_CLIENT_CPP_TESTS_FLEXBUFFER_MATCHER_H_
+#ifndef FIREBASE_APP_TESTS_FLEXBUFFER_MATCHER_H_
+#define FIREBASE_APP_TESTS_FLEXBUFFER_MATCHER_H_
 
 #include "flatbuffers/flexbuffers.h"
 #include "gmock/gmock.h"
@@ -53,4 +53,4 @@ MATCHER_P(EqualsFlexbuffer, expected, "") {
   return EqualsFlexbufferImpl(expected, arg, "", result_listener);
 }
 
-#endif  // FIREBASE_APP_CLIENT_CPP_TESTS_FLEXBUFFER_MATCHER_H_
+#endif  // FIREBASE_APP_TESTS_FLEXBUFFER_MATCHER_H_
diff --git a/app/tests/include/firebase/app_for_testing.h b/app/tests/include/firebase/app_for_testing.h
index bf4e301cd0..05555491aa 100644
--- a/app/tests/include/firebase/app_for_testing.h
+++ b/app/tests/include/firebase/app_for_testing.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_APP_CLIENT_CPP_TESTS_INCLUDE_FIREBASE_APP_FOR_TESTING_H_
-#define FIREBASE_APP_CLIENT_CPP_TESTS_INCLUDE_FIREBASE_APP_FOR_TESTING_H_
+#ifndef FIREBASE_APP_TESTS_INCLUDE_FIREBASE_APP_FOR_TESTING_H_
+#define FIREBASE_APP_TESTS_INCLUDE_FIREBASE_APP_FOR_TESTING_H_
 
 #include "app/src/include/firebase/app.h"
 #include "app/src/include/firebase/internal/platform.h"
@@ -56,4 +56,4 @@ static App* CreateApp() { return CreateApp(MockAppOptions()); }
 }  // namespace testing
 }  // namespace firebase
 
-#endif  // FIREBASE_APP_CLIENT_CPP_TESTS_INCLUDE_FIREBASE_APP_FOR_TESTING_H_
+#endif  // FIREBASE_APP_TESTS_INCLUDE_FIREBASE_APP_FOR_TESTING_H_
diff --git a/auth/integration_test/src/integration_test.cc b/auth/integration_test/src/integration_test.cc
index 8512ea1762..59c1b32399 100644
--- a/auth/integration_test/src/integration_test.cc
+++ b/auth/integration_test/src/integration_test.cc
@@ -395,7 +395,7 @@ TEST_F(FirebaseAuthTest, TestTokensAndAuthStateListeners) {
 
 static std::string GenerateEmailAddress() {
   char time_string[22];
-  snprintf(time_string, 22, "%d",
+  snprintf(time_string, sizeof(time_string), "%lld",
            app_framework::GetCurrentTimeInMicroseconds());
   std::string email = "random_user_";
   email.append(time_string);
diff --git a/auth/src/android/common_android.h b/auth/src/android/common_android.h
index da8c9f9aec..6cbe4ac9c0 100644
--- a/auth/src/android/common_android.h
+++ b/auth/src/android/common_android.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_ANDROID_COMMON_ANDROID_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_ANDROID_COMMON_ANDROID_H_
+#ifndef FIREBASE_AUTH_SRC_ANDROID_COMMON_ANDROID_H_
+#define FIREBASE_AUTH_SRC_ANDROID_COMMON_ANDROID_H_
 
 #include "app/src/embedded_file.h"
 #include "app/src/util_android.h"
@@ -279,4 +279,4 @@ bool CheckAndCompleteFutureOnError(JNIEnv* env,
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_ANDROID_COMMON_ANDROID_H_
+#endif  // FIREBASE_AUTH_SRC_ANDROID_COMMON_ANDROID_H_
diff --git a/auth/src/common.h b/auth/src/common.h
index 5c390e3f61..43721735a2 100644
--- a/auth/src/common.h
+++ b/auth/src/common.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_COMMON_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_COMMON_H_
+#ifndef FIREBASE_AUTH_SRC_COMMON_H_
+#define FIREBASE_AUTH_SRC_COMMON_H_
 
 #include "auth/src/data.h"
 
@@ -70,4 +70,4 @@ void CleanupCredentialFutureImpl();
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_COMMON_H_
+#endif  // FIREBASE_AUTH_SRC_COMMON_H_
diff --git a/auth/src/data.h b/auth/src/data.h
index 146b01e6ec..73480c5bc3 100644
--- a/auth/src/data.h
+++ b/auth/src/data.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DATA_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DATA_H_
+#ifndef FIREBASE_AUTH_SRC_DATA_H_
+#define FIREBASE_AUTH_SRC_DATA_H_
 
 #include <string>
 
@@ -211,4 +211,4 @@ void DestroyTokenRefresher(AuthData* auth_data);
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DATA_H_
+#endif  // FIREBASE_AUTH_SRC_DATA_H_
diff --git a/auth/src/desktop/auth_constants.h b/auth/src/desktop/auth_constants.h
index 4ff3d88f13..f1666a509b 100644
--- a/auth/src/desktop/auth_constants.h
+++ b/auth/src/desktop/auth_constants.h
@@ -13,8 +13,8 @@
 // limitations under the License.
 
 // Stores all constants of Firebase Auth desktop implementation for developers.
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_CONSTANTS_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_CONSTANTS_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_AUTH_CONSTANTS_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_AUTH_CONSTANTS_H_
 
 namespace firebase {
 namespace auth {
@@ -32,4 +32,4 @@ extern const char kGameCenterAuthProviderId[];
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_CONSTANTS_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_AUTH_CONSTANTS_H_
diff --git a/auth/src/desktop/auth_credential.h b/auth/src/desktop/auth_credential.h
index d7813c84e8..2469fc759f 100644
--- a/auth/src/desktop/auth_credential.h
+++ b/auth/src/desktop/auth_credential.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_CREDENTIAL_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_CREDENTIAL_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_AUTH_CREDENTIAL_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_AUTH_CREDENTIAL_H_
 
 #include <string>
 
@@ -39,4 +39,4 @@ class AuthCredential {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_CREDENTIAL_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_AUTH_CREDENTIAL_H_
diff --git a/auth/src/desktop/auth_data_handle.h b/auth/src/desktop/auth_data_handle.h
index a1cb79ae70..09307525f1 100644
--- a/auth/src/desktop/auth_data_handle.h
+++ b/auth/src/desktop/auth_data_handle.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_DATA_HANDLE_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_DATA_HANDLE_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_AUTH_DATA_HANDLE_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_AUTH_DATA_HANDLE_H_
 
 #include <memory>
 
@@ -51,4 +51,4 @@ struct AuthDataHandle {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_DATA_HANDLE_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_AUTH_DATA_HANDLE_H_
diff --git a/auth/src/desktop/auth_desktop.h b/auth/src/desktop/auth_desktop.h
index 4d44b91ee3..7204367172 100644
--- a/auth/src/desktop/auth_desktop.h
+++ b/auth/src/desktop/auth_desktop.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_DESKTOP_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_DESKTOP_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_AUTH_DESKTOP_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_AUTH_DESKTOP_H_
 
 #include <memory>
 
@@ -183,4 +183,4 @@ void LoadFinishTriggerListeners(AuthData* auth_data);
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_DESKTOP_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_AUTH_DESKTOP_H_
diff --git a/auth/src/desktop/auth_providers/email_auth_credential.h b/auth/src/desktop/auth_providers/email_auth_credential.h
index 2cccd21d47..afff1594a0 100644
--- a/auth/src/desktop/auth_providers/email_auth_credential.h
+++ b/auth/src/desktop/auth_providers/email_auth_credential.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_PROVIDERS_EMAIL_AUTH_CREDENTIAL_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_PROVIDERS_EMAIL_AUTH_CREDENTIAL_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_AUTH_PROVIDERS_EMAIL_AUTH_CREDENTIAL_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_AUTH_PROVIDERS_EMAIL_AUTH_CREDENTIAL_H_
 
 #include "auth/src/desktop/auth_constants.h"
 #include "auth/src/desktop/auth_credential.h"
@@ -47,4 +47,4 @@ class EmailAuthCredential : public AuthCredential {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_PROVIDERS_EMAIL_AUTH_CREDENTIAL_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_AUTH_PROVIDERS_EMAIL_AUTH_CREDENTIAL_H_
diff --git a/auth/src/desktop/auth_providers/facebook_auth_credential.h b/auth/src/desktop/auth_providers/facebook_auth_credential.h
index 796690faa0..d019085003 100644
--- a/auth/src/desktop/auth_providers/facebook_auth_credential.h
+++ b/auth/src/desktop/auth_providers/facebook_auth_credential.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_PROVIDERS_FACEBOOK_AUTH_CREDENTIAL_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_PROVIDERS_FACEBOOK_AUTH_CREDENTIAL_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_AUTH_PROVIDERS_FACEBOOK_AUTH_CREDENTIAL_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_AUTH_PROVIDERS_FACEBOOK_AUTH_CREDENTIAL_H_
 
 #include "auth/src/desktop/auth_constants.h"
 #include "auth/src/desktop/identity_provider_credential.h"
@@ -48,4 +48,4 @@ class FacebookAuthCredential : public IdentityProviderCredential {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_PROVIDERS_FACEBOOK_AUTH_CREDENTIAL_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_AUTH_PROVIDERS_FACEBOOK_AUTH_CREDENTIAL_H_
diff --git a/auth/src/desktop/auth_providers/github_auth_credential.h b/auth/src/desktop/auth_providers/github_auth_credential.h
index d4d9f32dea..fcdc88e0f5 100644
--- a/auth/src/desktop/auth_providers/github_auth_credential.h
+++ b/auth/src/desktop/auth_providers/github_auth_credential.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_PROVIDERS_GITHUB_AUTH_CREDENTIAL_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_PROVIDERS_GITHUB_AUTH_CREDENTIAL_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_AUTH_PROVIDERS_GITHUB_AUTH_CREDENTIAL_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_AUTH_PROVIDERS_GITHUB_AUTH_CREDENTIAL_H_
 
 #include "auth/src/desktop/auth_constants.h"
 #include "auth/src/desktop/identity_provider_credential.h"
@@ -47,4 +47,4 @@ class GitHubAuthCredential : public IdentityProviderCredential {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_PROVIDERS_GITHUB_AUTH_CREDENTIAL_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_AUTH_PROVIDERS_GITHUB_AUTH_CREDENTIAL_H_
diff --git a/auth/src/desktop/auth_providers/google_auth_credential.h b/auth/src/desktop/auth_providers/google_auth_credential.h
index 4390c4c5b4..cb2b229d87 100644
--- a/auth/src/desktop/auth_providers/google_auth_credential.h
+++ b/auth/src/desktop/auth_providers/google_auth_credential.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_PROVIDERS_GOOGLE_AUTH_CREDENTIAL_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_PROVIDERS_GOOGLE_AUTH_CREDENTIAL_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_AUTH_PROVIDERS_GOOGLE_AUTH_CREDENTIAL_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_AUTH_PROVIDERS_GOOGLE_AUTH_CREDENTIAL_H_
 
 #include "auth/src/desktop/auth_constants.h"
 #include "auth/src/desktop/identity_provider_credential.h"
@@ -55,4 +55,4 @@ class GoogleAuthCredential : public IdentityProviderCredential {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_PROVIDERS_GOOGLE_AUTH_CREDENTIAL_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_AUTH_PROVIDERS_GOOGLE_AUTH_CREDENTIAL_H_
diff --git a/auth/src/desktop/auth_providers/oauth_auth_credential.h b/auth/src/desktop/auth_providers/oauth_auth_credential.h
index aaaf102453..bb806889dd 100644
--- a/auth/src/desktop/auth_providers/oauth_auth_credential.h
+++ b/auth/src/desktop/auth_providers/oauth_auth_credential.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_PROVIDERS_OAUTH_AUTH_CREDENTIAL_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_PROVIDERS_OAUTH_AUTH_CREDENTIAL_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_AUTH_PROVIDERS_OAUTH_AUTH_CREDENTIAL_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_AUTH_PROVIDERS_OAUTH_AUTH_CREDENTIAL_H_
 
 #include "auth/src/desktop/auth_constants.h"
 #include "auth/src/desktop/identity_provider_credential.h"
@@ -62,4 +62,4 @@ class OAuthCredential : public IdentityProviderCredential {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_PROVIDERS_OAUTH_AUTH_CREDENTIAL_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_AUTH_PROVIDERS_OAUTH_AUTH_CREDENTIAL_H_
diff --git a/auth/src/desktop/auth_providers/playgames_auth_credential.h b/auth/src/desktop/auth_providers/playgames_auth_credential.h
index 6517234736..947f1aa4c9 100644
--- a/auth/src/desktop/auth_providers/playgames_auth_credential.h
+++ b/auth/src/desktop/auth_providers/playgames_auth_credential.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_PROVIDERS_PLAYGAMES_AUTH_CREDENTIAL_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_PROVIDERS_PLAYGAMES_AUTH_CREDENTIAL_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_AUTH_PROVIDERS_PLAYGAMES_AUTH_CREDENTIAL_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_AUTH_PROVIDERS_PLAYGAMES_AUTH_CREDENTIAL_H_
 
 #include "auth/src/desktop/auth_constants.h"
 #include "auth/src/desktop/identity_provider_credential.h"
@@ -48,4 +48,4 @@ class PlayGamesAuthCredential : public IdentityProviderCredential {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_PROVIDERS_PLAYGAMES_AUTH_CREDENTIAL_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_AUTH_PROVIDERS_PLAYGAMES_AUTH_CREDENTIAL_H_
diff --git a/auth/src/desktop/auth_providers/twitter_auth_credential.h b/auth/src/desktop/auth_providers/twitter_auth_credential.h
index 6a701ede28..e6aff2e145 100644
--- a/auth/src/desktop/auth_providers/twitter_auth_credential.h
+++ b/auth/src/desktop/auth_providers/twitter_auth_credential.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_PROVIDERS_TWITTER_AUTH_CREDENTIAL_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_PROVIDERS_TWITTER_AUTH_CREDENTIAL_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_AUTH_PROVIDERS_TWITTER_AUTH_CREDENTIAL_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_AUTH_PROVIDERS_TWITTER_AUTH_CREDENTIAL_H_
 
 #include "auth/src/desktop/auth_constants.h"
 #include "auth/src/desktop/identity_provider_credential.h"
@@ -49,4 +49,4 @@ class TwitterAuthCredential : public IdentityProviderCredential {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_PROVIDERS_TWITTER_AUTH_CREDENTIAL_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_AUTH_PROVIDERS_TWITTER_AUTH_CREDENTIAL_H_
diff --git a/auth/src/desktop/auth_util.h b/auth/src/desktop/auth_util.h
index 55f2d0e11b..32bbfc55ef 100644
--- a/auth/src/desktop/auth_util.h
+++ b/auth/src/desktop/auth_util.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_UTIL_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_UTIL_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_AUTH_UTIL_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_AUTH_UTIL_H_
 
 #include <memory>
 #include <vector>
@@ -124,4 +124,4 @@ inline void FailPromise(Promise<T>* const promise, const AuthError error_code) {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTH_UTIL_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_AUTH_UTIL_H_
diff --git a/auth/src/desktop/authentication_result.h b/auth/src/desktop/authentication_result.h
index a31ba83ee4..7d50781864 100644
--- a/auth/src/desktop/authentication_result.h
+++ b/auth/src/desktop/authentication_result.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTHENTICATION_RESULT_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTHENTICATION_RESULT_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_AUTHENTICATION_RESULT_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_AUTHENTICATION_RESULT_H_
 
 #include <cstddef>
 #include <string>
@@ -174,4 +174,4 @@ inline AuthenticationResult AuthenticationResult::FromAuthenticatedUserData(
 
 }  // namespace auth
 }  // namespace firebase
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_AUTHENTICATION_RESULT_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_AUTHENTICATION_RESULT_H_
diff --git a/auth/src/desktop/credential_impl.h b/auth/src/desktop/credential_impl.h
index 5355385798..c9cc319bea 100644
--- a/auth/src/desktop/credential_impl.h
+++ b/auth/src/desktop/credential_impl.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_CREDENTIAL_IMPL_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_CREDENTIAL_IMPL_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_CREDENTIAL_IMPL_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_CREDENTIAL_IMPL_H_
 
 #include <memory>
 
@@ -32,4 +32,4 @@ struct CredentialImpl {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_CREDENTIAL_IMPL_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_CREDENTIAL_IMPL_H_
diff --git a/auth/src/desktop/credential_util.h b/auth/src/desktop/credential_util.h
index e37c280d3b..cde8da1a84 100644
--- a/auth/src/desktop/credential_util.h
+++ b/auth/src/desktop/credential_util.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_CREDENTIAL_UTIL_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_CREDENTIAL_UTIL_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_CREDENTIAL_UTIL_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_CREDENTIAL_UTIL_H_
 
 #include <memory>
 #include <string>
@@ -58,4 +58,4 @@ const EmailAuthCredential* GetEmailCredential(const void* raw_credential_impl);
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_CREDENTIAL_UTIL_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_CREDENTIAL_UTIL_H_
diff --git a/auth/src/desktop/get_account_info_result.h b/auth/src/desktop/get_account_info_result.h
index 5f1225c1de..3fb3af491e 100644
--- a/auth/src/desktop/get_account_info_result.h
+++ b/auth/src/desktop/get_account_info_result.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_GET_ACCOUNT_INFO_RESULT_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_GET_ACCOUNT_INFO_RESULT_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_GET_ACCOUNT_INFO_RESULT_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_GET_ACCOUNT_INFO_RESULT_H_
 
 #include <vector>
 
@@ -76,4 +76,4 @@ class GetAccountInfoResult {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_GET_ACCOUNT_INFO_RESULT_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_GET_ACCOUNT_INFO_RESULT_H_
diff --git a/auth/src/desktop/get_additional_user_info.h b/auth/src/desktop/get_additional_user_info.h
index 7ec7fbfac6..0167950a99 100644
--- a/auth/src/desktop/get_additional_user_info.h
+++ b/auth/src/desktop/get_additional_user_info.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_GET_ADDITIONAL_USER_INFO_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_GET_ADDITIONAL_USER_INFO_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_GET_ADDITIONAL_USER_INFO_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_GET_ADDITIONAL_USER_INFO_H_
 
 #include <map>
 #include <string>
@@ -82,4 +82,4 @@ inline AdditionalUserInfo GetAdditionalUserInfo(
 
 }  // namespace auth
 }  // namespace firebase
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_GET_ADDITIONAL_USER_INFO_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_GET_ADDITIONAL_USER_INFO_H_
diff --git a/auth/src/desktop/identity_provider_credential.h b/auth/src/desktop/identity_provider_credential.h
index a116234738..87b1034c9d 100644
--- a/auth/src/desktop/identity_provider_credential.h
+++ b/auth/src/desktop/identity_provider_credential.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_IDENTITY_PROVIDER_CREDENTIAL_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_IDENTITY_PROVIDER_CREDENTIAL_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_IDENTITY_PROVIDER_CREDENTIAL_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_IDENTITY_PROVIDER_CREDENTIAL_H_
 
 #include <memory>
 
@@ -46,4 +46,4 @@ class IdentityProviderCredential : public AuthCredential {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_IDENTITY_PROVIDER_CREDENTIAL_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_IDENTITY_PROVIDER_CREDENTIAL_H_
diff --git a/auth/src/desktop/promise.h b/auth/src/desktop/promise.h
index 07d3efdbe9..18b960dd4c 100644
--- a/auth/src/desktop/promise.h
+++ b/auth/src/desktop/promise.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_PROMISE_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_PROMISE_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_PROMISE_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_PROMISE_H_
 
 #include <memory>
 
@@ -130,4 +130,4 @@ class Promise<void> {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_PROMISE_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_PROMISE_H_
diff --git a/auth/src/desktop/provider_user_info.h b/auth/src/desktop/provider_user_info.h
index 8b47a429e4..04d3be0034 100644
--- a/auth/src/desktop/provider_user_info.h
+++ b/auth/src/desktop/provider_user_info.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_PROVIDER_USER_INFO_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_PROVIDER_USER_INFO_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_PROVIDER_USER_INFO_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_PROVIDER_USER_INFO_H_
 
 #include <string>
 #include <vector>
@@ -66,4 +66,4 @@ std::vector<UserInfoImpl> ParseProviderUserInfo(const ResponseT& response) {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_PROVIDER_USER_INFO_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_PROVIDER_USER_INFO_H_
diff --git a/auth/src/desktop/rpcs/auth_request.h b/auth/src/desktop/rpcs/auth_request.h
index d400415acf..588472b779 100644
--- a/auth/src/desktop/rpcs/auth_request.h
+++ b/auth/src/desktop/rpcs/auth_request.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_AUTH_REQUEST_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_AUTH_REQUEST_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_RPCS_AUTH_REQUEST_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_RPCS_AUTH_REQUEST_H_
 
 #include "app/rest/request_json.h"
 #include "auth/request_generated.h"
@@ -39,4 +39,4 @@ class AuthRequest
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_AUTH_REQUEST_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_RPCS_AUTH_REQUEST_H_
diff --git a/auth/src/desktop/rpcs/auth_response.h b/auth/src/desktop/rpcs/auth_response.h
index 0789d03592..281c0110de 100644
--- a/auth/src/desktop/rpcs/auth_response.h
+++ b/auth/src/desktop/rpcs/auth_response.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_AUTH_RESPONSE_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_AUTH_RESPONSE_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_RPCS_AUTH_RESPONSE_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_RPCS_AUTH_RESPONSE_H_
 
 #include <string>
 
@@ -48,4 +48,4 @@ class AuthResponse
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_AUTH_RESPONSE_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_RPCS_AUTH_RESPONSE_H_
diff --git a/auth/src/desktop/rpcs/create_auth_uri_request.h b/auth/src/desktop/rpcs/create_auth_uri_request.h
index 7dabe3749d..950c28f6d9 100644
--- a/auth/src/desktop/rpcs/create_auth_uri_request.h
+++ b/auth/src/desktop/rpcs/create_auth_uri_request.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_CREATE_AUTH_URI_REQUEST_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_CREATE_AUTH_URI_REQUEST_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_RPCS_CREATE_AUTH_URI_REQUEST_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_RPCS_CREATE_AUTH_URI_REQUEST_H_
 
 #include "auth/request_generated.h"
 #include "auth/request_resource.h"
@@ -32,4 +32,4 @@ class CreateAuthUriRequest : public AuthRequest {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_CREATE_AUTH_URI_REQUEST_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_RPCS_CREATE_AUTH_URI_REQUEST_H_
diff --git a/auth/src/desktop/rpcs/create_auth_uri_response.h b/auth/src/desktop/rpcs/create_auth_uri_response.h
index 8adb31123a..23638bd564 100644
--- a/auth/src/desktop/rpcs/create_auth_uri_response.h
+++ b/auth/src/desktop/rpcs/create_auth_uri_response.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_CREATE_AUTH_URI_RESPONSE_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_CREATE_AUTH_URI_RESPONSE_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_RPCS_CREATE_AUTH_URI_RESPONSE_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_RPCS_CREATE_AUTH_URI_RESPONSE_H_
 
 #include <string>
 #include <vector>
@@ -42,4 +42,4 @@ class CreateAuthUriResponse : public AuthResponse {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_CREATE_AUTH_URI_RESPONSE_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_RPCS_CREATE_AUTH_URI_RESPONSE_H_
diff --git a/auth/src/desktop/rpcs/delete_account_request.h b/auth/src/desktop/rpcs/delete_account_request.h
index d9663d7b72..18230e2f8e 100644
--- a/auth/src/desktop/rpcs/delete_account_request.h
+++ b/auth/src/desktop/rpcs/delete_account_request.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_DELETE_ACCOUNT_REQUEST_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_DELETE_ACCOUNT_REQUEST_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_RPCS_DELETE_ACCOUNT_REQUEST_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_RPCS_DELETE_ACCOUNT_REQUEST_H_
 
 #include "app/src/log.h"
 #include "auth/request_generated.h"
@@ -42,4 +42,4 @@ class DeleteAccountRequest : public AuthRequest {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_DELETE_ACCOUNT_REQUEST_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_RPCS_DELETE_ACCOUNT_REQUEST_H_
diff --git a/auth/src/desktop/rpcs/delete_account_response.h b/auth/src/desktop/rpcs/delete_account_response.h
index fc6aad6275..cfa34251f2 100644
--- a/auth/src/desktop/rpcs/delete_account_response.h
+++ b/auth/src/desktop/rpcs/delete_account_response.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_DELETE_ACCOUNT_RESPONSE_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_DELETE_ACCOUNT_RESPONSE_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_RPCS_DELETE_ACCOUNT_RESPONSE_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_RPCS_DELETE_ACCOUNT_RESPONSE_H_
 
 #include "auth/src/desktop/rpcs/auth_response.h"
 #include "auth/src/desktop/visual_studio_compatibility.h"
@@ -31,4 +31,4 @@ class DeleteAccountResponse : public AuthResponse {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_DELETE_ACCOUNT_RESPONSE_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_RPCS_DELETE_ACCOUNT_RESPONSE_H_
diff --git a/auth/src/desktop/rpcs/error_codes.h b/auth/src/desktop/rpcs/error_codes.h
index 6f020ad06c..82bedf2153 100644
--- a/auth/src/desktop/rpcs/error_codes.h
+++ b/auth/src/desktop/rpcs/error_codes.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_ERROR_CODES_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_ERROR_CODES_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_RPCS_ERROR_CODES_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_RPCS_ERROR_CODES_H_
 
 #include <string>
 
@@ -35,4 +35,4 @@ const char* GetAuthErrorMessage(AuthError error_code);
 
 }  // namespace auth
 }  // namespace firebase
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_ERROR_CODES_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_RPCS_ERROR_CODES_H_
diff --git a/auth/src/desktop/rpcs/get_account_info_request.h b/auth/src/desktop/rpcs/get_account_info_request.h
index df822e0e39..a437d84af9 100644
--- a/auth/src/desktop/rpcs/get_account_info_request.h
+++ b/auth/src/desktop/rpcs/get_account_info_request.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_GET_ACCOUNT_INFO_REQUEST_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_GET_ACCOUNT_INFO_REQUEST_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_RPCS_GET_ACCOUNT_INFO_REQUEST_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_RPCS_GET_ACCOUNT_INFO_REQUEST_H_
 
 #include "app/src/log.h"
 #include "auth/request_generated.h"
@@ -47,4 +47,4 @@ class GetAccountInfoRequest : public AuthRequest {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_GET_ACCOUNT_INFO_REQUEST_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_RPCS_GET_ACCOUNT_INFO_REQUEST_H_
diff --git a/auth/src/desktop/rpcs/get_account_info_response.h b/auth/src/desktop/rpcs/get_account_info_response.h
index 197a6a0fff..54da20ae0c 100644
--- a/auth/src/desktop/rpcs/get_account_info_response.h
+++ b/auth/src/desktop/rpcs/get_account_info_response.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_GET_ACCOUNT_INFO_RESPONSE_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_GET_ACCOUNT_INFO_RESPONSE_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_RPCS_GET_ACCOUNT_INFO_RESPONSE_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_RPCS_GET_ACCOUNT_INFO_RESPONSE_H_
 
 #include <memory>
 #include <string>
@@ -99,4 +99,4 @@ class GetAccountInfoResponse : public AuthResponse {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_GET_ACCOUNT_INFO_RESPONSE_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_RPCS_GET_ACCOUNT_INFO_RESPONSE_H_
diff --git a/auth/src/desktop/rpcs/get_oob_confirmation_code_request.h b/auth/src/desktop/rpcs/get_oob_confirmation_code_request.h
index f4bca399a1..a99e1c286f 100644
--- a/auth/src/desktop/rpcs/get_oob_confirmation_code_request.h
+++ b/auth/src/desktop/rpcs/get_oob_confirmation_code_request.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_GET_OOB_CONFIRMATION_CODE_REQUEST_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_GET_OOB_CONFIRMATION_CODE_REQUEST_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_RPCS_GET_OOB_CONFIRMATION_CODE_REQUEST_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_RPCS_GET_OOB_CONFIRMATION_CODE_REQUEST_H_
 
 #include <memory>
 
@@ -53,4 +53,4 @@ class GetOobConfirmationCodeRequest : public AuthRequest {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_GET_OOB_CONFIRMATION_CODE_REQUEST_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_RPCS_GET_OOB_CONFIRMATION_CODE_REQUEST_H_
diff --git a/auth/src/desktop/rpcs/get_oob_confirmation_code_response.h b/auth/src/desktop/rpcs/get_oob_confirmation_code_response.h
index fbdd66453e..a41be4a168 100644
--- a/auth/src/desktop/rpcs/get_oob_confirmation_code_response.h
+++ b/auth/src/desktop/rpcs/get_oob_confirmation_code_response.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_GET_OOB_CONFIRMATION_CODE_RESPONSE_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_GET_OOB_CONFIRMATION_CODE_RESPONSE_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_RPCS_GET_OOB_CONFIRMATION_CODE_RESPONSE_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_RPCS_GET_OOB_CONFIRMATION_CODE_RESPONSE_H_
 
 #include "auth/src/desktop/rpcs/auth_response.h"
 #include "auth/src/desktop/visual_studio_compatibility.h"
@@ -32,4 +32,4 @@ class GetOobConfirmationCodeResponse : public AuthResponse {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_GET_OOB_CONFIRMATION_CODE_RESPONSE_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_RPCS_GET_OOB_CONFIRMATION_CODE_RESPONSE_H_
diff --git a/auth/src/desktop/rpcs/reset_password_request.h b/auth/src/desktop/rpcs/reset_password_request.h
index 8637fd829b..80c5c85e6f 100644
--- a/auth/src/desktop/rpcs/reset_password_request.h
+++ b/auth/src/desktop/rpcs/reset_password_request.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_RESET_PASSWORD_REQUEST_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_RESET_PASSWORD_REQUEST_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_RPCS_RESET_PASSWORD_REQUEST_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_RPCS_RESET_PASSWORD_REQUEST_H_
 
 #include "auth/request_generated.h"
 #include "auth/request_resource.h"
@@ -33,4 +33,4 @@ class ResetPasswordRequest : public AuthRequest {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_RESET_PASSWORD_REQUEST_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_RPCS_RESET_PASSWORD_REQUEST_H_
diff --git a/auth/src/desktop/rpcs/reset_password_response.h b/auth/src/desktop/rpcs/reset_password_response.h
index 287e9de5f7..62971a0c9a 100644
--- a/auth/src/desktop/rpcs/reset_password_response.h
+++ b/auth/src/desktop/rpcs/reset_password_response.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_RESET_PASSWORD_RESPONSE_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_RESET_PASSWORD_RESPONSE_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_RPCS_RESET_PASSWORD_RESPONSE_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_RPCS_RESET_PASSWORD_RESPONSE_H_
 
 #include "auth/src/desktop/rpcs/auth_response.h"
 #include "auth/src/desktop/visual_studio_compatibility.h"
@@ -31,4 +31,4 @@ class ResetPasswordResponse : public AuthResponse {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_RESET_PASSWORD_RESPONSE_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_RPCS_RESET_PASSWORD_RESPONSE_H_
diff --git a/auth/src/desktop/rpcs/secure_token_request.h b/auth/src/desktop/rpcs/secure_token_request.h
index 860100631b..380c100f0c 100644
--- a/auth/src/desktop/rpcs/secure_token_request.h
+++ b/auth/src/desktop/rpcs/secure_token_request.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_SECURE_TOKEN_REQUEST_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_SECURE_TOKEN_REQUEST_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_RPCS_SECURE_TOKEN_REQUEST_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_RPCS_SECURE_TOKEN_REQUEST_H_
 
 #include "auth/request_generated.h"
 #include "auth/request_resource.h"
@@ -33,4 +33,4 @@ class SecureTokenRequest : public AuthRequest {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_SECURE_TOKEN_REQUEST_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_RPCS_SECURE_TOKEN_REQUEST_H_
diff --git a/auth/src/desktop/rpcs/secure_token_response.h b/auth/src/desktop/rpcs/secure_token_response.h
index 59b474c55f..796d7a14b5 100644
--- a/auth/src/desktop/rpcs/secure_token_response.h
+++ b/auth/src/desktop/rpcs/secure_token_response.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_SECURE_TOKEN_RESPONSE_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_SECURE_TOKEN_RESPONSE_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_RPCS_SECURE_TOKEN_RESPONSE_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_RPCS_SECURE_TOKEN_RESPONSE_H_
 
 #include <string>
 
@@ -51,4 +51,4 @@ class SecureTokenResponse : public AuthResponse {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_SECURE_TOKEN_RESPONSE_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_RPCS_SECURE_TOKEN_RESPONSE_H_
diff --git a/auth/src/desktop/rpcs/set_account_info_request.h b/auth/src/desktop/rpcs/set_account_info_request.h
index 1fb4c5333e..92acfb3712 100644
--- a/auth/src/desktop/rpcs/set_account_info_request.h
+++ b/auth/src/desktop/rpcs/set_account_info_request.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_SET_ACCOUNT_INFO_REQUEST_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_SET_ACCOUNT_INFO_REQUEST_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_RPCS_SET_ACCOUNT_INFO_REQUEST_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_RPCS_SET_ACCOUNT_INFO_REQUEST_H_
 
 #include <memory>
 #include <string>
@@ -62,4 +62,4 @@ class SetAccountInfoRequest : public AuthRequest {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_SET_ACCOUNT_INFO_REQUEST_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_RPCS_SET_ACCOUNT_INFO_REQUEST_H_
diff --git a/auth/src/desktop/rpcs/set_account_info_response.h b/auth/src/desktop/rpcs/set_account_info_response.h
index 689c76044a..24ca199eb0 100644
--- a/auth/src/desktop/rpcs/set_account_info_response.h
+++ b/auth/src/desktop/rpcs/set_account_info_response.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_SET_ACCOUNT_INFO_RESPONSE_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_SET_ACCOUNT_INFO_RESPONSE_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_RPCS_SET_ACCOUNT_INFO_RESPONSE_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_RPCS_SET_ACCOUNT_INFO_RESPONSE_H_
 
 #include <memory>
 #include <string>
@@ -62,4 +62,4 @@ class SetAccountInfoResponse : public AuthResponse {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_SET_ACCOUNT_INFO_RESPONSE_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_RPCS_SET_ACCOUNT_INFO_RESPONSE_H_
diff --git a/auth/src/desktop/rpcs/sign_up_new_user_request.h b/auth/src/desktop/rpcs/sign_up_new_user_request.h
index 1b012c5aa4..25ced8b20b 100644
--- a/auth/src/desktop/rpcs/sign_up_new_user_request.h
+++ b/auth/src/desktop/rpcs/sign_up_new_user_request.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_SIGN_UP_NEW_USER_REQUEST_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_SIGN_UP_NEW_USER_REQUEST_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_RPCS_SIGN_UP_NEW_USER_REQUEST_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_RPCS_SIGN_UP_NEW_USER_REQUEST_H_
 
 #include "auth/request_generated.h"
 #include "auth/request_resource.h"
@@ -43,4 +43,4 @@ class SignUpNewUserRequest : public AuthRequest {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_SIGN_UP_NEW_USER_REQUEST_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_RPCS_SIGN_UP_NEW_USER_REQUEST_H_
diff --git a/auth/src/desktop/rpcs/sign_up_new_user_response.h b/auth/src/desktop/rpcs/sign_up_new_user_response.h
index bd27547711..e9fd862adf 100644
--- a/auth/src/desktop/rpcs/sign_up_new_user_response.h
+++ b/auth/src/desktop/rpcs/sign_up_new_user_response.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_SIGN_UP_NEW_USER_RESPONSE_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_SIGN_UP_NEW_USER_RESPONSE_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_RPCS_SIGN_UP_NEW_USER_RESPONSE_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_RPCS_SIGN_UP_NEW_USER_RESPONSE_H_
 
 #include <string>
 
@@ -61,4 +61,4 @@ class SignUpNewUserResponse : public AuthResponse {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_SIGN_UP_NEW_USER_RESPONSE_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_RPCS_SIGN_UP_NEW_USER_RESPONSE_H_
diff --git a/auth/src/desktop/rpcs/verify_assertion_request.h b/auth/src/desktop/rpcs/verify_assertion_request.h
index 96cd9c6c63..acbb214e56 100644
--- a/auth/src/desktop/rpcs/verify_assertion_request.h
+++ b/auth/src/desktop/rpcs/verify_assertion_request.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_VERIFY_ASSERTION_REQUEST_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_VERIFY_ASSERTION_REQUEST_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_RPCS_VERIFY_ASSERTION_REQUEST_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_RPCS_VERIFY_ASSERTION_REQUEST_H_
 
 #include <memory>
 #include <string>
@@ -64,4 +64,4 @@ class VerifyAssertionRequest : public AuthRequest {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_VERIFY_ASSERTION_REQUEST_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_RPCS_VERIFY_ASSERTION_REQUEST_H_
diff --git a/auth/src/desktop/rpcs/verify_assertion_response.h b/auth/src/desktop/rpcs/verify_assertion_response.h
index e287567b05..cc1c8b4342 100644
--- a/auth/src/desktop/rpcs/verify_assertion_response.h
+++ b/auth/src/desktop/rpcs/verify_assertion_response.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_VERIFY_ASSERTION_RESPONSE_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_VERIFY_ASSERTION_RESPONSE_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_RPCS_VERIFY_ASSERTION_RESPONSE_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_RPCS_VERIFY_ASSERTION_RESPONSE_H_
 
 #include <string>
 
@@ -54,4 +54,4 @@ class VerifyAssertionResponse : public AuthResponse {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_VERIFY_ASSERTION_RESPONSE_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_RPCS_VERIFY_ASSERTION_RESPONSE_H_
diff --git a/auth/src/desktop/rpcs/verify_custom_token_request.h b/auth/src/desktop/rpcs/verify_custom_token_request.h
index 8d95d7782c..17b381e2fc 100644
--- a/auth/src/desktop/rpcs/verify_custom_token_request.h
+++ b/auth/src/desktop/rpcs/verify_custom_token_request.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_VERIFY_CUSTOM_TOKEN_REQUEST_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_VERIFY_CUSTOM_TOKEN_REQUEST_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_RPCS_VERIFY_CUSTOM_TOKEN_REQUEST_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_RPCS_VERIFY_CUSTOM_TOKEN_REQUEST_H_
 
 #include "auth/request_generated.h"
 #include "auth/request_resource.h"
@@ -32,4 +32,4 @@ class VerifyCustomTokenRequest : public AuthRequest {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_VERIFY_CUSTOM_TOKEN_REQUEST_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_RPCS_VERIFY_CUSTOM_TOKEN_REQUEST_H_
diff --git a/auth/src/desktop/rpcs/verify_custom_token_response.h b/auth/src/desktop/rpcs/verify_custom_token_response.h
index e228034e1a..ce2cfbc185 100644
--- a/auth/src/desktop/rpcs/verify_custom_token_response.h
+++ b/auth/src/desktop/rpcs/verify_custom_token_response.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_VERIFY_CUSTOM_TOKEN_RESPONSE_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_VERIFY_CUSTOM_TOKEN_RESPONSE_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_RPCS_VERIFY_CUSTOM_TOKEN_RESPONSE_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_RPCS_VERIFY_CUSTOM_TOKEN_RESPONSE_H_
 
 #include <string>
 
@@ -59,4 +59,4 @@ class VerifyCustomTokenResponse : public AuthResponse {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_VERIFY_CUSTOM_TOKEN_RESPONSE_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_RPCS_VERIFY_CUSTOM_TOKEN_RESPONSE_H_
diff --git a/auth/src/desktop/rpcs/verify_password_request.h b/auth/src/desktop/rpcs/verify_password_request.h
index 220e4a1839..640635fc69 100644
--- a/auth/src/desktop/rpcs/verify_password_request.h
+++ b/auth/src/desktop/rpcs/verify_password_request.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_VERIFY_PASSWORD_REQUEST_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_VERIFY_PASSWORD_REQUEST_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_RPCS_VERIFY_PASSWORD_REQUEST_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_RPCS_VERIFY_PASSWORD_REQUEST_H_
 
 #include "auth/request_generated.h"
 #include "auth/request_resource.h"
@@ -33,4 +33,4 @@ class VerifyPasswordRequest : public AuthRequest {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_VERIFY_PASSWORD_REQUEST_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_RPCS_VERIFY_PASSWORD_REQUEST_H_
diff --git a/auth/src/desktop/rpcs/verify_password_response.h b/auth/src/desktop/rpcs/verify_password_response.h
index 7cbb675838..63e588908b 100644
--- a/auth/src/desktop/rpcs/verify_password_response.h
+++ b/auth/src/desktop/rpcs/verify_password_response.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_VERIFY_PASSWORD_RESPONSE_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_VERIFY_PASSWORD_RESPONSE_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_RPCS_VERIFY_PASSWORD_RESPONSE_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_RPCS_VERIFY_PASSWORD_RESPONSE_H_
 
 #include "auth/src/desktop/rpcs/auth_response.h"
 #include "auth/src/desktop/visual_studio_compatibility.h"
@@ -52,4 +52,4 @@ class VerifyPasswordResponse : public AuthResponse {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_RPCS_VERIFY_PASSWORD_RESPONSE_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_RPCS_VERIFY_PASSWORD_RESPONSE_H_
diff --git a/auth/src/desktop/set_account_info_result.h b/auth/src/desktop/set_account_info_result.h
index 62c6834697..15e50a52df 100644
--- a/auth/src/desktop/set_account_info_result.h
+++ b/auth/src/desktop/set_account_info_result.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_SET_ACCOUNT_INFO_RESULT_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_SET_ACCOUNT_INFO_RESULT_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_SET_ACCOUNT_INFO_RESULT_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_SET_ACCOUNT_INFO_RESULT_H_
 
 #include <vector>
 
@@ -99,4 +99,4 @@ class SetAccountInfoResult {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_SET_ACCOUNT_INFO_RESULT_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_SET_ACCOUNT_INFO_RESULT_H_
diff --git a/auth/src/desktop/sign_in_flow.h b/auth/src/desktop/sign_in_flow.h
index 4ab6d95646..71a4164adc 100644
--- a/auth/src/desktop/sign_in_flow.h
+++ b/auth/src/desktop/sign_in_flow.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_SIGN_IN_FLOW_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_SIGN_IN_FLOW_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_SIGN_IN_FLOW_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_SIGN_IN_FLOW_H_
 
 #include <string>
 
@@ -119,4 +119,4 @@ inline void PerformSignInFlow(
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_SIGN_IN_FLOW_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_SIGN_IN_FLOW_H_
diff --git a/auth/src/desktop/user_desktop.h b/auth/src/desktop/user_desktop.h
index a22bdcb387..f03a6f9f3c 100644
--- a/auth/src/desktop/user_desktop.h
+++ b/auth/src/desktop/user_desktop.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_USER_DESKTOP_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_USER_DESKTOP_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_USER_DESKTOP_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_USER_DESKTOP_H_
 
 #include <firebase/auth.h>
 
@@ -118,4 +118,4 @@ class UserDataPersist : public firebase::auth::AuthStateListener {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_USER_DESKTOP_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_USER_DESKTOP_H_
diff --git a/auth/src/desktop/user_view.h b/auth/src/desktop/user_view.h
index a0026bd0dd..2c3b2305bc 100644
--- a/auth/src/desktop/user_view.h
+++ b/auth/src/desktop/user_view.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_USER_VIEW_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_USER_VIEW_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_USER_VIEW_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_USER_VIEW_H_
 
 #include <memory>
 #include <utility>
@@ -182,4 +182,4 @@ inline bool UserView::TryRead(AuthData* const auth_data, CallbackT callback) {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_USER_VIEW_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_USER_VIEW_H_
diff --git a/auth/src/desktop/validate_credential.h b/auth/src/desktop/validate_credential.h
index 2cb3daee75..8eb55ab430 100644
--- a/auth/src/desktop/validate_credential.h
+++ b/auth/src/desktop/validate_credential.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_VALIDATE_CREDENTIAL_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_VALIDATE_CREDENTIAL_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_VALIDATE_CREDENTIAL_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_VALIDATE_CREDENTIAL_H_
 
 #include <string>
 
@@ -106,4 +106,4 @@ inline bool ValidateCredential(Promise<FutureResultT>* const promise,
 
 }  // namespace auth
 }  // namespace firebase
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_VALIDATE_CREDENTIAL_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_VALIDATE_CREDENTIAL_H_
diff --git a/auth/src/desktop/visual_studio_compatibility.h b/auth/src/desktop/visual_studio_compatibility.h
index 9207ffd6f6..0fa8482c6f 100644
--- a/auth/src/desktop/visual_studio_compatibility.h
+++ b/auth/src/desktop/visual_studio_compatibility.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_VISUAL_STUDIO_COMPATIBILITY_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_VISUAL_STUDIO_COMPATIBILITY_H_
+#ifndef FIREBASE_AUTH_SRC_DESKTOP_VISUAL_STUDIO_COMPATIBILITY_H_
+#define FIREBASE_AUTH_SRC_DESKTOP_VISUAL_STUDIO_COMPATIBILITY_H_
 
 #include <utility>
 
@@ -31,4 +31,4 @@
       : BaseClassName(std::move(rhs)) {}
 // clang-format on
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_DESKTOP_VISUAL_STUDIO_COMPATIBILITY_H_
+#endif  // FIREBASE_AUTH_SRC_DESKTOP_VISUAL_STUDIO_COMPATIBILITY_H_
diff --git a/auth/src/include/firebase/auth.h b/auth/src/include/firebase/auth.h
index 9e9e0ca13d..e307dd0e01 100644
--- a/auth/src/include/firebase/auth.h
+++ b/auth/src/include/firebase/auth.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_INCLUDE_FIREBASE_AUTH_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_INCLUDE_FIREBASE_AUTH_H_
+#ifndef FIREBASE_AUTH_SRC_INCLUDE_FIREBASE_AUTH_H_
+#define FIREBASE_AUTH_SRC_INCLUDE_FIREBASE_AUTH_H_
 
 #include <vector>
 
@@ -935,4 +935,4 @@ class FederatedOAuthProvider : public FederatedAuthProvider {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_INCLUDE_FIREBASE_AUTH_H_
+#endif  // FIREBASE_AUTH_SRC_INCLUDE_FIREBASE_AUTH_H_
diff --git a/auth/src/include/firebase/auth/credential.h b/auth/src/include/firebase/auth/credential.h
index 5a70247eb3..5e21887a33 100644
--- a/auth/src/include/firebase/auth/credential.h
+++ b/auth/src/include/firebase/auth/credential.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_INCLUDE_FIREBASE_AUTH_CREDENTIAL_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_INCLUDE_FIREBASE_AUTH_CREDENTIAL_H_
+#ifndef FIREBASE_AUTH_SRC_INCLUDE_FIREBASE_AUTH_CREDENTIAL_H_
+#define FIREBASE_AUTH_SRC_INCLUDE_FIREBASE_AUTH_CREDENTIAL_H_
 
 #include <stdint.h>
 
@@ -623,4 +623,4 @@ class YahooAuthProvider {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_INCLUDE_FIREBASE_AUTH_CREDENTIAL_H_
+#endif  // FIREBASE_AUTH_SRC_INCLUDE_FIREBASE_AUTH_CREDENTIAL_H_
diff --git a/auth/src/include/firebase/auth/types.h b/auth/src/include/firebase/auth/types.h
index 7edd8bf2ed..43201c1334 100644
--- a/auth/src/include/firebase/auth/types.h
+++ b/auth/src/include/firebase/auth/types.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_INCLUDE_FIREBASE_AUTH_TYPES_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_INCLUDE_FIREBASE_AUTH_TYPES_H_
+#ifndef FIREBASE_AUTH_SRC_INCLUDE_FIREBASE_AUTH_TYPES_H_
+#define FIREBASE_AUTH_SRC_INCLUDE_FIREBASE_AUTH_TYPES_H_
 
 #include <map>
 #include <string>
@@ -462,4 +462,4 @@ struct FederatedOAuthProviderData : FederatedProviderData {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_INCLUDE_FIREBASE_AUTH_TYPES_H_
+#endif  // FIREBASE_AUTH_SRC_INCLUDE_FIREBASE_AUTH_TYPES_H_
diff --git a/auth/src/include/firebase/auth/user.h b/auth/src/include/firebase/auth/user.h
index de493a3db1..8460ebedd6 100644
--- a/auth/src/include/firebase/auth/user.h
+++ b/auth/src/include/firebase/auth/user.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_INCLUDE_FIREBASE_AUTH_USER_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_INCLUDE_FIREBASE_AUTH_USER_H_
+#ifndef FIREBASE_AUTH_SRC_INCLUDE_FIREBASE_AUTH_USER_H_
+#define FIREBASE_AUTH_SRC_INCLUDE_FIREBASE_AUTH_USER_H_
 
 #include <string>
 #include <vector>
@@ -498,4 +498,4 @@ class User : public UserInfoInterface {
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_INCLUDE_FIREBASE_AUTH_USER_H_
+#endif  // FIREBASE_AUTH_SRC_INCLUDE_FIREBASE_AUTH_USER_H_
diff --git a/auth/src/ios/common_ios.h b/auth/src/ios/common_ios.h
index f75960f495..66469392ea 100644
--- a/auth/src/ios/common_ios.h
+++ b/auth/src/ios/common_ios.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_IOS_COMMON_IOS_H_
-#define FIREBASE_AUTH_CLIENT_CPP_SRC_IOS_COMMON_IOS_H_
+#ifndef FIREBASE_AUTH_SRC_IOS_COMMON_IOS_H_
+#define FIREBASE_AUTH_SRC_IOS_COMMON_IOS_H_
 
 #import <Foundation/Foundation.h>
 
@@ -118,4 +118,4 @@ NSError* RemapBadProviderIDErrors(NSError* _Nonnull error);
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_SRC_IOS_COMMON_IOS_H_
+#endif  // FIREBASE_AUTH_SRC_IOS_COMMON_IOS_H_
diff --git a/auth/tests/desktop/fakes.h b/auth/tests/desktop/fakes.h
index e84d9ed80c..a86ddf56c7 100644
--- a/auth/tests/desktop/fakes.h
+++ b/auth/tests/desktop/fakes.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_TESTS_DESKTOP_FAKES_H_
-#define FIREBASE_AUTH_CLIENT_CPP_TESTS_DESKTOP_FAKES_H_
+#ifndef FIREBASE_AUTH_TESTS_DESKTOP_FAKES_H_
+#define FIREBASE_AUTH_TESTS_DESKTOP_FAKES_H_
 
 #include <string>
 #include <unordered_map>
@@ -61,4 +61,4 @@ std::string CreateErrorHttpResponse(const std::string& error = "");
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_TESTS_DESKTOP_FAKES_H_
+#endif  // FIREBASE_AUTH_TESTS_DESKTOP_FAKES_H_
diff --git a/auth/tests/desktop/rpcs/test_util.h b/auth/tests/desktop/rpcs/test_util.h
index 8997150b51..686e8fa7cc 100644
--- a/auth/tests/desktop/rpcs/test_util.h
+++ b/auth/tests/desktop/rpcs/test_util.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_TESTS_DESKTOP_RPCS_TEST_UTIL_H_
-#define FIREBASE_AUTH_CLIENT_CPP_TESTS_DESKTOP_RPCS_TEST_UTIL_H_
+#ifndef FIREBASE_AUTH_TESTS_DESKTOP_RPCS_TEST_UTIL_H_
+#define FIREBASE_AUTH_TESTS_DESKTOP_RPCS_TEST_UTIL_H_
 
 #include <string>
 
@@ -35,4 +35,4 @@ std::string SignUpNewUserAndGetIdToken(const char* api_key, const char* email);
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_TESTS_DESKTOP_RPCS_TEST_UTIL_H_
+#endif  // FIREBASE_AUTH_TESTS_DESKTOP_RPCS_TEST_UTIL_H_
diff --git a/auth/tests/desktop/test_utils.h b/auth/tests/desktop/test_utils.h
index 3f11bb9389..d5ae11dfb1 100644
--- a/auth/tests/desktop/test_utils.h
+++ b/auth/tests/desktop/test_utils.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_AUTH_CLIENT_CPP_TESTS_DESKTOP_TEST_UTILS_H_
-#define FIREBASE_AUTH_CLIENT_CPP_TESTS_DESKTOP_TEST_UTILS_H_
+#ifndef FIREBASE_AUTH_TESTS_DESKTOP_TEST_UTILS_H_
+#define FIREBASE_AUTH_TESTS_DESKTOP_TEST_UTILS_H_
 
 #include "app/src/include/firebase/future.h"
 #include "auth/src/desktop/auth_desktop.h"
@@ -298,4 +298,4 @@ void WaitForFuture(
 }  // namespace auth
 }  // namespace firebase
 
-#endif  // FIREBASE_AUTH_CLIENT_CPP_TESTS_DESKTOP_TEST_UTILS_H_
+#endif  // FIREBASE_AUTH_TESTS_DESKTOP_TEST_UTILS_H_
diff --git a/database/src/android/data_snapshot_android.h b/database/src/android/data_snapshot_android.h
index f702f2dce7..cf8912cb4f 100644
--- a/database/src/android/data_snapshot_android.h
+++ b/database/src/android/data_snapshot_android.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_ANDROID_DATA_SNAPSHOT_ANDROID_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_ANDROID_DATA_SNAPSHOT_ANDROID_H_
+#ifndef FIREBASE_DATABASE_SRC_ANDROID_DATA_SNAPSHOT_ANDROID_H_
+#define FIREBASE_DATABASE_SRC_ANDROID_DATA_SNAPSHOT_ANDROID_H_
 
 #include <jni.h>
 #include <stddef.h>
@@ -122,4 +122,4 @@ class DataSnapshotInternal {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_ANDROID_DATA_SNAPSHOT_ANDROID_H_
+#endif  // FIREBASE_DATABASE_SRC_ANDROID_DATA_SNAPSHOT_ANDROID_H_
diff --git a/database/src/android/database_android.h b/database/src/android/database_android.h
index dfe7af85d5..02aa93828b 100644
--- a/database/src/android/database_android.h
+++ b/database/src/android/database_android.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_ANDROID_DATABASE_ANDROID_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_ANDROID_DATABASE_ANDROID_H_
+#ifndef FIREBASE_DATABASE_SRC_ANDROID_DATABASE_ANDROID_H_
+#define FIREBASE_DATABASE_SRC_ANDROID_DATABASE_ANDROID_H_
 
 #include <jni.h>
 
@@ -228,4 +228,4 @@ class DatabaseInternal {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_ANDROID_DATABASE_ANDROID_H_
+#endif  // FIREBASE_DATABASE_SRC_ANDROID_DATABASE_ANDROID_H_
diff --git a/database/src/android/database_reference_android.h b/database/src/android/database_reference_android.h
index 2f4975e974..a2a78ef33c 100644
--- a/database/src/android/database_reference_android.h
+++ b/database/src/android/database_reference_android.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_ANDROID_DATABASE_REFERENCE_ANDROID_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_ANDROID_DATABASE_REFERENCE_ANDROID_H_
+#ifndef FIREBASE_DATABASE_SRC_ANDROID_DATABASE_REFERENCE_ANDROID_H_
+#define FIREBASE_DATABASE_SRC_ANDROID_DATABASE_REFERENCE_ANDROID_H_
 
 #include <jni.h>
 
@@ -158,4 +158,4 @@ struct TransactionData {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_ANDROID_DATABASE_REFERENCE_ANDROID_H_
+#endif  // FIREBASE_DATABASE_SRC_ANDROID_DATABASE_REFERENCE_ANDROID_H_
diff --git a/database/src/android/disconnection_android.h b/database/src/android/disconnection_android.h
index 1b4469ed92..8ddb1b5f3e 100644
--- a/database/src/android/disconnection_android.h
+++ b/database/src/android/disconnection_android.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_ANDROID_DISCONNECTION_ANDROID_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_ANDROID_DISCONNECTION_ANDROID_H_
+#ifndef FIREBASE_DATABASE_SRC_ANDROID_DISCONNECTION_ANDROID_H_
+#define FIREBASE_DATABASE_SRC_ANDROID_DISCONNECTION_ANDROID_H_
 
 #include <jni.h>
 
@@ -104,4 +104,4 @@ class DisconnectionHandlerInternal {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_ANDROID_DISCONNECTION_ANDROID_H_
+#endif  // FIREBASE_DATABASE_SRC_ANDROID_DISCONNECTION_ANDROID_H_
diff --git a/database/src/android/mutable_data_android.h b/database/src/android/mutable_data_android.h
index 1d49376d9f..8e60cdcb1c 100644
--- a/database/src/android/mutable_data_android.h
+++ b/database/src/android/mutable_data_android.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_ANDROID_MUTABLE_DATA_ANDROID_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_ANDROID_MUTABLE_DATA_ANDROID_H_
+#ifndef FIREBASE_DATABASE_SRC_ANDROID_MUTABLE_DATA_ANDROID_H_
+#define FIREBASE_DATABASE_SRC_ANDROID_MUTABLE_DATA_ANDROID_H_
 
 #include <jni.h>
 
@@ -99,4 +99,4 @@ class MutableDataInternal {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_ANDROID_MUTABLE_DATA_ANDROID_H_
+#endif  // FIREBASE_DATABASE_SRC_ANDROID_MUTABLE_DATA_ANDROID_H_
diff --git a/database/src/android/query_android.h b/database/src/android/query_android.h
index 253ea3bc0b..585a66acda 100644
--- a/database/src/android/query_android.h
+++ b/database/src/android/query_android.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_ANDROID_QUERY_ANDROID_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_ANDROID_QUERY_ANDROID_H_
+#ifndef FIREBASE_DATABASE_SRC_ANDROID_QUERY_ANDROID_H_
+#define FIREBASE_DATABASE_SRC_ANDROID_QUERY_ANDROID_H_
 
 #include <jni.h>
 
@@ -134,4 +134,4 @@ class SingleValueListener : public ValueListener {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_ANDROID_QUERY_ANDROID_H_
+#endif  // FIREBASE_DATABASE_SRC_ANDROID_QUERY_ANDROID_H_
diff --git a/database/src/android/util_android.h b/database/src/android/util_android.h
index d9a5072f86..07fcae8e55 100644
--- a/database/src/android/util_android.h
+++ b/database/src/android/util_android.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_ANDROID_UTIL_ANDROID_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_ANDROID_UTIL_ANDROID_H_
+#ifndef FIREBASE_DATABASE_SRC_ANDROID_UTIL_ANDROID_H_
+#define FIREBASE_DATABASE_SRC_ANDROID_UTIL_ANDROID_H_
 
 #include <jni.h>
 
@@ -79,4 +79,4 @@ class Callbacks {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_ANDROID_UTIL_ANDROID_H_
+#endif  // FIREBASE_DATABASE_SRC_ANDROID_UTIL_ANDROID_H_
diff --git a/database/src/common/cleanup.h b/database/src/common/cleanup.h
index e584b64319..544b23ae57 100644
--- a/database/src/common/cleanup.h
+++ b/database/src/common/cleanup.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_COMMON_CLEANUP_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_COMMON_CLEANUP_H_
+#ifndef FIREBASE_DATABASE_SRC_COMMON_CLEANUP_H_
+#define FIREBASE_DATABASE_SRC_COMMON_CLEANUP_H_
 
 namespace firebase {
 namespace database {
@@ -46,4 +46,4 @@ struct CleanupFn {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_COMMON_CLEANUP_H_
+#endif  // FIREBASE_DATABASE_SRC_COMMON_CLEANUP_H_
diff --git a/database/src/common/database_reference.h b/database/src/common/database_reference.h
index 98e9c2206d..f4dff4d4cb 100644
--- a/database/src/common/database_reference.h
+++ b/database/src/common/database_reference.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_COMMON_DATABASE_REFERENCE_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_COMMON_DATABASE_REFERENCE_H_
+#ifndef FIREBASE_DATABASE_SRC_COMMON_DATABASE_REFERENCE_H_
+#define FIREBASE_DATABASE_SRC_COMMON_DATABASE_REFERENCE_H_
 
 #include "database/src/include/firebase/database/common.h"
 
@@ -47,4 +47,4 @@ inline bool IsValidPriority(const Variant& v) {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_COMMON_DATABASE_REFERENCE_H_
+#endif  // FIREBASE_DATABASE_SRC_COMMON_DATABASE_REFERENCE_H_
diff --git a/database/src/common/listener.h b/database/src/common/listener.h
index 1dfe5b6e31..345f0ebd49 100644
--- a/database/src/common/listener.h
+++ b/database/src/common/listener.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_COMMON_LISTENER_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_COMMON_LISTENER_H_
+#ifndef FIREBASE_DATABASE_SRC_COMMON_LISTENER_H_
+#define FIREBASE_DATABASE_SRC_COMMON_LISTENER_H_
 
 #include <algorithm>
 #include <map>
@@ -140,4 +140,4 @@ class ListenerCollection {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_COMMON_LISTENER_H_
+#endif  // FIREBASE_DATABASE_SRC_COMMON_LISTENER_H_
diff --git a/database/src/common/query.h b/database/src/common/query.h
index 11602f9076..9f7903275f 100644
--- a/database/src/common/query.h
+++ b/database/src/common/query.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_COMMON_QUERY_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_COMMON_QUERY_H_
+#ifndef FIREBASE_DATABASE_SRC_COMMON_QUERY_H_
+#define FIREBASE_DATABASE_SRC_COMMON_QUERY_H_
 
 namespace firebase {
 namespace database {
@@ -29,4 +29,4 @@ enum kQueryFn {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_COMMON_QUERY_H_
+#endif  // FIREBASE_DATABASE_SRC_COMMON_QUERY_H_
diff --git a/database/src/common/query_spec.h b/database/src/common/query_spec.h
index 71b8e9bb38..c07835f68d 100644
--- a/database/src/common/query_spec.h
+++ b/database/src/common/query_spec.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_COMMON_QUERY_SPEC_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_COMMON_QUERY_SPEC_H_
+#ifndef FIREBASE_DATABASE_SRC_COMMON_QUERY_SPEC_H_
+#define FIREBASE_DATABASE_SRC_COMMON_QUERY_SPEC_H_
 
 #include "app/src/include/firebase/variant.h"
 #include "app/src/optional.h"
@@ -166,4 +166,4 @@ struct QuerySpec {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_COMMON_QUERY_SPEC_H_
+#endif  // FIREBASE_DATABASE_SRC_COMMON_QUERY_SPEC_H_
diff --git a/database/src/desktop/connection/connection.h b/database/src/desktop/connection/connection.h
index b6ccfb8c64..ab9c15cbd6 100644
--- a/database/src/desktop/connection/connection.h
+++ b/database/src/desktop/connection/connection.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CONNECTION_CONNECTION_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CONNECTION_CONNECTION_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_CONNECTION_CONNECTION_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_CONNECTION_CONNECTION_H_
 
 #include <sstream>
 
@@ -240,4 +240,4 @@ class ConnectionEventHandler {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CONNECTION_CONNECTION_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_CONNECTION_CONNECTION_H_
diff --git a/database/src/desktop/connection/host_info.h b/database/src/desktop/connection/host_info.h
index dabf7e5069..7261c32e2e 100644
--- a/database/src/desktop/connection/host_info.h
+++ b/database/src/desktop/connection/host_info.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CONNECTION_HOST_INFO_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CONNECTION_HOST_INFO_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_CONNECTION_HOST_INFO_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_CONNECTION_HOST_INFO_H_
 #include <string>
 
 namespace firebase {
@@ -84,4 +84,4 @@ class HostInfo {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CONNECTION_HOST_INFO_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_CONNECTION_HOST_INFO_H_
diff --git a/database/src/desktop/connection/persistent_connection.h b/database/src/desktop/connection/persistent_connection.h
index 032479325f..b020c0eea3 100644
--- a/database/src/desktop/connection/persistent_connection.h
+++ b/database/src/desktop/connection/persistent_connection.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CONNECTION_PERSISTENT_CONNECTION_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CONNECTION_PERSISTENT_CONNECTION_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_CONNECTION_PERSISTENT_CONNECTION_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_CONNECTION_PERSISTENT_CONNECTION_H_
 
 #include <cassert>
 #include <map>
@@ -570,4 +570,4 @@ class PersistentConnectionEventHandler {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CONNECTION_PERSISTENT_CONNECTION_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_CONNECTION_PERSISTENT_CONNECTION_H_
diff --git a/database/src/desktop/connection/util_connection.h b/database/src/desktop/connection/util_connection.h
index c6b4aa771c..6ec7fef25e 100644
--- a/database/src/desktop/connection/util_connection.h
+++ b/database/src/desktop/connection/util_connection.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CONNECTION_UTIL_CONNECTION_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CONNECTION_UTIL_CONNECTION_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_CONNECTION_UTIL_CONNECTION_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_CONNECTION_UTIL_CONNECTION_H_
 #include "app/memory/unique_ptr.h"
 #include "app/src/logger.h"
 #include "app/src/scheduler.h"
@@ -37,4 +37,4 @@ UniquePtr<WebSocketClientInterface> CreateWebSocketClient(
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CONNECTION_UTIL_CONNECTION_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_CONNECTION_UTIL_CONNECTION_H_
diff --git a/database/src/desktop/connection/web_socket_client_impl.h b/database/src/desktop/connection/web_socket_client_impl.h
index c19ae74b3c..253e5ebb43 100644
--- a/database/src/desktop/connection/web_socket_client_impl.h
+++ b/database/src/desktop/connection/web_socket_client_impl.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CONNECTION_WEB_SOCKET_CLIENT_IMPL_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CONNECTION_WEB_SOCKET_CLIENT_IMPL_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_CONNECTION_WEB_SOCKET_CLIENT_IMPL_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_CONNECTION_WEB_SOCKET_CLIENT_IMPL_H_
 
 #include <queue>
 #include <string>
@@ -172,4 +172,4 @@ class WebSocketClientImpl : public WebSocketClientInterface {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CONNECTION_WEB_SOCKET_CLIENT_IMPL_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_CONNECTION_WEB_SOCKET_CLIENT_IMPL_H_
diff --git a/database/src/desktop/connection/web_socket_client_interface.h b/database/src/desktop/connection/web_socket_client_interface.h
index a00967890f..86b37f8ea8 100644
--- a/database/src/desktop/connection/web_socket_client_interface.h
+++ b/database/src/desktop/connection/web_socket_client_interface.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CONNECTION_WEB_SOCKET_CLIENT_INTERFACE_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CONNECTION_WEB_SOCKET_CLIENT_INTERFACE_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_CONNECTION_WEB_SOCKET_CLIENT_INTERFACE_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_CONNECTION_WEB_SOCKET_CLIENT_INTERFACE_H_
 
 #include <string>
 
@@ -74,4 +74,4 @@ class WebSocketClientEventHandler {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CONNECTION_WEB_SOCKET_CLIENT_INTERFACE_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_CONNECTION_WEB_SOCKET_CLIENT_INTERFACE_H_
diff --git a/database/src/desktop/core/cache_policy.h b/database/src/desktop/core/cache_policy.h
index ca8dcefb02..ad7b1963af 100644
--- a/database/src/desktop/core/cache_policy.h
+++ b/database/src/desktop/core/cache_policy.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_CACHE_POLICY_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_CACHE_POLICY_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_CORE_CACHE_POLICY_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_CORE_CACHE_POLICY_H_
 
 #include <cstdint>
 
@@ -60,4 +60,4 @@ class LRUCachePolicy : public CachePolicy {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_CACHE_POLICY_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_CORE_CACHE_POLICY_H_
diff --git a/database/src/desktop/core/child_event_registration.h b/database/src/desktop/core/child_event_registration.h
index 69d98a3b31..e7e1c8450f 100644
--- a/database/src/desktop/core/child_event_registration.h
+++ b/database/src/desktop/core/child_event_registration.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_CHILD_EVENT_REGISTRATION_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_CHILD_EVENT_REGISTRATION_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_CORE_CHILD_EVENT_REGISTRATION_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_CORE_CHILD_EVENT_REGISTRATION_H_
 
 #include "app/src/path.h"
 #include "database/src/common/query_spec.h"
@@ -58,4 +58,4 @@ class ChildEventRegistration : public EventRegistration {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_CHILD_EVENT_REGISTRATION_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_CORE_CHILD_EVENT_REGISTRATION_H_
diff --git a/database/src/desktop/core/compound_write.h b/database/src/desktop/core/compound_write.h
index 78197a7f5f..4faedd01be 100644
--- a/database/src/desktop/core/compound_write.h
+++ b/database/src/desktop/core/compound_write.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_COMPOUND_WRITE_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_COMPOUND_WRITE_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_CORE_COMPOUND_WRITE_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_CORE_COMPOUND_WRITE_H_
 
 #include <map>
 #include <string>
@@ -144,4 +144,4 @@ class CompoundWrite {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_COMPOUND_WRITE_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_CORE_COMPOUND_WRITE_H_
diff --git a/database/src/desktop/core/constants.h b/database/src/desktop/core/constants.h
index fdcdf890dd..13b9b48387 100644
--- a/database/src/desktop/core/constants.h
+++ b/database/src/desktop/core/constants.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_CONSTANTS_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_CONSTANTS_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_CORE_CONSTANTS_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_CORE_CONSTANTS_H_
 
 namespace firebase {
 namespace database {
@@ -28,4 +28,4 @@ extern const char kDotInfoConnected[];
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_CONSTANTS_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_CORE_CONSTANTS_H_
diff --git a/database/src/desktop/core/event_registration.h b/database/src/desktop/core/event_registration.h
index 69c43210a3..1ae49db979 100644
--- a/database/src/desktop/core/event_registration.h
+++ b/database/src/desktop/core/event_registration.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_EVENT_REGISTRATION_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_EVENT_REGISTRATION_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_CORE_EVENT_REGISTRATION_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_CORE_EVENT_REGISTRATION_H_
 
 #include "app/src/path.h"
 #include "database/src/common/query_spec.h"
@@ -99,4 +99,4 @@ class EventRegistration {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_EVENT_REGISTRATION_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_CORE_EVENT_REGISTRATION_H_
diff --git a/database/src/desktop/core/indexed_variant.h b/database/src/desktop/core/indexed_variant.h
index c8095a3a16..5b8c8fa47c 100644
--- a/database/src/desktop/core/indexed_variant.h
+++ b/database/src/desktop/core/indexed_variant.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_INDEXED_VARIANT_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_INDEXED_VARIANT_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_CORE_INDEXED_VARIANT_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_CORE_INDEXED_VARIANT_H_
 
 #include <set>
 
@@ -120,4 +120,4 @@ bool operator!=(const IndexedVariant& lhs, const IndexedVariant& rhs);
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_INDEXED_VARIANT_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_CORE_INDEXED_VARIANT_H_
diff --git a/database/src/desktop/core/info_listen_provider.h b/database/src/desktop/core/info_listen_provider.h
index 8d8f839dff..f183bcb612 100644
--- a/database/src/desktop/core/info_listen_provider.h
+++ b/database/src/desktop/core/info_listen_provider.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_INFO_LISTEN_PROVIDER_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_INFO_LISTEN_PROVIDER_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_CORE_INFO_LISTEN_PROVIDER_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_CORE_INFO_LISTEN_PROVIDER_H_
 
 #include "database/src/common/query_spec.h"
 #include "database/src/desktop/connection/persistent_connection.h"
@@ -49,4 +49,4 @@ class InfoListenProvider : public ListenProvider {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_INFO_LISTEN_PROVIDER_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_CORE_INFO_LISTEN_PROVIDER_H_
diff --git a/database/src/desktop/core/keep_synced_event_registration.h b/database/src/desktop/core/keep_synced_event_registration.h
index f92d37f2bf..6b3df90881 100644
--- a/database/src/desktop/core/keep_synced_event_registration.h
+++ b/database/src/desktop/core/keep_synced_event_registration.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_KEEP_SYNCED_EVENT_REGISTRATION_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_KEEP_SYNCED_EVENT_REGISTRATION_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_CORE_KEEP_SYNCED_EVENT_REGISTRATION_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_CORE_KEEP_SYNCED_EVENT_REGISTRATION_H_
 
 #include "app/src/path.h"
 #include "database/src/common/query_spec.h"
@@ -74,4 +74,4 @@ class KeepSyncedEventRegistration : public EventRegistration {
 }  // namespace internal
 }  // namespace database
 }  // namespace firebase
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_KEEP_SYNCED_EVENT_REGISTRATION_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_CORE_KEEP_SYNCED_EVENT_REGISTRATION_H_
diff --git a/database/src/desktop/core/listen_provider.h b/database/src/desktop/core/listen_provider.h
index feef358fa7..7772a3016e 100644
--- a/database/src/desktop/core/listen_provider.h
+++ b/database/src/desktop/core/listen_provider.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_LISTEN_PROVIDER_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_LISTEN_PROVIDER_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_CORE_LISTEN_PROVIDER_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_CORE_LISTEN_PROVIDER_H_
 
 #include "database/src/common/query_spec.h"
 #include "database/src/desktop/core/tag.h"
@@ -43,4 +43,4 @@ class ListenProvider {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_LISTEN_PROVIDER_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_CORE_LISTEN_PROVIDER_H_
diff --git a/database/src/desktop/core/operation.h b/database/src/desktop/core/operation.h
index d11d8971bb..f8356c7087 100644
--- a/database/src/desktop/core/operation.h
+++ b/database/src/desktop/core/operation.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_OPERATION_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_OPERATION_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_CORE_OPERATION_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_CORE_OPERATION_H_
 
 #include "app/src/assert.h"
 #include "app/src/optional.h"
@@ -134,4 +134,4 @@ Optional<Operation> OperationForChild(const Operation& op,
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_OPERATION_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_CORE_OPERATION_H_
diff --git a/database/src/desktop/core/repo.h b/database/src/desktop/core/repo.h
index 32afec0247..a9c272bf56 100644
--- a/database/src/desktop/core/repo.h
+++ b/database/src/desktop/core/repo.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_REPO_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_REPO_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_CORE_REPO_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_CORE_REPO_H_
 
 #include <vector>
 
@@ -201,4 +201,4 @@ class Repo : public connection::PersistentConnectionEventHandler {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_REPO_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_CORE_REPO_H_
diff --git a/database/src/desktop/core/server_values.h b/database/src/desktop/core/server_values.h
index 722494deeb..76c008d947 100644
--- a/database/src/desktop/core/server_values.h
+++ b/database/src/desktop/core/server_values.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_SERVER_VALUES_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_SERVER_VALUES_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_CORE_SERVER_VALUES_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_CORE_SERVER_VALUES_H_
 
 #include "app/src/include/firebase/variant.h"
 #include "database/src/desktop/core/compound_write.h"
@@ -41,4 +41,4 @@ CompoundWrite ResolveDeferredValueMerge(const CompoundWrite& merge,
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_SERVER_VALUES_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_CORE_SERVER_VALUES_H_
diff --git a/database/src/desktop/core/sparse_snapshot_tree.h b/database/src/desktop/core/sparse_snapshot_tree.h
index 5f7733890f..c777cbda6b 100644
--- a/database/src/desktop/core/sparse_snapshot_tree.h
+++ b/database/src/desktop/core/sparse_snapshot_tree.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_SPARSE_SNAPSHOT_TREE_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_SPARSE_SNAPSHOT_TREE_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_CORE_SPARSE_SNAPSHOT_TREE_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_CORE_SPARSE_SNAPSHOT_TREE_H_
 
 #include "app/src/include/firebase/variant.h"
 #include "app/src/path.h"
@@ -61,4 +61,4 @@ class SparseSnapshotTree {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_SPARSE_SNAPSHOT_TREE_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_CORE_SPARSE_SNAPSHOT_TREE_H_
diff --git a/database/src/desktop/core/sync_point.h b/database/src/desktop/core/sync_point.h
index 3ea6e6b073..1d5063cf5b 100644
--- a/database/src/desktop/core/sync_point.h
+++ b/database/src/desktop/core/sync_point.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_SYNC_POINT_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_SYNC_POINT_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_CORE_SYNC_POINT_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_CORE_SYNC_POINT_H_
 
 #include <set>
 #include <vector>
@@ -124,4 +124,4 @@ class SyncPoint {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_SYNC_POINT_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_CORE_SYNC_POINT_H_
diff --git a/database/src/desktop/core/sync_tree.h b/database/src/desktop/core/sync_tree.h
index c34161f2a3..c08c2d26ec 100644
--- a/database/src/desktop/core/sync_tree.h
+++ b/database/src/desktop/core/sync_tree.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_SYNC_TREE_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_SYNC_TREE_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_CORE_SYNC_TREE_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_CORE_SYNC_TREE_H_
 
 #include <vector>
 
@@ -218,4 +218,4 @@ class SyncTree {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_SYNC_TREE_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_CORE_SYNC_TREE_H_
diff --git a/database/src/desktop/core/tag.h b/database/src/desktop/core/tag.h
index da3d67142d..a1f731d720 100644
--- a/database/src/desktop/core/tag.h
+++ b/database/src/desktop/core/tag.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_TAG_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_TAG_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_CORE_TAG_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_CORE_TAG_H_
 
 #include <cstdint>
 
@@ -33,4 +33,4 @@ typedef Optional<int64_t> Tag;
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_TAG_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_CORE_TAG_H_
diff --git a/database/src/desktop/core/tracked_query_manager.h b/database/src/desktop/core/tracked_query_manager.h
index bcee21d7a9..9707714a74 100644
--- a/database/src/desktop/core/tracked_query_manager.h
+++ b/database/src/desktop/core/tracked_query_manager.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_TRACKED_QUERY_MANAGER_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_TRACKED_QUERY_MANAGER_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_CORE_TRACKED_QUERY_MANAGER_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_CORE_TRACKED_QUERY_MANAGER_H_
 
 #include <cstdint>
 #include <map>
@@ -214,4 +214,4 @@ class TrackedQueryManager : public TrackedQueryManagerInterface {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_TRACKED_QUERY_MANAGER_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_CORE_TRACKED_QUERY_MANAGER_H_
diff --git a/database/src/desktop/core/tree.h b/database/src/desktop/core/tree.h
index fb1d3c26c0..ce0ee203f9 100644
--- a/database/src/desktop/core/tree.h
+++ b/database/src/desktop/core/tree.h
@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_TREE_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_TREE_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_CORE_TREE_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_CORE_TREE_H_
 
 #include <map>
 #include <string>
@@ -553,4 +553,4 @@ class Tree {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_TREE_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_CORE_TREE_H_
diff --git a/database/src/desktop/core/value_event_registration.h b/database/src/desktop/core/value_event_registration.h
index 32394d31be..322a877270 100644
--- a/database/src/desktop/core/value_event_registration.h
+++ b/database/src/desktop/core/value_event_registration.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_VALUE_EVENT_REGISTRATION_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_VALUE_EVENT_REGISTRATION_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_CORE_VALUE_EVENT_REGISTRATION_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_CORE_VALUE_EVENT_REGISTRATION_H_
 
 #include "app/src/path.h"
 #include "database/src/common/query_spec.h"
@@ -58,4 +58,4 @@ class ValueEventRegistration : public EventRegistration {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_VALUE_EVENT_REGISTRATION_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_CORE_VALUE_EVENT_REGISTRATION_H_
diff --git a/database/src/desktop/core/web_socket_listen_provider.h b/database/src/desktop/core/web_socket_listen_provider.h
index 2bfee811e5..a3c7641a85 100644
--- a/database/src/desktop/core/web_socket_listen_provider.h
+++ b/database/src/desktop/core/web_socket_listen_provider.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_WEB_SOCKET_LISTEN_PROVIDER_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_WEB_SOCKET_LISTEN_PROVIDER_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_CORE_WEB_SOCKET_LISTEN_PROVIDER_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_CORE_WEB_SOCKET_LISTEN_PROVIDER_H_
 
 #include "database/src/common/query_spec.h"
 #include "database/src/desktop/connection/persistent_connection.h"
@@ -55,4 +55,4 @@ class WebSocketListenProvider : public ListenProvider {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_WEB_SOCKET_LISTEN_PROVIDER_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_CORE_WEB_SOCKET_LISTEN_PROVIDER_H_
diff --git a/database/src/desktop/core/write_tree.h b/database/src/desktop/core/write_tree.h
index 9d02f0a7d2..59770a05cb 100644
--- a/database/src/desktop/core/write_tree.h
+++ b/database/src/desktop/core/write_tree.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_WRITE_TREE_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_WRITE_TREE_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_CORE_WRITE_TREE_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_CORE_WRITE_TREE_H_
 
 #include <string>
 #include <utility>
@@ -253,4 +253,4 @@ class WriteTree {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_WRITE_TREE_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_CORE_WRITE_TREE_H_
diff --git a/database/src/desktop/data_snapshot_desktop.h b/database/src/desktop/data_snapshot_desktop.h
index ff120da1a9..a0c91fc42f 100644
--- a/database/src/desktop/data_snapshot_desktop.h
+++ b/database/src/desktop/data_snapshot_desktop.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_DATA_SNAPSHOT_DESKTOP_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_DATA_SNAPSHOT_DESKTOP_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_DATA_SNAPSHOT_DESKTOP_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_DATA_SNAPSHOT_DESKTOP_H_
 
 #include <stddef.h>
 
@@ -118,4 +118,4 @@ class DataSnapshotInternal {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_DATA_SNAPSHOT_DESKTOP_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_DATA_SNAPSHOT_DESKTOP_H_
diff --git a/database/src/desktop/database_desktop.h b/database/src/desktop/database_desktop.h
index fbeba3c91d..c0ec923fe0 100644
--- a/database/src/desktop/database_desktop.h
+++ b/database/src/desktop/database_desktop.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_DATABASE_DESKTOP_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_DATABASE_DESKTOP_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_DATABASE_DESKTOP_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_DATABASE_DESKTOP_H_
 
 #include <list>
 #include <memory>
@@ -190,4 +190,4 @@ class DatabaseInternal {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_DATABASE_DESKTOP_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_DATABASE_DESKTOP_H_
diff --git a/database/src/desktop/database_reference_desktop.h b/database/src/desktop/database_reference_desktop.h
index bb6f84b754..40b75131b9 100644
--- a/database/src/desktop/database_reference_desktop.h
+++ b/database/src/desktop/database_reference_desktop.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_DATABASE_REFERENCE_DESKTOP_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_DATABASE_REFERENCE_DESKTOP_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_DATABASE_REFERENCE_DESKTOP_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_DATABASE_REFERENCE_DESKTOP_H_
 
 #include <map>
 #include <string>
@@ -113,4 +113,4 @@ class DatabaseReferenceInternal : public QueryInternal {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_DATABASE_REFERENCE_DESKTOP_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_DATABASE_REFERENCE_DESKTOP_H_
diff --git a/database/src/desktop/disconnection_desktop.h b/database/src/desktop/disconnection_desktop.h
index 6433636c15..188c9461eb 100644
--- a/database/src/desktop/disconnection_desktop.h
+++ b/database/src/desktop/disconnection_desktop.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_DISCONNECTION_DESKTOP_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_DISCONNECTION_DESKTOP_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_DISCONNECTION_DESKTOP_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_DISCONNECTION_DESKTOP_H_
 
 #include "app/src/future_manager.h"
 #include "app/src/include/firebase/future.h"
@@ -95,4 +95,4 @@ class DisconnectionHandlerInternal {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_DISCONNECTION_DESKTOP_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_DISCONNECTION_DESKTOP_H_
diff --git a/database/src/desktop/mutable_data_desktop.h b/database/src/desktop/mutable_data_desktop.h
index 9d1879730f..77ac613b2b 100644
--- a/database/src/desktop/mutable_data_desktop.h
+++ b/database/src/desktop/mutable_data_desktop.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_MUTABLE_DATA_DESKTOP_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_MUTABLE_DATA_DESKTOP_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_MUTABLE_DATA_DESKTOP_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_MUTABLE_DATA_DESKTOP_H_
 
 #include <string>
 
@@ -98,4 +98,4 @@ class MutableDataInternal {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_MUTABLE_DATA_DESKTOP_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_MUTABLE_DATA_DESKTOP_H_
diff --git a/database/src/desktop/persistence/flatbuffer_conversions.h b/database/src/desktop/persistence/flatbuffer_conversions.h
index b53d3062cf..9a19466f18 100644
--- a/database/src/desktop/persistence/flatbuffer_conversions.h
+++ b/database/src/desktop/persistence/flatbuffer_conversions.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_PERSISTENCE_FLATBUFFER_CONVERSIONS_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_PERSISTENCE_FLATBUFFER_CONVERSIONS_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_PERSISTENCE_FLATBUFFER_CONVERSIONS_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_PERSISTENCE_FLATBUFFER_CONVERSIONS_H_
 
 #include "app/src/include/firebase/variant.h"
 #include "database/src/common/query_spec.h"
@@ -76,4 +76,4 @@ Variant FlexbufferVectorToVariant(const flexbuffers::Vector& vector);
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_PERSISTENCE_FLATBUFFER_CONVERSIONS_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_PERSISTENCE_FLATBUFFER_CONVERSIONS_H_
diff --git a/database/src/desktop/persistence/in_memory_persistence_storage_engine.h b/database/src/desktop/persistence/in_memory_persistence_storage_engine.h
index d9ab709273..fa21dbbcc3 100644
--- a/database/src/desktop/persistence/in_memory_persistence_storage_engine.h
+++ b/database/src/desktop/persistence/in_memory_persistence_storage_engine.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_PERSISTENCE_IN_MEMORY_PERSISTENCE_STORAGE_ENGINE_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_PERSISTENCE_IN_MEMORY_PERSISTENCE_STORAGE_ENGINE_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_PERSISTENCE_IN_MEMORY_PERSISTENCE_STORAGE_ENGINE_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_PERSISTENCE_IN_MEMORY_PERSISTENCE_STORAGE_ENGINE_H_
 
 #include "app/memory/unique_ptr.h"
 #include "app/src/include/firebase/variant.h"
@@ -187,4 +187,4 @@ class InMemoryPersistenceStorageEngine : public PersistenceStorageEngine {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_PERSISTENCE_IN_MEMORY_PERSISTENCE_STORAGE_ENGINE_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_PERSISTENCE_IN_MEMORY_PERSISTENCE_STORAGE_ENGINE_H_
diff --git a/database/src/desktop/persistence/level_db_persistence_storage_engine.h b/database/src/desktop/persistence/level_db_persistence_storage_engine.h
index 4794d4fb7c..b0506f8697 100644
--- a/database/src/desktop/persistence/level_db_persistence_storage_engine.h
+++ b/database/src/desktop/persistence/level_db_persistence_storage_engine.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_PERSISTENCE_LEVEL_DB_PERSISTENCE_STORAGE_ENGINE_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_PERSISTENCE_LEVEL_DB_PERSISTENCE_STORAGE_ENGINE_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_PERSISTENCE_LEVEL_DB_PERSISTENCE_STORAGE_ENGINE_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_PERSISTENCE_LEVEL_DB_PERSISTENCE_STORAGE_ENGINE_H_
 
 #include "app/memory/unique_ptr.h"
 #include "app/src/include/firebase/variant.h"
@@ -194,4 +194,4 @@ class LevelDbPersistenceStorageEngine : public PersistenceStorageEngine {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_PERSISTENCE_LEVEL_DB_PERSISTENCE_STORAGE_ENGINE_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_PERSISTENCE_LEVEL_DB_PERSISTENCE_STORAGE_ENGINE_H_
diff --git a/database/src/desktop/persistence/noop_persistence_manager.h b/database/src/desktop/persistence/noop_persistence_manager.h
index e56243266a..35abf21370 100644
--- a/database/src/desktop/persistence/noop_persistence_manager.h
+++ b/database/src/desktop/persistence/noop_persistence_manager.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_PERSISTENCE_NOOP_PERSISTENCE_MANAGER_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_PERSISTENCE_NOOP_PERSISTENCE_MANAGER_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_PERSISTENCE_NOOP_PERSISTENCE_MANAGER_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_PERSISTENCE_NOOP_PERSISTENCE_MANAGER_H_
 
 #include <functional>
 #include <set>
@@ -129,4 +129,4 @@ class NoopPersistenceManager : public PersistenceManagerInterface {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_PERSISTENCE_NOOP_PERSISTENCE_MANAGER_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_PERSISTENCE_NOOP_PERSISTENCE_MANAGER_H_
diff --git a/database/src/desktop/persistence/persistence_manager.h b/database/src/desktop/persistence/persistence_manager.h
index f52c5bfffa..bf5a85120c 100644
--- a/database/src/desktop/persistence/persistence_manager.h
+++ b/database/src/desktop/persistence/persistence_manager.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_PERSISTENCE_PERSISTENCE_MANAGER_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_PERSISTENCE_PERSISTENCE_MANAGER_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_PERSISTENCE_PERSISTENCE_MANAGER_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_PERSISTENCE_PERSISTENCE_MANAGER_H_
 
 #include <functional>
 #include <set>
@@ -143,4 +143,4 @@ class PersistenceManager : public PersistenceManagerInterface {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_PERSISTENCE_PERSISTENCE_MANAGER_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_PERSISTENCE_PERSISTENCE_MANAGER_H_
diff --git a/database/src/desktop/persistence/persistence_manager_interface.h b/database/src/desktop/persistence/persistence_manager_interface.h
index 5ce624ee5f..5611823ae4 100644
--- a/database/src/desktop/persistence/persistence_manager_interface.h
+++ b/database/src/desktop/persistence/persistence_manager_interface.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_PERSISTENCE_PERSISTENCE_MANAGER_INTERFACE_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_PERSISTENCE_PERSISTENCE_MANAGER_INTERFACE_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_PERSISTENCE_PERSISTENCE_MANAGER_INTERFACE_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_PERSISTENCE_PERSISTENCE_MANAGER_INTERFACE_H_
 
 #include <functional>
 #include <set>
@@ -114,4 +114,4 @@ class PersistenceManagerInterface {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_PERSISTENCE_PERSISTENCE_MANAGER_INTERFACE_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_PERSISTENCE_PERSISTENCE_MANAGER_INTERFACE_H_
diff --git a/database/src/desktop/persistence/persistence_storage_engine.h b/database/src/desktop/persistence/persistence_storage_engine.h
index dce5ac9aa6..7ccc2764a4 100644
--- a/database/src/desktop/persistence/persistence_storage_engine.h
+++ b/database/src/desktop/persistence/persistence_storage_engine.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_PERSISTENCE_PERSISTENCE_STORAGE_ENGINE_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_PERSISTENCE_PERSISTENCE_STORAGE_ENGINE_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_PERSISTENCE_PERSISTENCE_STORAGE_ENGINE_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_PERSISTENCE_PERSISTENCE_STORAGE_ENGINE_H_
 
 #include <cstdint>
 #include <set>
@@ -237,4 +237,4 @@ class PersistenceStorageEngine {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_PERSISTENCE_PERSISTENCE_STORAGE_ENGINE_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_PERSISTENCE_PERSISTENCE_STORAGE_ENGINE_H_
diff --git a/database/src/desktop/persistence/prune_forest.h b/database/src/desktop/persistence/prune_forest.h
index fbee02246b..1aca615f01 100644
--- a/database/src/desktop/persistence/prune_forest.h
+++ b/database/src/desktop/persistence/prune_forest.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_PERSISTENCE_PRUNE_FOREST_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_PERSISTENCE_PRUNE_FOREST_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_PERSISTENCE_PRUNE_FOREST_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_PERSISTENCE_PRUNE_FOREST_H_
 
 #include <set>
 #include <string>
@@ -126,4 +126,4 @@ class PruneForestRef {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_PERSISTENCE_PRUNE_FOREST_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_PERSISTENCE_PRUNE_FOREST_H_
diff --git a/database/src/desktop/push_child_name_generator.h b/database/src/desktop/push_child_name_generator.h
index 187119f406..fa31e9dc9d 100644
--- a/database/src/desktop/push_child_name_generator.h
+++ b/database/src/desktop/push_child_name_generator.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_PUSH_CHILD_NAME_GENERATOR_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_PUSH_CHILD_NAME_GENERATOR_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_PUSH_CHILD_NAME_GENERATOR_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_PUSH_CHILD_NAME_GENERATOR_H_
 
 #include <random>
 #include <string>
@@ -58,4 +58,4 @@ class PushChildNameGenerator {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_PUSH_CHILD_NAME_GENERATOR_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_PUSH_CHILD_NAME_GENERATOR_H_
diff --git a/database/src/desktop/query_desktop.h b/database/src/desktop/query_desktop.h
index d8361a832c..b0fe036018 100644
--- a/database/src/desktop/query_desktop.h
+++ b/database/src/desktop/query_desktop.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_QUERY_DESKTOP_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_QUERY_DESKTOP_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_QUERY_DESKTOP_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_QUERY_DESKTOP_H_
 
 #include <limits>
 #include <memory>
@@ -140,4 +140,4 @@ struct ChildListenerCleanupData {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_QUERY_DESKTOP_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_QUERY_DESKTOP_H_
diff --git a/database/src/desktop/query_params_comparator.h b/database/src/desktop/query_params_comparator.h
index dc548f22d8..c1a4fdb8c0 100644
--- a/database/src/desktop/query_params_comparator.h
+++ b/database/src/desktop/query_params_comparator.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_QUERY_PARAMS_COMPARATOR_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_QUERY_PARAMS_COMPARATOR_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_QUERY_PARAMS_COMPARATOR_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_QUERY_PARAMS_COMPARATOR_H_
 
 #include <map>
 
@@ -133,4 +133,4 @@ class QueryParamsLesser {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_QUERY_PARAMS_COMPARATOR_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_QUERY_PARAMS_COMPARATOR_H_
diff --git a/database/src/desktop/transaction_data.h b/database/src/desktop/transaction_data.h
index 75ea8d2e79..12873bb87a 100644
--- a/database/src/desktop/transaction_data.h
+++ b/database/src/desktop/transaction_data.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_TRANSACTION_DATA_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_TRANSACTION_DATA_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_TRANSACTION_DATA_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_TRANSACTION_DATA_H_
 
 #include <list>
 #include <queue>
@@ -134,4 +134,4 @@ typedef SharedPtr<TransactionData> TransactionDataPtr;
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_TRANSACTION_DATA_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_TRANSACTION_DATA_H_
diff --git a/database/src/desktop/util_desktop.h b/database/src/desktop/util_desktop.h
index 937545a37b..dde7d875b7 100644
--- a/database/src/desktop/util_desktop.h
+++ b/database/src/desktop/util_desktop.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_UTIL_DESKTOP_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_UTIL_DESKTOP_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_UTIL_DESKTOP_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_UTIL_DESKTOP_H_
 
 #include <string>
 
@@ -364,4 +364,4 @@ std::map<Path, Variant> VariantToPathMap(const Variant& data);
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_UTIL_DESKTOP_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_UTIL_DESKTOP_H_
diff --git a/database/src/desktop/view/change.h b/database/src/desktop/view/change.h
index 88db812aac..0606060adf 100644
--- a/database/src/desktop/view/change.h
+++ b/database/src/desktop/view/change.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_CHANGE_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_CHANGE_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_VIEW_CHANGE_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_VIEW_CHANGE_H_
 
 #include <string>
 
@@ -97,4 +97,4 @@ Change ChangeWithPrevName(const Change& change, const std::string& prev_name);
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_CHANGE_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_VIEW_CHANGE_H_
diff --git a/database/src/desktop/view/child_change_accumulator.h b/database/src/desktop/view/child_change_accumulator.h
index c247927141..a0c1b3e485 100644
--- a/database/src/desktop/view/child_change_accumulator.h
+++ b/database/src/desktop/view/child_change_accumulator.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_CHILD_CHANGE_ACCUMULATOR_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_CHILD_CHANGE_ACCUMULATOR_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_VIEW_CHILD_CHANGE_ACCUMULATOR_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_VIEW_CHILD_CHANGE_ACCUMULATOR_H_
 
 #include <map>
 #include <string>
@@ -45,4 +45,4 @@ void TrackChildChange(const Change& change,
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_CHILD_CHANGE_ACCUMULATOR_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_VIEW_CHILD_CHANGE_ACCUMULATOR_H_
diff --git a/database/src/desktop/view/event.h b/database/src/desktop/view/event.h
index 4897ada89c..2428692106 100644
--- a/database/src/desktop/view/event.h
+++ b/database/src/desktop/view/event.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_EVENT_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_EVENT_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_VIEW_EVENT_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_VIEW_EVENT_H_
 
 #include <string>
 
@@ -116,4 +116,4 @@ inline bool operator!=(const Event& lhs, const Event& rhs) {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_EVENT_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_VIEW_EVENT_H_
diff --git a/database/src/desktop/view/event_generator.h b/database/src/desktop/view/event_generator.h
index 9c21caf9b8..af4e515dca 100644
--- a/database/src/desktop/view/event_generator.h
+++ b/database/src/desktop/view/event_generator.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_EVENT_GENERATOR_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_EVENT_GENERATOR_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_VIEW_EVENT_GENERATOR_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_VIEW_EVENT_GENERATOR_H_
 
 #include <vector>
 
@@ -40,4 +40,4 @@ std::vector<Event> GenerateEventsForChanges(
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_EVENT_GENERATOR_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_VIEW_EVENT_GENERATOR_H_
diff --git a/database/src/desktop/view/event_type.h b/database/src/desktop/view/event_type.h
index eeed2d7c64..2aec0d8e2a 100644
--- a/database/src/desktop/view/event_type.h
+++ b/database/src/desktop/view/event_type.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_EVENT_TYPE_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_EVENT_TYPE_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_VIEW_EVENT_TYPE_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_VIEW_EVENT_TYPE_H_
 
 namespace firebase {
 namespace database {
@@ -36,4 +36,4 @@ enum EventType {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_EVENT_TYPE_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_VIEW_EVENT_TYPE_H_
diff --git a/database/src/desktop/view/indexed_filter.h b/database/src/desktop/view/indexed_filter.h
index f9851918e9..a78a76561b 100644
--- a/database/src/desktop/view/indexed_filter.h
+++ b/database/src/desktop/view/indexed_filter.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_INDEXED_FILTER_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_INDEXED_FILTER_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_VIEW_INDEXED_FILTER_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_VIEW_INDEXED_FILTER_H_
 
 #include <string>
 
@@ -61,4 +61,4 @@ class IndexedFilter : public VariantFilter {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_INDEXED_FILTER_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_VIEW_INDEXED_FILTER_H_
diff --git a/database/src/desktop/view/limited_filter.h b/database/src/desktop/view/limited_filter.h
index 02ddc4ac57..77404e07ff 100644
--- a/database/src/desktop/view/limited_filter.h
+++ b/database/src/desktop/view/limited_filter.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_LIMITED_FILTER_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_LIMITED_FILTER_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_VIEW_LIMITED_FILTER_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_VIEW_LIMITED_FILTER_H_
 
 #include <string>
 
@@ -67,4 +67,4 @@ class LimitedFilter : public VariantFilter {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_LIMITED_FILTER_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_VIEW_LIMITED_FILTER_H_
diff --git a/database/src/desktop/view/ranged_filter.h b/database/src/desktop/view/ranged_filter.h
index 2394dca2d6..f19ff6f6bb 100644
--- a/database/src/desktop/view/ranged_filter.h
+++ b/database/src/desktop/view/ranged_filter.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_RANGED_FILTER_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_RANGED_FILTER_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_VIEW_RANGED_FILTER_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_VIEW_RANGED_FILTER_H_
 
 #include <string>
 
@@ -72,4 +72,4 @@ class RangedFilter : public VariantFilter {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_RANGED_FILTER_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_VIEW_RANGED_FILTER_H_
diff --git a/database/src/desktop/view/variant_filter.h b/database/src/desktop/view/variant_filter.h
index 327e8c10ca..f8edccede0 100644
--- a/database/src/desktop/view/variant_filter.h
+++ b/database/src/desktop/view/variant_filter.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_VARIANT_FILTER_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_VARIANT_FILTER_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_VIEW_VARIANT_FILTER_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_VIEW_VARIANT_FILTER_H_
 
 #include "app/memory/unique_ptr.h"
 #include "app/src/include/firebase/variant.h"
@@ -92,4 +92,4 @@ class VariantFilter {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_VARIANT_FILTER_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_VIEW_VARIANT_FILTER_H_
diff --git a/database/src/desktop/view/view.h b/database/src/desktop/view/view.h
index 76ea16abc1..09fb3c715f 100644
--- a/database/src/desktop/view/view.h
+++ b/database/src/desktop/view/view.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_VIEW_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_VIEW_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_VIEW_VIEW_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_VIEW_VIEW_H_
 
 #include <vector>
 
@@ -120,4 +120,4 @@ class View {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_VIEW_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_VIEW_VIEW_H_
diff --git a/database/src/desktop/view/view_cache.h b/database/src/desktop/view/view_cache.h
index 5b5556037b..73e76e8324 100644
--- a/database/src/desktop/view/view_cache.h
+++ b/database/src/desktop/view/view_cache.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_VIEW_CACHE_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_VIEW_CACHE_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_VIEW_VIEW_CACHE_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_VIEW_VIEW_CACHE_H_
 
 #include "app/src/include/firebase/variant.h"
 #include "app/src/path.h"
@@ -164,4 +164,4 @@ inline bool operator!=(const ViewCache& lhs, const ViewCache& rhs) {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_VIEW_CACHE_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_VIEW_VIEW_CACHE_H_
diff --git a/database/src/desktop/view/view_processor.h b/database/src/desktop/view/view_processor.h
index c2a3ef373d..f04447fcc5 100644
--- a/database/src/desktop/view/view_processor.h
+++ b/database/src/desktop/view/view_processor.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_VIEW_PROCESSOR_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_VIEW_PROCESSOR_H_
+#ifndef FIREBASE_DATABASE_SRC_DESKTOP_VIEW_VIEW_PROCESSOR_H_
+#define FIREBASE_DATABASE_SRC_DESKTOP_VIEW_VIEW_PROCESSOR_H_
 
 #include "app/memory/unique_ptr.h"
 #include "app/src/path.h"
@@ -137,4 +137,4 @@ class ViewProcessor {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_VIEW_VIEW_PROCESSOR_H_
+#endif  // FIREBASE_DATABASE_SRC_DESKTOP_VIEW_VIEW_PROCESSOR_H_
diff --git a/database/src/include/firebase/database.h b/database/src/include/firebase/database.h
index 86b79dd41d..d0dc904c10 100644
--- a/database/src/include/firebase/database.h
+++ b/database/src/include/firebase/database.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DATABASE_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DATABASE_H_
+#ifndef FIREBASE_DATABASE_SRC_INCLUDE_FIREBASE_DATABASE_H_
+#define FIREBASE_DATABASE_SRC_INCLUDE_FIREBASE_DATABASE_H_
 
 #include "firebase/app.h"
 #include "firebase/database/common.h"
@@ -196,4 +196,4 @@ class Database {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DATABASE_H_
+#endif  // FIREBASE_DATABASE_SRC_INCLUDE_FIREBASE_DATABASE_H_
diff --git a/database/src/include/firebase/database/common.h b/database/src/include/firebase/database/common.h
index 4487c66591..2989727846 100644
--- a/database/src/include/firebase/database/common.h
+++ b/database/src/include/firebase/database/common.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DATABASE_COMMON_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DATABASE_COMMON_H_
+#ifndef FIREBASE_DATABASE_SRC_INCLUDE_FIREBASE_DATABASE_COMMON_H_
+#define FIREBASE_DATABASE_SRC_INCLUDE_FIREBASE_DATABASE_COMMON_H_
 
 #include "firebase/variant.h"
 
@@ -80,4 +80,4 @@ const Variant& ServerTimestamp();
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DATABASE_COMMON_H_
+#endif  // FIREBASE_DATABASE_SRC_INCLUDE_FIREBASE_DATABASE_COMMON_H_
diff --git a/database/src/include/firebase/database/data_snapshot.h b/database/src/include/firebase/database/data_snapshot.h
index 8abefe0055..cb83292a79 100644
--- a/database/src/include/firebase/database/data_snapshot.h
+++ b/database/src/include/firebase/database/data_snapshot.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DATABASE_DATA_SNAPSHOT_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DATABASE_DATA_SNAPSHOT_H_
+#ifndef FIREBASE_DATABASE_SRC_INCLUDE_FIREBASE_DATABASE_DATA_SNAPSHOT_H_
+#define FIREBASE_DATABASE_SRC_INCLUDE_FIREBASE_DATABASE_DATA_SNAPSHOT_H_
 
 #include <stddef.h>
 
@@ -202,4 +202,4 @@ class DataSnapshot {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DATABASE_DATA_SNAPSHOT_H_
+#endif  // FIREBASE_DATABASE_SRC_INCLUDE_FIREBASE_DATABASE_DATA_SNAPSHOT_H_
diff --git a/database/src/include/firebase/database/database_reference.h b/database/src/include/firebase/database/database_reference.h
index 0b00609ed9..f403dc24d8 100644
--- a/database/src/include/firebase/database/database_reference.h
+++ b/database/src/include/firebase/database/database_reference.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DATABASE_DATABASE_REFERENCE_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DATABASE_DATABASE_REFERENCE_H_
+#ifndef FIREBASE_DATABASE_SRC_INCLUDE_FIREBASE_DATABASE_DATABASE_REFERENCE_H_
+#define FIREBASE_DATABASE_SRC_INCLUDE_FIREBASE_DATABASE_DATABASE_REFERENCE_H_
 
 #include <map>
 #include <string>
@@ -473,4 +473,4 @@ bool operator==(const DatabaseReference& lhs, const DatabaseReference& rhs);
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DATABASE_DATABASE_REFERENCE_H_
+#endif  // FIREBASE_DATABASE_SRC_INCLUDE_FIREBASE_DATABASE_DATABASE_REFERENCE_H_
diff --git a/database/src/include/firebase/database/disconnection.h b/database/src/include/firebase/database/disconnection.h
index 05fc0f6b08..b21fa472e6 100644
--- a/database/src/include/firebase/database/disconnection.h
+++ b/database/src/include/firebase/database/disconnection.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DATABASE_DISCONNECTION_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DATABASE_DISCONNECTION_H_
+#ifndef FIREBASE_DATABASE_SRC_INCLUDE_FIREBASE_DATABASE_DISCONNECTION_H_
+#define FIREBASE_DATABASE_SRC_INCLUDE_FIREBASE_DATABASE_DISCONNECTION_H_
 
 #include "firebase/future.h"
 #include "firebase/internal/common.h"
@@ -153,4 +153,4 @@ class DisconnectionHandler {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DATABASE_DISCONNECTION_H_
+#endif  // FIREBASE_DATABASE_SRC_INCLUDE_FIREBASE_DATABASE_DISCONNECTION_H_
diff --git a/database/src/include/firebase/database/listener.h b/database/src/include/firebase/database/listener.h
index 51174d9423..fe13d92990 100644
--- a/database/src/include/firebase/database/listener.h
+++ b/database/src/include/firebase/database/listener.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DATABASE_LISTENER_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DATABASE_LISTENER_H_
+#ifndef FIREBASE_DATABASE_SRC_INCLUDE_FIREBASE_DATABASE_LISTENER_H_
+#define FIREBASE_DATABASE_SRC_INCLUDE_FIREBASE_DATABASE_LISTENER_H_
 
 #include "firebase/database/common.h"
 
@@ -109,4 +109,4 @@ class ChildListener {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DATABASE_LISTENER_H_
+#endif  // FIREBASE_DATABASE_SRC_INCLUDE_FIREBASE_DATABASE_LISTENER_H_
diff --git a/database/src/include/firebase/database/mutable_data.h b/database/src/include/firebase/database/mutable_data.h
index 4fc7b8e86e..cedfa159cc 100644
--- a/database/src/include/firebase/database/mutable_data.h
+++ b/database/src/include/firebase/database/mutable_data.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DATABASE_MUTABLE_DATA_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DATABASE_MUTABLE_DATA_H_
+#ifndef FIREBASE_DATABASE_SRC_INCLUDE_FIREBASE_DATABASE_MUTABLE_DATA_H_
+#define FIREBASE_DATABASE_SRC_INCLUDE_FIREBASE_DATABASE_MUTABLE_DATA_H_
 
 #include "firebase/internal/common.h"
 #include "firebase/variant.h"
@@ -162,4 +162,4 @@ class MutableData {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DATABASE_MUTABLE_DATA_H_
+#endif  // FIREBASE_DATABASE_SRC_INCLUDE_FIREBASE_DATABASE_MUTABLE_DATA_H_
diff --git a/database/src/include/firebase/database/query.h b/database/src/include/firebase/database/query.h
index 81f079a085..8611f4d147 100644
--- a/database/src/include/firebase/database/query.h
+++ b/database/src/include/firebase/database/query.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DATABASE_QUERY_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DATABASE_QUERY_H_
+#ifndef FIREBASE_DATABASE_SRC_INCLUDE_FIREBASE_DATABASE_QUERY_H_
+#define FIREBASE_DATABASE_SRC_INCLUDE_FIREBASE_DATABASE_QUERY_H_
 
 #include <string>
 #include "firebase/future.h"
@@ -353,4 +353,4 @@ bool operator==(const Query& lhs, const Query& rhs);
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DATABASE_QUERY_H_
+#endif  // FIREBASE_DATABASE_SRC_INCLUDE_FIREBASE_DATABASE_QUERY_H_
diff --git a/database/src/include/firebase/database/transaction.h b/database/src/include/firebase/database/transaction.h
index 9576d244a4..cb2dd33c59 100644
--- a/database/src/include/firebase/database/transaction.h
+++ b/database/src/include/firebase/database/transaction.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DATABASE_TRANSACTION_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DATABASE_TRANSACTION_H_
+#ifndef FIREBASE_DATABASE_SRC_INCLUDE_FIREBASE_DATABASE_TRANSACTION_H_
+#define FIREBASE_DATABASE_SRC_INCLUDE_FIREBASE_DATABASE_TRANSACTION_H_
 
 #include "firebase/database/common.h"
 #include "firebase/database/data_snapshot.h"
@@ -99,4 +99,4 @@ typedef std::function<TransactionResult(MutableData* data)>
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DATABASE_TRANSACTION_H_
+#endif  // FIREBASE_DATABASE_SRC_INCLUDE_FIREBASE_DATABASE_TRANSACTION_H_
diff --git a/database/src/ios/completion_block_ios.h b/database/src/ios/completion_block_ios.h
index a6808bef7f..7afeabd917 100644
--- a/database/src/ios/completion_block_ios.h
+++ b/database/src/ios/completion_block_ios.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_IOS_COMPLETION_BLOCK_IOS_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_IOS_COMPLETION_BLOCK_IOS_H_
+#ifndef FIREBASE_DATABASE_SRC_IOS_COMPLETION_BLOCK_IOS_H_
+#define FIREBASE_DATABASE_SRC_IOS_COMPLETION_BLOCK_IOS_H_
 
 #include "app/src/include/firebase/future.h"
 #include "app/src/reference_counted_future_impl.h"
@@ -55,4 +55,4 @@ CompletionBlock _Nonnull CreateCompletionBlock(SafeFutureHandle<void> handle,
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_IOS_COMPLETION_BLOCK_IOS_H_
+#endif  // FIREBASE_DATABASE_SRC_IOS_COMPLETION_BLOCK_IOS_H_
diff --git a/database/src/ios/data_snapshot_ios.h b/database/src/ios/data_snapshot_ios.h
index 848a0e22ff..41211f5193 100644
--- a/database/src/ios/data_snapshot_ios.h
+++ b/database/src/ios/data_snapshot_ios.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_IOS_DATA_SNAPSHOT_IOS_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_IOS_DATA_SNAPSHOT_IOS_H_
+#ifndef FIREBASE_DATABASE_SRC_IOS_DATA_SNAPSHOT_IOS_H_
+#define FIREBASE_DATABASE_SRC_IOS_DATA_SNAPSHOT_IOS_H_
 
 #include <stddef.h>
 #include <string>
@@ -126,4 +126,4 @@ class DataSnapshotInternal {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_IOS_DATA_SNAPSHOT_IOS_H_
+#endif  // FIREBASE_DATABASE_SRC_IOS_DATA_SNAPSHOT_IOS_H_
diff --git a/database/src/ios/database_ios.h b/database/src/ios/database_ios.h
index 6c1534b694..2cfab0837c 100644
--- a/database/src/ios/database_ios.h
+++ b/database/src/ios/database_ios.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_IOS_DATABASE_IOS_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_IOS_DATABASE_IOS_H_
+#ifndef FIREBASE_DATABASE_SRC_IOS_DATABASE_IOS_H_
+#define FIREBASE_DATABASE_SRC_IOS_DATABASE_IOS_H_
 
 #include <map>
 #include <set>
@@ -200,4 +200,4 @@ class DatabaseInternal {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_IOS_DATABASE_IOS_H_
+#endif  // FIREBASE_DATABASE_SRC_IOS_DATABASE_IOS_H_
diff --git a/database/src/ios/database_reference_ios.h b/database/src/ios/database_reference_ios.h
index d5928b1ddb..89cccb9539 100644
--- a/database/src/ios/database_reference_ios.h
+++ b/database/src/ios/database_reference_ios.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_IOS_DATABASE_REFERENCE_IOS_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_IOS_DATABASE_REFERENCE_IOS_H_
+#ifndef FIREBASE_DATABASE_SRC_IOS_DATABASE_REFERENCE_IOS_H_
+#define FIREBASE_DATABASE_SRC_IOS_DATABASE_REFERENCE_IOS_H_
 
 #include <map>
 #include <string>
@@ -189,4 +189,4 @@ class DatabaseReferenceInternal : public QueryInternal {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_IOS_DATABASE_REFERENCE_IOS_H_
+#endif  // FIREBASE_DATABASE_SRC_IOS_DATABASE_REFERENCE_IOS_H_
diff --git a/database/src/ios/disconnection_ios.h b/database/src/ios/disconnection_ios.h
index 2f76b1d76c..df4459431f 100644
--- a/database/src/ios/disconnection_ios.h
+++ b/database/src/ios/disconnection_ios.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_IOS_DISCONNECTION_IOS_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_IOS_DISCONNECTION_IOS_H_
+#ifndef FIREBASE_DATABASE_SRC_IOS_DISCONNECTION_IOS_H_
+#define FIREBASE_DATABASE_SRC_IOS_DISCONNECTION_IOS_H_
 
 #include "app/memory/unique_ptr.h"
 #include "app/src/include/firebase/future.h"
@@ -115,4 +115,4 @@ class DisconnectionHandlerInternal {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_IOS_DISCONNECTION_IOS_H_
+#endif  // FIREBASE_DATABASE_SRC_IOS_DISCONNECTION_IOS_H_
diff --git a/database/src/ios/mutable_data_ios.h b/database/src/ios/mutable_data_ios.h
index 4e5a45eeab..32526391fd 100644
--- a/database/src/ios/mutable_data_ios.h
+++ b/database/src/ios/mutable_data_ios.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_IOS_MUTABLE_DATA_IOS_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_IOS_MUTABLE_DATA_IOS_H_
+#ifndef FIREBASE_DATABASE_SRC_IOS_MUTABLE_DATA_IOS_H_
+#define FIREBASE_DATABASE_SRC_IOS_MUTABLE_DATA_IOS_H_
 
 #include <string>
 #include "app/memory/unique_ptr.h"
@@ -98,4 +98,4 @@ class MutableDataInternal {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_IOS_MUTABLE_DATA_IOS_H_
+#endif  // FIREBASE_DATABASE_SRC_IOS_MUTABLE_DATA_IOS_H_
diff --git a/database/src/ios/query_ios.h b/database/src/ios/query_ios.h
index d4c1577f83..c590c3f97f 100644
--- a/database/src/ios/query_ios.h
+++ b/database/src/ios/query_ios.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_IOS_QUERY_IOS_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_IOS_QUERY_IOS_H_
+#ifndef FIREBASE_DATABASE_SRC_IOS_QUERY_IOS_H_
+#define FIREBASE_DATABASE_SRC_IOS_QUERY_IOS_H_
 
 #include "app/memory/unique_ptr.h"
 #include "app/src/include/firebase/future.h"
@@ -250,4 +250,4 @@ class SingleValueListener : public ValueListener {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_IOS_QUERY_IOS_H_
+#endif  // FIREBASE_DATABASE_SRC_IOS_QUERY_IOS_H_
diff --git a/database/src/ios/util_ios.h b/database/src/ios/util_ios.h
index 55b80c3c55..cefb379854 100644
--- a/database/src/ios/util_ios.h
+++ b/database/src/ios/util_ios.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_SRC_IOS_UTIL_IOS_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_SRC_IOS_UTIL_IOS_H_
+#ifndef FIREBASE_DATABASE_SRC_IOS_UTIL_IOS_H_
+#define FIREBASE_DATABASE_SRC_IOS_UTIL_IOS_H_
 
 #import <Foundation/Foundation.h>
 
@@ -30,4 +30,4 @@ Error NSErrorToErrorCode(NSError* error);
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_IOS_UTIL_IOS_H_
+#endif  // FIREBASE_DATABASE_SRC_IOS_UTIL_IOS_H_
diff --git a/database/tests/desktop/test/matchers.h b/database/tests/desktop/test/matchers.h
index a28386347f..753d3c1135 100644
--- a/database/tests/desktop/test/matchers.h
+++ b/database/tests/desktop/test/matchers.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_TESTS_DESKTOP_TEST_MATCHERS_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_TESTS_DESKTOP_TEST_MATCHERS_H_
+#ifndef FIREBASE_DATABASE_TESTS_DESKTOP_TEST_MATCHERS_H_
+#define FIREBASE_DATABASE_TESTS_DESKTOP_TEST_MATCHERS_H_
 
 #include <utility>
 
@@ -38,4 +38,4 @@ MATCHER(SmartPtrRawPtrEq, "CheckSmartPtrRawPtrEq") {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_TESTS_DESKTOP_TEST_MATCHERS_H_
+#endif  // FIREBASE_DATABASE_TESTS_DESKTOP_TEST_MATCHERS_H_
diff --git a/database/tests/desktop/test/mock_cache_policy.h b/database/tests/desktop/test/mock_cache_policy.h
index b7d0c5b822..e085a83f49 100644
--- a/database/tests/desktop/test/mock_cache_policy.h
+++ b/database/tests/desktop/test/mock_cache_policy.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_TESTS_DESKTOP_TEST_MOCK_CACHE_POLICY_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_TESTS_DESKTOP_TEST_MOCK_CACHE_POLICY_H_
+#ifndef FIREBASE_DATABASE_TESTS_DESKTOP_TEST_MOCK_CACHE_POLICY_H_
+#define FIREBASE_DATABASE_TESTS_DESKTOP_TEST_MOCK_CACHE_POLICY_H_
 
 #include <cstdint>
 
@@ -42,4 +42,4 @@ class MockCachePolicy : public CachePolicy {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_TESTS_DESKTOP_TEST_MOCK_CACHE_POLICY_H_
+#endif  // FIREBASE_DATABASE_TESTS_DESKTOP_TEST_MOCK_CACHE_POLICY_H_
diff --git a/database/tests/desktop/test/mock_listen_provider.h b/database/tests/desktop/test/mock_listen_provider.h
index 600d7d6b08..2ef6056347 100644
--- a/database/tests/desktop/test/mock_listen_provider.h
+++ b/database/tests/desktop/test/mock_listen_provider.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_TESTS_DESKTOP_TEST_MOCK_LISTEN_PROVIDER_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_TESTS_DESKTOP_TEST_MOCK_LISTEN_PROVIDER_H_
+#ifndef FIREBASE_DATABASE_TESTS_DESKTOP_TEST_MOCK_LISTEN_PROVIDER_H_
+#define FIREBASE_DATABASE_TESTS_DESKTOP_TEST_MOCK_LISTEN_PROVIDER_H_
 
 #include "database/src/common/query_spec.h"
 #include "database/src/desktop/core/listen_provider.h"
@@ -37,4 +37,4 @@ class MockListenProvider : public ListenProvider {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_TESTS_DESKTOP_TEST_MOCK_LISTEN_PROVIDER_H_
+#endif  // FIREBASE_DATABASE_TESTS_DESKTOP_TEST_MOCK_LISTEN_PROVIDER_H_
diff --git a/database/tests/desktop/test/mock_listener.h b/database/tests/desktop/test/mock_listener.h
index 86f8a19eed..b8190d3a2a 100644
--- a/database/tests/desktop/test/mock_listener.h
+++ b/database/tests/desktop/test/mock_listener.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_TESTS_DESKTOP_TEST_MOCK_LISTENER_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_TESTS_DESKTOP_TEST_MOCK_LISTENER_H_
+#ifndef FIREBASE_DATABASE_TESTS_DESKTOP_TEST_MOCK_LISTENER_H_
+#define FIREBASE_DATABASE_TESTS_DESKTOP_TEST_MOCK_LISTENER_H_
 
 #include "database/src/desktop/data_snapshot_desktop.h"
 #include "database/src/include/firebase/database/common.h"
@@ -52,4 +52,4 @@ class MockChildListener : public ChildListener {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_TESTS_DESKTOP_TEST_MOCK_LISTENER_H_
+#endif  // FIREBASE_DATABASE_TESTS_DESKTOP_TEST_MOCK_LISTENER_H_
diff --git a/database/tests/desktop/test/mock_persistence_manager.h b/database/tests/desktop/test/mock_persistence_manager.h
index 3b5e5af12c..c2df7fa322 100644
--- a/database/tests/desktop/test/mock_persistence_manager.h
+++ b/database/tests/desktop/test/mock_persistence_manager.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_TESTS_DESKTOP_TEST_MOCK_PERSISTENCE_MANAGER_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_TESTS_DESKTOP_TEST_MOCK_PERSISTENCE_MANAGER_H_
+#ifndef FIREBASE_DATABASE_TESTS_DESKTOP_TEST_MOCK_PERSISTENCE_MANAGER_H_
+#define FIREBASE_DATABASE_TESTS_DESKTOP_TEST_MOCK_PERSISTENCE_MANAGER_H_
 
 #include "app/src/include/firebase/variant.h"
 #include "app/src/path.h"
@@ -74,4 +74,4 @@ class MockPersistenceManager : public PersistenceManager {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_TESTS_DESKTOP_TEST_MOCK_PERSISTENCE_MANAGER_H_
+#endif  // FIREBASE_DATABASE_TESTS_DESKTOP_TEST_MOCK_PERSISTENCE_MANAGER_H_
diff --git a/database/tests/desktop/test/mock_persistence_storage_engine.h b/database/tests/desktop/test/mock_persistence_storage_engine.h
index af4911315a..92a883d553 100644
--- a/database/tests/desktop/test/mock_persistence_storage_engine.h
+++ b/database/tests/desktop/test/mock_persistence_storage_engine.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_TESTS_DESKTOP_TEST_MOCK_PERSISTENCE_STORAGE_ENGINE_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_TESTS_DESKTOP_TEST_MOCK_PERSISTENCE_STORAGE_ENGINE_H_
+#ifndef FIREBASE_DATABASE_TESTS_DESKTOP_TEST_MOCK_PERSISTENCE_STORAGE_ENGINE_H_
+#define FIREBASE_DATABASE_TESTS_DESKTOP_TEST_MOCK_PERSISTENCE_STORAGE_ENGINE_H_
 
 #include <vector>
 
@@ -76,4 +76,4 @@ class MockPersistenceStorageEngine : public PersistenceStorageEngine {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_TESTS_DESKTOP_TEST_MOCK_PERSISTENCE_STORAGE_ENGINE_H_
+#endif  // FIREBASE_DATABASE_TESTS_DESKTOP_TEST_MOCK_PERSISTENCE_STORAGE_ENGINE_H_
diff --git a/database/tests/desktop/test/mock_tracked_query_manager.h b/database/tests/desktop/test/mock_tracked_query_manager.h
index 9b7ef776c5..11d75107d5 100644
--- a/database/tests/desktop/test/mock_tracked_query_manager.h
+++ b/database/tests/desktop/test/mock_tracked_query_manager.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_TESTS_DESKTOP_TEST_MOCK_TRACKED_QUERY_MANAGER_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_TESTS_DESKTOP_TEST_MOCK_TRACKED_QUERY_MANAGER_H_
+#ifndef FIREBASE_DATABASE_TESTS_DESKTOP_TEST_MOCK_TRACKED_QUERY_MANAGER_H_
+#define FIREBASE_DATABASE_TESTS_DESKTOP_TEST_MOCK_TRACKED_QUERY_MANAGER_H_
 
 #include "database/src/common/query_spec.h"
 #include "database/src/desktop/core/tracked_query_manager.h"
@@ -49,4 +49,4 @@ class MockTrackedQueryManager : public TrackedQueryManagerInterface {
 }  // namespace internal
 }  // namespace database
 }  // namespace firebase
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_TESTS_DESKTOP_TEST_MOCK_TRACKED_QUERY_MANAGER_H_
+#endif  // FIREBASE_DATABASE_TESTS_DESKTOP_TEST_MOCK_TRACKED_QUERY_MANAGER_H_
diff --git a/database/tests/desktop/test/mock_write_tree.h b/database/tests/desktop/test/mock_write_tree.h
index ab97391ad6..8d2281f063 100644
--- a/database/tests/desktop/test/mock_write_tree.h
+++ b/database/tests/desktop/test/mock_write_tree.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DATABASE_CLIENT_CPP_TESTS_DESKTOP_TEST_MOCK_WRITE_TREE_H_
-#define FIREBASE_DATABASE_CLIENT_CPP_TESTS_DESKTOP_TEST_MOCK_WRITE_TREE_H_
+#ifndef FIREBASE_DATABASE_TESTS_DESKTOP_TEST_MOCK_WRITE_TREE_H_
+#define FIREBASE_DATABASE_TESTS_DESKTOP_TEST_MOCK_WRITE_TREE_H_
 
 #include <string>
 #include <vector>
@@ -78,4 +78,4 @@ class MockWriteTree : public WriteTree {
 }  // namespace database
 }  // namespace firebase
 
-#endif  // FIREBASE_DATABASE_CLIENT_CPP_TESTS_DESKTOP_TEST_MOCK_WRITE_TREE_H_
+#endif  // FIREBASE_DATABASE_TESTS_DESKTOP_TEST_MOCK_WRITE_TREE_H_
diff --git a/dynamic_links/src/common.h b/dynamic_links/src/common.h
index 500b2a4dd0..290f4497d3 100644
--- a/dynamic_links/src/common.h
+++ b/dynamic_links/src/common.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DYNAMIC_LINKS_CLIENT_CPP_SRC_COMMON_H_
-#define FIREBASE_DYNAMIC_LINKS_CLIENT_CPP_SRC_COMMON_H_
+#ifndef FIREBASE_DYNAMIC_LINKS_SRC_COMMON_H_
+#define FIREBASE_DYNAMIC_LINKS_SRC_COMMON_H_
 
 #include "app/src/include/firebase/app.h"
 #include "app/src/reference_counted_future_impl.h"
@@ -54,4 +54,4 @@ void DestroyReceiver();
 }  // namespace dynamic_links
 }  // namespace firebase
 
-#endif  // FIREBASE_DYNAMIC_LINKS_CLIENT_CPP_SRC_COMMON_H_
+#endif  // FIREBASE_DYNAMIC_LINKS_SRC_COMMON_H_
diff --git a/dynamic_links/src/include/firebase/dynamic_links.h b/dynamic_links/src/include/firebase/dynamic_links.h
index a1ba65b229..7a96de679f 100644
--- a/dynamic_links/src/include/firebase/dynamic_links.h
+++ b/dynamic_links/src/include/firebase/dynamic_links.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DYNAMIC_LINKS_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DYNAMIC_LINKS_H_
-#define FIREBASE_DYNAMIC_LINKS_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DYNAMIC_LINKS_H_
+#ifndef FIREBASE_DYNAMIC_LINKS_SRC_INCLUDE_FIREBASE_DYNAMIC_LINKS_H_
+#define FIREBASE_DYNAMIC_LINKS_SRC_INCLUDE_FIREBASE_DYNAMIC_LINKS_H_
 
 #include <string>
 
@@ -114,4 +114,4 @@ void Fetch();
 }  // namespace dynamic_links
 }  // namespace firebase
 
-#endif  // FIREBASE_DYNAMIC_LINKS_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DYNAMIC_LINKS_H_
+#endif  // FIREBASE_DYNAMIC_LINKS_SRC_INCLUDE_FIREBASE_DYNAMIC_LINKS_H_
diff --git a/dynamic_links/src/include/firebase/dynamic_links/components.h b/dynamic_links/src/include/firebase/dynamic_links/components.h
index 2a1315eb24..7a8e8fa1a4 100644
--- a/dynamic_links/src/include/firebase/dynamic_links/components.h
+++ b/dynamic_links/src/include/firebase/dynamic_links/components.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_DYNAMIC_LINKS_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DYNAMIC_LINKS_COMPONENTS_H_
-#define FIREBASE_DYNAMIC_LINKS_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DYNAMIC_LINKS_COMPONENTS_H_
+#ifndef FIREBASE_DYNAMIC_LINKS_SRC_INCLUDE_FIREBASE_DYNAMIC_LINKS_COMPONENTS_H_
+#define FIREBASE_DYNAMIC_LINKS_SRC_INCLUDE_FIREBASE_DYNAMIC_LINKS_COMPONENTS_H_
 
 #include <cstring>
 #include <string>
@@ -333,4 +333,4 @@ Future<GeneratedDynamicLink> GetShortLinkLastResult();
 }  // namespace dynamic_links
 }  // namespace firebase
 
-#endif  // FIREBASE_DYNAMIC_LINKS_CLIENT_CPP_SRC_INCLUDE_FIREBASE_DYNAMIC_LINKS_COMPONENTS_H_
+#endif  // FIREBASE_DYNAMIC_LINKS_SRC_INCLUDE_FIREBASE_DYNAMIC_LINKS_COMPONENTS_H_
diff --git a/firestore/integration_test_internal/src/android/cancellation_token_source.h b/firestore/integration_test_internal/src/android/cancellation_token_source.h
index fb687f9494..d3d91bd941 100644
--- a/firestore/integration_test_internal/src/android/cancellation_token_source.h
+++ b/firestore/integration_test_internal/src/android/cancellation_token_source.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_TESTS_ANDROID_CANCELLATION_TOKEN_SOURCE_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_TESTS_ANDROID_CANCELLATION_TOKEN_SOURCE_H_
+#ifndef FIREBASE_FIRESTORE_INTEGRATION_TEST_INTERNAL_SRC_ANDROID_CANCELLATION_TOKEN_SOURCE_H_
+#define FIREBASE_FIRESTORE_INTEGRATION_TEST_INTERNAL_SRC_ANDROID_CANCELLATION_TOKEN_SOURCE_H_
 
 #include "firestore/src/jni/jni_fwd.h"
 #include "firestore/src/jni/object.h"
@@ -33,4 +33,4 @@ class CancellationTokenSource : public jni::Object {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_TESTS_ANDROID_CANCELLATION_TOKEN_SOURCE_H_
+#endif  // FIREBASE_FIRESTORE_INTEGRATION_TEST_INTERNAL_SRC_ANDROID_CANCELLATION_TOKEN_SOURCE_H_
diff --git a/firestore/integration_test_internal/src/android/firestore_integration_test_android.h b/firestore/integration_test_internal/src/android/firestore_integration_test_android.h
index 213b874fb7..26cb932352 100644
--- a/firestore/integration_test_internal/src/android/firestore_integration_test_android.h
+++ b/firestore/integration_test_internal/src/android/firestore_integration_test_android.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_TESTS_ANDROID_FIRESTORE_INTEGRATION_TEST_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_TESTS_ANDROID_FIRESTORE_INTEGRATION_TEST_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_INTEGRATION_TEST_INTERNAL_SRC_ANDROID_FIRESTORE_INTEGRATION_TEST_ANDROID_H_
+#define FIREBASE_FIRESTORE_INTEGRATION_TEST_INTERNAL_SRC_ANDROID_FIRESTORE_INTEGRATION_TEST_ANDROID_H_
 
 #include <iosfwd>
 #include <string>
@@ -89,4 +89,4 @@ class FirestoreAndroidIntegrationTest : public FirestoreIntegrationTest {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_TESTS_ANDROID_FIRESTORE_INTEGRATION_TEST_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_INTEGRATION_TEST_INTERNAL_SRC_ANDROID_FIRESTORE_INTEGRATION_TEST_ANDROID_H_
diff --git a/firestore/integration_test_internal/src/android/task_completion_source.h b/firestore/integration_test_internal/src/android/task_completion_source.h
index 9dfa6f9981..bf81fe705f 100644
--- a/firestore/integration_test_internal/src/android/task_completion_source.h
+++ b/firestore/integration_test_internal/src/android/task_completion_source.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_TESTS_ANDROID_TASK_COMPLETION_SOURCE_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_TESTS_ANDROID_TASK_COMPLETION_SOURCE_H_
+#ifndef FIREBASE_FIRESTORE_INTEGRATION_TEST_INTERNAL_SRC_ANDROID_TASK_COMPLETION_SOURCE_H_
+#define FIREBASE_FIRESTORE_INTEGRATION_TEST_INTERNAL_SRC_ANDROID_TASK_COMPLETION_SOURCE_H_
 
 #include <string>
 
@@ -46,4 +46,4 @@ class TaskCompletionSource : public jni::Object {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_TESTS_ANDROID_TASK_COMPLETION_SOURCE_H_
+#endif  // FIREBASE_FIRESTORE_INTEGRATION_TEST_INTERNAL_SRC_ANDROID_TASK_COMPLETION_SOURCE_H_
diff --git a/firestore/integration_test_internal/src/firestore_integration_test.h b/firestore/integration_test_internal/src/firestore_integration_test.h
index 779ec2a809..0abe4048e3 100644
--- a/firestore/integration_test_internal/src/firestore_integration_test.h
+++ b/firestore/integration_test_internal/src/firestore_integration_test.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_TESTS_FIRESTORE_INTEGRATION_TEST_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_TESTS_FIRESTORE_INTEGRATION_TEST_H_
+#ifndef FIREBASE_FIRESTORE_INTEGRATION_TEST_INTERNAL_SRC_FIRESTORE_INTEGRATION_TEST_H_
+#define FIREBASE_FIRESTORE_INTEGRATION_TEST_INTERNAL_SRC_FIRESTORE_INTEGRATION_TEST_H_
 
 #include <cstdio>
 #include <iostream>
@@ -354,4 +354,4 @@ class FirestoreIntegrationTest : public testing::Test {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_TESTS_FIRESTORE_INTEGRATION_TEST_H_
+#endif  // FIREBASE_FIRESTORE_INTEGRATION_TEST_INTERNAL_SRC_FIRESTORE_INTEGRATION_TEST_H_
diff --git a/firestore/integration_test_internal/src/util/bundle_builder.h b/firestore/integration_test_internal/src/util/bundle_builder.h
index 020932d1c5..0306d7ea39 100644
--- a/firestore/integration_test_internal/src/util/bundle_builder.h
+++ b/firestore/integration_test_internal/src/util/bundle_builder.h
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_TESTS_UTIL_BUNDLE_BUILDER_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_TESTS_UTIL_BUNDLE_BUILDER_H_
+#ifndef FIREBASE_FIRESTORE_INTEGRATION_TEST_INTERNAL_SRC_UTIL_BUNDLE_BUILDER_H_
+#define FIREBASE_FIRESTORE_INTEGRATION_TEST_INTERNAL_SRC_UTIL_BUNDLE_BUILDER_H_
 
 #include <string>
 
@@ -30,4 +30,4 @@ std::string CreateBundle(const std::string& project_id);
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_TESTS_UTIL_BUNDLE_BUILDER_H_
+#endif  // FIREBASE_FIRESTORE_INTEGRATION_TEST_INTERNAL_SRC_UTIL_BUNDLE_BUILDER_H_
diff --git a/firestore/integration_test_internal/src/util/event_accumulator.h b/firestore/integration_test_internal/src/util/event_accumulator.h
index dcbae32b9b..800d5537a5 100644
--- a/firestore/integration_test_internal/src/util/event_accumulator.h
+++ b/firestore/integration_test_internal/src/util/event_accumulator.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_TESTS_UTIL_EVENT_ACCUMULATOR_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_TESTS_UTIL_EVENT_ACCUMULATOR_H_
+#ifndef FIREBASE_FIRESTORE_INTEGRATION_TEST_INTERNAL_SRC_UTIL_EVENT_ACCUMULATOR_H_
+#define FIREBASE_FIRESTORE_INTEGRATION_TEST_INTERNAL_SRC_UTIL_EVENT_ACCUMULATOR_H_
 
 #include "firestore_integration_test.h"
 
@@ -110,4 +110,4 @@ class EventAccumulator {
 
 }  // namespace firestore
 }  // namespace firebase
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_TESTS_UTIL_EVENT_ACCUMULATOR_H_
+#endif  // FIREBASE_FIRESTORE_INTEGRATION_TEST_INTERNAL_SRC_UTIL_EVENT_ACCUMULATOR_H_
diff --git a/firestore/integration_test_internal/src/util/future_test_util.h b/firestore/integration_test_internal/src/util/future_test_util.h
index 41953d18f9..6d61ca375a 100644
--- a/firestore/integration_test_internal/src/util/future_test_util.h
+++ b/firestore/integration_test_internal/src/util/future_test_util.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_TESTS_UTIL_FUTURE_TEST_UTIL_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_TESTS_UTIL_FUTURE_TEST_UTIL_H_
+#ifndef FIREBASE_FIRESTORE_INTEGRATION_TEST_INTERNAL_SRC_UTIL_FUTURE_TEST_UTIL_H_
+#define FIREBASE_FIRESTORE_INTEGRATION_TEST_INTERNAL_SRC_UTIL_FUTURE_TEST_UTIL_H_
 
 #include <iosfwd>
 #include <string>
@@ -34,4 +34,4 @@ std::string ToEnumeratorName(FutureStatus status);
 
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_TESTS_UTIL_FUTURE_TEST_UTIL_H_
+#endif  // FIREBASE_FIRESTORE_INTEGRATION_TEST_INTERNAL_SRC_UTIL_FUTURE_TEST_UTIL_H_
diff --git a/firestore/src/android/blob_android.h b/firestore/src/android/blob_android.h
index 22788f7864..617b3d811f 100644
--- a/firestore/src/android/blob_android.h
+++ b/firestore/src/android/blob_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_BLOB_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_BLOB_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_BLOB_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_BLOB_ANDROID_H_
 
 #include "firestore/src/jni/jni_fwd.h"
 #include "firestore/src/jni/object.h"
@@ -27,4 +27,4 @@ class BlobInternal : public jni::Object {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_BLOB_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_BLOB_ANDROID_H_
diff --git a/firestore/src/android/collection_reference_android.h b/firestore/src/android/collection_reference_android.h
index 9efa5e432d..be66a6e65c 100644
--- a/firestore/src/android/collection_reference_android.h
+++ b/firestore/src/android/collection_reference_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_COLLECTION_REFERENCE_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_COLLECTION_REFERENCE_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_COLLECTION_REFERENCE_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_COLLECTION_REFERENCE_ANDROID_H_
 
 #include "firestore/src/android/firestore_android.h"
 #include "firestore/src/android/query_android.h"
@@ -42,4 +42,4 @@ class CollectionReferenceInternal : public QueryInternal {
 
 }  // namespace firestore
 }  // namespace firebase
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_COLLECTION_REFERENCE_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_COLLECTION_REFERENCE_ANDROID_H_
diff --git a/firestore/src/android/converter_android.h b/firestore/src/android/converter_android.h
index 0378ab8732..cbd509bf5e 100644
--- a/firestore/src/android/converter_android.h
+++ b/firestore/src/android/converter_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_CONVERTER_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_CONVERTER_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_CONVERTER_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_CONVERTER_ANDROID_H_
 
 #include "app/meta/move.h"
 #include "firestore/src/common/type_mapping.h"
@@ -89,4 +89,4 @@ InternalT* GetInternal(PublicT& from) {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_CONVERTER_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_CONVERTER_ANDROID_H_
diff --git a/firestore/src/android/direction_android.h b/firestore/src/android/direction_android.h
index 19211a3282..fdef8288f2 100644
--- a/firestore/src/android/direction_android.h
+++ b/firestore/src/android/direction_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_DIRECTION_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_DIRECTION_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_DIRECTION_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_DIRECTION_ANDROID_H_
 
 #include "firestore/src/android/query_android.h"
 #include "firestore/src/jni/jni_fwd.h"
@@ -20,4 +20,4 @@ class DirectionInternal {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_DIRECTION_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_DIRECTION_ANDROID_H_
diff --git a/firestore/src/android/document_change_android.h b/firestore/src/android/document_change_android.h
index 384a7bb021..0436f6b7e0 100644
--- a/firestore/src/android/document_change_android.h
+++ b/firestore/src/android/document_change_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_DOCUMENT_CHANGE_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_DOCUMENT_CHANGE_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_DOCUMENT_CHANGE_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_DOCUMENT_CHANGE_ANDROID_H_
 
 #include <cstdint>
 
@@ -27,4 +27,4 @@ class DocumentChangeInternal : public Wrapper {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_DOCUMENT_CHANGE_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_DOCUMENT_CHANGE_ANDROID_H_
diff --git a/firestore/src/android/document_change_type_android.h b/firestore/src/android/document_change_type_android.h
index d51de389d2..f0eca21ece 100644
--- a/firestore/src/android/document_change_type_android.h
+++ b/firestore/src/android/document_change_type_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_DOCUMENT_CHANGE_TYPE_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_DOCUMENT_CHANGE_TYPE_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_DOCUMENT_CHANGE_TYPE_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_DOCUMENT_CHANGE_TYPE_ANDROID_H_
 
 #include "firestore/src/include/firebase/firestore/document_change.h"
 #include "firestore/src/jni/jni_fwd.h"
@@ -22,4 +22,4 @@ class DocumentChangeTypeInternal : public jni::Object {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_DOCUMENT_CHANGE_TYPE_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_DOCUMENT_CHANGE_TYPE_ANDROID_H_
diff --git a/firestore/src/android/document_reference_android.h b/firestore/src/android/document_reference_android.h
index f8dac60d12..c64f153a3a 100644
--- a/firestore/src/android/document_reference_android.h
+++ b/firestore/src/android/document_reference_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_DOCUMENT_REFERENCE_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_DOCUMENT_REFERENCE_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_DOCUMENT_REFERENCE_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_DOCUMENT_REFERENCE_ANDROID_H_
 
 #include <string>
 
@@ -187,4 +187,4 @@ class DocumentReferenceInternal : public Wrapper {
 
 }  // namespace firestore
 }  // namespace firebase
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_DOCUMENT_REFERENCE_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_DOCUMENT_REFERENCE_ANDROID_H_
diff --git a/firestore/src/android/document_snapshot_android.h b/firestore/src/android/document_snapshot_android.h
index d7dac31d92..fc3ebd3b76 100644
--- a/firestore/src/android/document_snapshot_android.h
+++ b/firestore/src/android/document_snapshot_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_DOCUMENT_SNAPSHOT_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_DOCUMENT_SNAPSHOT_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_DOCUMENT_SNAPSHOT_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_DOCUMENT_SNAPSHOT_ANDROID_H_
 
 #include <string>
 
@@ -52,4 +52,4 @@ class DocumentSnapshotInternal : public Wrapper {
 
 }  // namespace firestore
 }  // namespace firebase
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_DOCUMENT_SNAPSHOT_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_DOCUMENT_SNAPSHOT_ANDROID_H_
diff --git a/firestore/src/android/event_listener_android.h b/firestore/src/android/event_listener_android.h
index e9536ab1d7..d64ffabd35 100644
--- a/firestore/src/android/event_listener_android.h
+++ b/firestore/src/android/event_listener_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_EVENT_LISTENER_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_EVENT_LISTENER_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_EVENT_LISTENER_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_EVENT_LISTENER_ANDROID_H_
 
 #include "firestore/src/android/firestore_android.h"
 #include "firestore/src/common/event_listener.h"
@@ -70,4 +70,4 @@ class EventListenerInternal {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_EVENT_LISTENER_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_EVENT_LISTENER_ANDROID_H_
diff --git a/firestore/src/android/exception_android.h b/firestore/src/android/exception_android.h
index c8353a2042..1a88f3d7fa 100644
--- a/firestore/src/android/exception_android.h
+++ b/firestore/src/android/exception_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_EXCEPTION_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_EXCEPTION_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_EXCEPTION_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_EXCEPTION_ANDROID_H_
 
 #include <string>
 
@@ -46,4 +46,4 @@ void GlobalUnhandledExceptionHandler(jni::Env& env,
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_EXCEPTION_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_EXCEPTION_ANDROID_H_
diff --git a/firestore/src/android/field_path_android.h b/firestore/src/android/field_path_android.h
index 020fac0704..5c064134d5 100644
--- a/firestore/src/android/field_path_android.h
+++ b/firestore/src/android/field_path_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_FIELD_PATH_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_FIELD_PATH_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_FIELD_PATH_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_FIELD_PATH_ANDROID_H_
 
 #include "firestore/src/include/firebase/firestore/field_path.h"
 #include "firestore/src/jni/jni_fwd.h"
@@ -26,4 +26,4 @@ class FieldPathConverter {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_FIELD_PATH_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_FIELD_PATH_ANDROID_H_
diff --git a/firestore/src/android/field_path_portable.h b/firestore/src/android/field_path_portable.h
index 0be3122511..c53df948b1 100644
--- a/firestore/src/android/field_path_portable.h
+++ b/firestore/src/android/field_path_portable.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_FIELD_PATH_PORTABLE_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_FIELD_PATH_PORTABLE_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_FIELD_PATH_PORTABLE_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_FIELD_PATH_PORTABLE_H_
 
 #include <string>
 #include <vector>
@@ -88,4 +88,4 @@ class FieldPathPortable {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_FIELD_PATH_PORTABLE_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_FIELD_PATH_PORTABLE_H_
diff --git a/firestore/src/android/field_value_android.h b/firestore/src/android/field_value_android.h
index 07d7438c6e..ef06973dd5 100644
--- a/firestore/src/android/field_value_android.h
+++ b/firestore/src/android/field_value_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_FIELD_VALUE_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_FIELD_VALUE_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_FIELD_VALUE_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_FIELD_VALUE_ANDROID_H_
 
 #include <cstdint>
 #include <memory>
@@ -120,4 +120,4 @@ inline jobject ToJni(const FieldValueInternal& value) {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_FIELD_VALUE_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_FIELD_VALUE_ANDROID_H_
diff --git a/firestore/src/android/firestore_android.h b/firestore/src/android/firestore_android.h
index dd9ab1766c..c270aa87dc 100644
--- a/firestore/src/android/firestore_android.h
+++ b/firestore/src/android/firestore_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_FIRESTORE_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_FIRESTORE_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_FIRESTORE_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_FIRESTORE_ANDROID_H_
 
 #include <cstdint>
 #include <functional>
@@ -199,4 +199,4 @@ class FirestoreInternal {
 
 }  // namespace firestore
 }  // namespace firebase
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_FIRESTORE_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_FIRESTORE_ANDROID_H_
diff --git a/firestore/src/android/geo_point_android.h b/firestore/src/android/geo_point_android.h
index cd4ca275f0..444ae8ad22 100644
--- a/firestore/src/android/geo_point_android.h
+++ b/firestore/src/android/geo_point_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_GEO_POINT_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_GEO_POINT_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_GEO_POINT_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_GEO_POINT_ANDROID_H_
 
 #include "firebase/firestore/geo_point.h"
 #include "firestore/src/jni/jni_fwd.h"
@@ -29,4 +29,4 @@ class GeoPointInternal : public jni::Object {
 
 }  // namespace firestore
 }  // namespace firebase
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_GEO_POINT_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_GEO_POINT_ANDROID_H_
diff --git a/firestore/src/android/jni_runnable_android.h b/firestore/src/android/jni_runnable_android.h
index bd64d34bb1..d4faf0b0e8 100644
--- a/firestore/src/android/jni_runnable_android.h
+++ b/firestore/src/android/jni_runnable_android.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_JNI_RUNNABLE_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_JNI_RUNNABLE_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_JNI_RUNNABLE_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_JNI_RUNNABLE_ANDROID_H_
 
 #include "app/meta/move.h"
 #include "firestore/src/jni/jni_fwd.h"
@@ -156,4 +156,4 @@ JniRunnable<CallbackT> MakeJniRunnable(jni::Env& env, CallbackT callback) {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_JNI_RUNNABLE_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_JNI_RUNNABLE_ANDROID_H_
diff --git a/firestore/src/android/lambda_event_listener.h b/firestore/src/android/lambda_event_listener.h
index 86d8fc61f4..78c0d680ac 100644
--- a/firestore/src/android/lambda_event_listener.h
+++ b/firestore/src/android/lambda_event_listener.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_LAMBDA_EVENT_LISTENER_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_LAMBDA_EVENT_LISTENER_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_LAMBDA_EVENT_LISTENER_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_LAMBDA_EVENT_LISTENER_H_
 
 #include <functional>
 
@@ -52,4 +52,4 @@ class LambdaEventListener<void> : public EventListener<void> {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_LAMBDA_EVENT_LISTENER_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_LAMBDA_EVENT_LISTENER_H_
diff --git a/firestore/src/android/lambda_transaction_function.h b/firestore/src/android/lambda_transaction_function.h
index c98b8c5e46..3fde24229d 100644
--- a/firestore/src/android/lambda_transaction_function.h
+++ b/firestore/src/android/lambda_transaction_function.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_LAMBDA_TRANSACTION_FUNCTION_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_LAMBDA_TRANSACTION_FUNCTION_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_LAMBDA_TRANSACTION_FUNCTION_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_LAMBDA_TRANSACTION_FUNCTION_H_
 
 #include <functional>
 #include <string>
@@ -53,4 +53,4 @@ class LambdaTransactionFunction
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_LAMBDA_TRANSACTION_FUNCTION_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_LAMBDA_TRANSACTION_FUNCTION_H_
diff --git a/firestore/src/android/listener_registration_android.h b/firestore/src/android/listener_registration_android.h
index d290e96414..6896921135 100644
--- a/firestore/src/android/listener_registration_android.h
+++ b/firestore/src/android/listener_registration_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_LISTENER_REGISTRATION_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_LISTENER_REGISTRATION_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_LISTENER_REGISTRATION_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_LISTENER_REGISTRATION_ANDROID_H_
 
 #include "firestore/src/android/firestore_android.h"
 #include "firestore/src/common/event_listener.h"
@@ -78,4 +78,4 @@ class ListenerRegistrationInternal {
 
 }  // namespace firestore
 }  // namespace firebase
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_LISTENER_REGISTRATION_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_LISTENER_REGISTRATION_ANDROID_H_
diff --git a/firestore/src/android/load_bundle_task_android.h b/firestore/src/android/load_bundle_task_android.h
index 3a9228955e..a1a939f8cb 100644
--- a/firestore/src/android/load_bundle_task_android.h
+++ b/firestore/src/android/load_bundle_task_android.h
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_LOAD_BUNDLE_TASK_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_LOAD_BUNDLE_TASK_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_LOAD_BUNDLE_TASK_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_LOAD_BUNDLE_TASK_ANDROID_H_
 
 #include "firestore/src/android/wrapper.h"
 #include "firestore/src/jni/env.h"
@@ -39,4 +39,4 @@ class LoadBundleTaskInternal : public jni::Task {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_LOAD_BUNDLE_TASK_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_LOAD_BUNDLE_TASK_ANDROID_H_
diff --git a/firestore/src/android/load_bundle_task_progress_android.h b/firestore/src/android/load_bundle_task_progress_android.h
index 4597374a8a..c4165fc66a 100644
--- a/firestore/src/android/load_bundle_task_progress_android.h
+++ b/firestore/src/android/load_bundle_task_progress_android.h
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_LOAD_BUNDLE_TASK_PROGRESS_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_LOAD_BUNDLE_TASK_PROGRESS_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_LOAD_BUNDLE_TASK_PROGRESS_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_LOAD_BUNDLE_TASK_PROGRESS_ANDROID_H_
 
 #include <stdint.h>
 
@@ -54,4 +54,4 @@ class LoadBundleTaskProgressInternal : public Wrapper {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_LOAD_BUNDLE_TASK_PROGRESS_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_LOAD_BUNDLE_TASK_PROGRESS_ANDROID_H_
diff --git a/firestore/src/android/metadata_changes_android.h b/firestore/src/android/metadata_changes_android.h
index 64c5e79b6b..922e400e22 100644
--- a/firestore/src/android/metadata_changes_android.h
+++ b/firestore/src/android/metadata_changes_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_METADATA_CHANGES_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_METADATA_CHANGES_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_METADATA_CHANGES_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_METADATA_CHANGES_ANDROID_H_
 
 #include "firestore/src/include/firebase/firestore/metadata_changes.h"
 #include "firestore/src/jni/jni_fwd.h"
@@ -20,4 +20,4 @@ class MetadataChangesInternal {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_METADATA_CHANGES_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_METADATA_CHANGES_ANDROID_H_
diff --git a/firestore/src/android/promise_android.h b/firestore/src/android/promise_android.h
index 004d4b4973..c7deb144a8 100644
--- a/firestore/src/android/promise_android.h
+++ b/firestore/src/android/promise_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_PROMISE_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_PROMISE_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_PROMISE_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_PROMISE_ANDROID_H_
 
 #include <jni.h>
 #include <memory>
@@ -203,4 +203,4 @@ class Promise {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_PROMISE_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_PROMISE_ANDROID_H_
diff --git a/firestore/src/android/promise_factory_android.h b/firestore/src/android/promise_factory_android.h
index d9ae513c4b..3e9a98b957 100644
--- a/firestore/src/android/promise_factory_android.h
+++ b/firestore/src/android/promise_factory_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_PROMISE_FACTORY_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_PROMISE_FACTORY_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_PROMISE_FACTORY_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_PROMISE_FACTORY_ANDROID_H_
 
 #include "firestore/src/android/promise_android.h"
 #include "firestore/src/common/type_mapping.h"
@@ -75,4 +75,4 @@ class PromiseFactory {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_PROMISE_FACTORY_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_PROMISE_FACTORY_ANDROID_H_
diff --git a/firestore/src/android/query_android.h b/firestore/src/android/query_android.h
index f70ebbf847..4c2516fff9 100644
--- a/firestore/src/android/query_android.h
+++ b/firestore/src/android/query_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_QUERY_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_QUERY_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_QUERY_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_QUERY_ANDROID_H_
 
 #include <cstdint>
 
@@ -398,4 +398,4 @@ inline bool operator!=(const QueryInternal& lhs, const QueryInternal& rhs) {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_QUERY_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_QUERY_ANDROID_H_
diff --git a/firestore/src/android/query_snapshot_android.h b/firestore/src/android/query_snapshot_android.h
index 5242786310..728563ffec 100644
--- a/firestore/src/android/query_snapshot_android.h
+++ b/firestore/src/android/query_snapshot_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_QUERY_SNAPSHOT_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_QUERY_SNAPSHOT_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_QUERY_SNAPSHOT_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_QUERY_SNAPSHOT_ANDROID_H_
 
 #include <cstddef>
 #include <vector>
@@ -68,4 +68,4 @@ class QuerySnapshotInternal : public Wrapper {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_QUERY_SNAPSHOT_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_QUERY_SNAPSHOT_ANDROID_H_
diff --git a/firestore/src/android/server_timestamp_behavior_android.h b/firestore/src/android/server_timestamp_behavior_android.h
index b643ebd62b..22274b1d35 100644
--- a/firestore/src/android/server_timestamp_behavior_android.h
+++ b/firestore/src/android/server_timestamp_behavior_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_SERVER_TIMESTAMP_BEHAVIOR_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_SERVER_TIMESTAMP_BEHAVIOR_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_SERVER_TIMESTAMP_BEHAVIOR_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_SERVER_TIMESTAMP_BEHAVIOR_ANDROID_H_
 
 #include "firestore/src/include/firebase/firestore/document_snapshot.h"
 #include "firestore/src/jni/jni_fwd.h"
@@ -20,4 +20,4 @@ class ServerTimestampBehaviorInternal {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_SERVER_TIMESTAMP_BEHAVIOR_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_SERVER_TIMESTAMP_BEHAVIOR_ANDROID_H_
diff --git a/firestore/src/android/set_options_android.h b/firestore/src/android/set_options_android.h
index 46e854c286..aa0c80a418 100644
--- a/firestore/src/android/set_options_android.h
+++ b/firestore/src/android/set_options_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_SET_OPTIONS_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_SET_OPTIONS_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_SET_OPTIONS_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_SET_OPTIONS_ANDROID_H_
 
 #include "firestore/src/include/firebase/firestore/set_options.h"
 #include "firestore/src/jni/jni_fwd.h"
@@ -29,4 +29,4 @@ class SetOptionsInternal {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_SET_OPTIONS_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_SET_OPTIONS_ANDROID_H_
diff --git a/firestore/src/android/settings_android.h b/firestore/src/android/settings_android.h
index 49bd2f96f1..252a30691e 100644
--- a/firestore/src/android/settings_android.h
+++ b/firestore/src/android/settings_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_SETTINGS_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_SETTINGS_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_SETTINGS_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_SETTINGS_ANDROID_H_
 
 #include "firestore/src/include/firebase/firestore/settings.h"
 #include "firestore/src/jni/jni_fwd.h"
@@ -25,4 +25,4 @@ class SettingsInternal : public jni::Object {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_SETTINGS_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_SETTINGS_ANDROID_H_
diff --git a/firestore/src/android/snapshot_metadata_android.h b/firestore/src/android/snapshot_metadata_android.h
index 7459751ebe..779241faea 100644
--- a/firestore/src/android/snapshot_metadata_android.h
+++ b/firestore/src/android/snapshot_metadata_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_SNAPSHOT_METADATA_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_SNAPSHOT_METADATA_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_SNAPSHOT_METADATA_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_SNAPSHOT_METADATA_ANDROID_H_
 
 #include "firestore/src/include/firebase/firestore/snapshot_metadata.h"
 #include "firestore/src/jni/jni_fwd.h"
@@ -27,4 +27,4 @@ class SnapshotMetadataInternal : public jni::Object {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_SNAPSHOT_METADATA_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_SNAPSHOT_METADATA_ANDROID_H_
diff --git a/firestore/src/android/source_android.h b/firestore/src/android/source_android.h
index caf9a262e4..1aaab91c8f 100644
--- a/firestore/src/android/source_android.h
+++ b/firestore/src/android/source_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_SOURCE_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_SOURCE_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_SOURCE_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_SOURCE_ANDROID_H_
 
 #include "firestore/src/include/firebase/firestore/source.h"
 #include "firestore/src/jni/jni_fwd.h"
@@ -19,4 +19,4 @@ class SourceInternal {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_SOURCE_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_SOURCE_ANDROID_H_
diff --git a/firestore/src/android/timestamp_android.h b/firestore/src/android/timestamp_android.h
index f0f097e0c8..d01a029d36 100644
--- a/firestore/src/android/timestamp_android.h
+++ b/firestore/src/android/timestamp_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_TIMESTAMP_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_TIMESTAMP_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_TIMESTAMP_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_TIMESTAMP_ANDROID_H_
 
 #include "firebase/firestore/timestamp.h"
 #include "firestore/src/jni/jni_fwd.h"
@@ -29,4 +29,4 @@ class TimestampInternal : public jni::Object {
 
 }  // namespace firestore
 }  // namespace firebase
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_TIMESTAMP_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_TIMESTAMP_ANDROID_H_
diff --git a/firestore/src/android/transaction_android.h b/firestore/src/android/transaction_android.h
index d7ad8a6282..685bb69f8e 100644
--- a/firestore/src/android/transaction_android.h
+++ b/firestore/src/android/transaction_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_TRANSACTION_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_TRANSACTION_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_TRANSACTION_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_TRANSACTION_ANDROID_H_
 
 #include <memory>
 #include <string>
@@ -84,4 +84,4 @@ class TransactionInternal : public Wrapper {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_TRANSACTION_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_TRANSACTION_ANDROID_H_
diff --git a/firestore/src/android/util_android.h b/firestore/src/android/util_android.h
index 717e876712..50c6f51afe 100644
--- a/firestore/src/android/util_android.h
+++ b/firestore/src/android/util_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_UTIL_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_UTIL_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_UTIL_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_UTIL_ANDROID_H_
 
 #include <vector>
 
@@ -72,4 +72,4 @@ UpdateFieldPathArgs MakeUpdateFieldPathArgs(jni::Env& env,
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_UTIL_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_UTIL_ANDROID_H_
diff --git a/firestore/src/android/wrapper.h b/firestore/src/android/wrapper.h
index 4113e7344d..b69732372a 100644
--- a/firestore/src/android/wrapper.h
+++ b/firestore/src/android/wrapper.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_WRAPPER_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_WRAPPER_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_WRAPPER_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_WRAPPER_H_
 
 #include "firestore/src/jni/jni_fwd.h"
 #include "firestore/src/jni/object.h"
@@ -53,4 +53,4 @@ class Wrapper {
 
 }  // namespace firestore
 }  // namespace firebase
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_WRAPPER_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_WRAPPER_H_
diff --git a/firestore/src/android/write_batch_android.h b/firestore/src/android/write_batch_android.h
index 8501e40456..7a68ee58be 100644
--- a/firestore/src/android/write_batch_android.h
+++ b/firestore/src/android/write_batch_android.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_WRITE_BATCH_ANDROID_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_WRITE_BATCH_ANDROID_H_
+#ifndef FIREBASE_FIRESTORE_SRC_ANDROID_WRITE_BATCH_ANDROID_H_
+#define FIREBASE_FIRESTORE_SRC_ANDROID_WRITE_BATCH_ANDROID_H_
 
 #include "firestore/src/android/promise_factory_android.h"
 #include "firestore/src/android/wrapper.h"
@@ -58,4 +58,4 @@ class WriteBatchInternal : public Wrapper {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_ANDROID_WRITE_BATCH_ANDROID_H_
+#endif  // FIREBASE_FIRESTORE_SRC_ANDROID_WRITE_BATCH_ANDROID_H_
diff --git a/firestore/src/common/cleanup.h b/firestore/src/common/cleanup.h
index 3c6ef74d46..9b3186f58e 100644
--- a/firestore/src/common/cleanup.h
+++ b/firestore/src/common/cleanup.h
@@ -1,7 +1,7 @@
 // Copyright 2017 Google Inc. All Rights Reserved.
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_CLEANUP_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_CLEANUP_H_
+#ifndef FIREBASE_FIRESTORE_SRC_COMMON_CLEANUP_H_
+#define FIREBASE_FIRESTORE_SRC_COMMON_CLEANUP_H_
 
 #if __ANDROID__
 #include "firestore/src/android/firestore_android.h"
@@ -78,4 +78,4 @@ struct CleanupFn {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_CLEANUP_H_
+#endif  // FIREBASE_FIRESTORE_SRC_COMMON_CLEANUP_H_
diff --git a/firestore/src/common/compiler_info.h b/firestore/src/common/compiler_info.h
index bc3ac6663b..6f3c2a30c8 100644
--- a/firestore/src/common/compiler_info.h
+++ b/firestore/src/common/compiler_info.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_COMPILER_INFO_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_COMPILER_INFO_H_
+#ifndef FIREBASE_FIRESTORE_SRC_COMMON_COMPILER_INFO_H_
+#define FIREBASE_FIRESTORE_SRC_COMMON_COMPILER_INFO_H_
 
 #include <string>
 
@@ -35,4 +35,4 @@ std::string GetFullCompilerInfo();
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_COMPILER_INFO_H_
+#endif  // FIREBASE_FIRESTORE_SRC_COMMON_COMPILER_INFO_H_
diff --git a/firestore/src/common/event_listener.h b/firestore/src/common/event_listener.h
index 7231581796..5f33310d7b 100644
--- a/firestore/src/common/event_listener.h
+++ b/firestore/src/common/event_listener.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_EVENT_LISTENER_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_EVENT_LISTENER_H_
+#ifndef FIREBASE_FIRESTORE_SRC_COMMON_EVENT_LISTENER_H_
+#define FIREBASE_FIRESTORE_SRC_COMMON_EVENT_LISTENER_H_
 
 #include <string>
 
@@ -76,4 +76,4 @@ class EventListener<void> {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_EVENT_LISTENER_H_
+#endif  // FIREBASE_FIRESTORE_SRC_COMMON_EVENT_LISTENER_H_
diff --git a/firestore/src/common/exception_common.h b/firestore/src/common/exception_common.h
index c262d9f670..e5cd38db0d 100644
--- a/firestore/src/common/exception_common.h
+++ b/firestore/src/common/exception_common.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_EXCEPTION_COMMON_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_EXCEPTION_COMMON_H_
+#ifndef FIREBASE_FIRESTORE_SRC_COMMON_EXCEPTION_COMMON_H_
+#define FIREBASE_FIRESTORE_SRC_COMMON_EXCEPTION_COMMON_H_
 
 // Routines in this file are used to throw an exception (or crash, depending on
 // platform) in response to API usage errors. Exceptions should only be used
@@ -110,4 +110,4 @@ FIRESTORE_ATTRIBUTE_NORETURN void SimpleThrowIllegalState(
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_EXCEPTION_COMMON_H_
+#endif  // FIREBASE_FIRESTORE_SRC_COMMON_EXCEPTION_COMMON_H_
diff --git a/firestore/src/common/futures.h b/firestore/src/common/futures.h
index 01dac0f991..a0a87b440b 100644
--- a/firestore/src/common/futures.h
+++ b/firestore/src/common/futures.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_FUTURES_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_FUTURES_H_
+#ifndef FIREBASE_FIRESTORE_SRC_COMMON_FUTURES_H_
+#define FIREBASE_FIRESTORE_SRC_COMMON_FUTURES_H_
 
 #include "app/meta/move.h"
 #include "app/src/include/firebase/future.h"
@@ -63,4 +63,4 @@ Future<T> FailedFuture() {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_FUTURES_H_
+#endif  // FIREBASE_FIRESTORE_SRC_COMMON_FUTURES_H_
diff --git a/firestore/src/common/hard_assert_common.h b/firestore/src/common/hard_assert_common.h
index ff0c35a5f4..be08a926ce 100644
--- a/firestore/src/common/hard_assert_common.h
+++ b/firestore/src/common/hard_assert_common.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_HARD_ASSERT_COMMON_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_HARD_ASSERT_COMMON_H_
+#ifndef FIREBASE_FIRESTORE_SRC_COMMON_HARD_ASSERT_COMMON_H_
+#define FIREBASE_FIRESTORE_SRC_COMMON_HARD_ASSERT_COMMON_H_
 
 // TODO(b/163140650): Remove this/unify with the iOS implementation.
 // On Android we still support customers building with STLPort, which precludes
@@ -123,4 +123,4 @@ FIRESTORE_ATTRIBUTE_NORETURN void FailAssertion(const char* file,
 
 #endif  // defined(__ANDROID__)
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_HARD_ASSERT_COMMON_H_
+#endif  // FIREBASE_FIRESTORE_SRC_COMMON_HARD_ASSERT_COMMON_H_
diff --git a/firestore/src/common/macros.h b/firestore/src/common/macros.h
index dbcab873e9..b8b7999f7f 100644
--- a/firestore/src/common/macros.h
+++ b/firestore/src/common/macros.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_MACROS_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_MACROS_H_
+#ifndef FIREBASE_FIRESTORE_SRC_COMMON_MACROS_H_
+#define FIREBASE_FIRESTORE_SRC_COMMON_MACROS_H_
 
 #include <cstdlib>
 
@@ -97,4 +97,4 @@
 #define FIRESTORE_UNREACHABLE()  // nothing
 #endif                           // defined(__GNUC__) || defined(__clang__)
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_MACROS_H_
+#endif  // FIREBASE_FIRESTORE_SRC_COMMON_MACROS_H_
diff --git a/firestore/src/common/make_unique.h b/firestore/src/common/make_unique.h
index cb9ca5b0a9..0e857ea473 100644
--- a/firestore/src/common/make_unique.h
+++ b/firestore/src/common/make_unique.h
@@ -17,8 +17,8 @@
 // Note: This is needed since std::make_unique is only available starting C++14.
 // TODO(b/191981857): Remove this file when possible.
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_MAKE_UNIQUE_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_MAKE_UNIQUE_H_
+#ifndef FIREBASE_FIRESTORE_SRC_COMMON_MAKE_UNIQUE_H_
+#define FIREBASE_FIRESTORE_SRC_COMMON_MAKE_UNIQUE_H_
 
 #include <memory>
 #include <utility>
@@ -34,4 +34,4 @@ std::unique_ptr<T> make_unique(Args&&... args) {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_MAKE_UNIQUE_H_
+#endif  // FIREBASE_FIRESTORE_SRC_COMMON_MAKE_UNIQUE_H_
diff --git a/firestore/src/common/to_string.h b/firestore/src/common/to_string.h
index 447b3171a7..6ff8d04505 100644
--- a/firestore/src/common/to_string.h
+++ b/firestore/src/common/to_string.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_TO_STRING_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_TO_STRING_H_
+#ifndef FIREBASE_FIRESTORE_SRC_COMMON_TO_STRING_H_
+#define FIREBASE_FIRESTORE_SRC_COMMON_TO_STRING_H_
 
 #include <iosfwd>
 #include <string>
@@ -32,4 +32,4 @@ std::ostream& operator<<(std::ostream& out, const MapFieldValue& value);
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_TO_STRING_H_
+#endif  // FIREBASE_FIRESTORE_SRC_COMMON_TO_STRING_H_
diff --git a/firestore/src/common/type_mapping.h b/firestore/src/common/type_mapping.h
index b745dde8c0..f283ba0f67 100644
--- a/firestore/src/common/type_mapping.h
+++ b/firestore/src/common/type_mapping.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_TYPE_MAPPING_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_TYPE_MAPPING_H_
+#ifndef FIREBASE_FIRESTORE_SRC_COMMON_TYPE_MAPPING_H_
+#define FIREBASE_FIRESTORE_SRC_COMMON_TYPE_MAPPING_H_
 
 #include "app/src/include/firebase/internal/type_traits.h"
 
@@ -99,4 +99,4 @@ using InternalType = typename InternalTypeMap<typename decay<T>::type>::type;
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_TYPE_MAPPING_H_
+#endif  // FIREBASE_FIRESTORE_SRC_COMMON_TYPE_MAPPING_H_
diff --git a/firestore/src/common/util.h b/firestore/src/common/util.h
index c5a3eed455..1f63ab39da 100644
--- a/firestore/src/common/util.h
+++ b/firestore/src/common/util.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_UTIL_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_UTIL_H_
+#ifndef FIREBASE_FIRESTORE_SRC_COMMON_UTIL_H_
+#define FIREBASE_FIRESTORE_SRC_COMMON_UTIL_H_
 
 #include <string>
 
@@ -16,4 +16,4 @@ const std::string& EmptyString();
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_UTIL_H_
+#endif  // FIREBASE_FIRESTORE_SRC_COMMON_UTIL_H_
diff --git a/firestore/src/common/wrapper_assertions.h b/firestore/src/common/wrapper_assertions.h
index d63b2bcc4d..617253addf 100644
--- a/firestore/src/common/wrapper_assertions.h
+++ b/firestore/src/common/wrapper_assertions.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_WRAPPER_ASSERTIONS_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_WRAPPER_ASSERTIONS_H_
+#ifndef FIREBASE_FIRESTORE_SRC_COMMON_WRAPPER_ASSERTIONS_H_
+#define FIREBASE_FIRESTORE_SRC_COMMON_WRAPPER_ASSERTIONS_H_
 
 #include "firestore/src/common/type_mapping.h"
 #include "firestore/src/include/firebase/firestore.h"
@@ -130,4 +130,4 @@ void AssertWrapperAssignmentContract() {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_COMMON_WRAPPER_ASSERTIONS_H_
+#endif  // FIREBASE_FIRESTORE_SRC_COMMON_WRAPPER_ASSERTIONS_H_
diff --git a/firestore/src/include/firebase/firestore.h b/firestore/src/include/firebase/firestore.h
index 596e7a90af..ee7d51258c 100644
--- a/firestore/src/include/firebase/firestore.h
+++ b/firestore/src/include/firebase/firestore.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_H_
+#ifndef FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_H_
+#define FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_H_
 
 #include <functional>
 #include <string>
@@ -451,4 +451,4 @@ class Firestore {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_H_
+#endif  // FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_H_
diff --git a/firestore/src/include/firebase/firestore/collection_reference.h b/firestore/src/include/firebase/firestore/collection_reference.h
index 4a4c4231de..53f1cd4500 100644
--- a/firestore/src/include/firebase/firestore/collection_reference.h
+++ b/firestore/src/include/firebase/firestore/collection_reference.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_COLLECTION_REFERENCE_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_COLLECTION_REFERENCE_H_
+#ifndef FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_COLLECTION_REFERENCE_H_
+#define FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_COLLECTION_REFERENCE_H_
 
 #include <string>
 
@@ -180,4 +180,4 @@ class CollectionReference : public Query {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_COLLECTION_REFERENCE_H_
+#endif  // FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_COLLECTION_REFERENCE_H_
diff --git a/firestore/src/include/firebase/firestore/document_change.h b/firestore/src/include/firebase/firestore/document_change.h
index 0c37e0619f..28b8b6eab6 100644
--- a/firestore/src/include/firebase/firestore/document_change.h
+++ b/firestore/src/include/firebase/firestore/document_change.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_DOCUMENT_CHANGE_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_DOCUMENT_CHANGE_H_
+#ifndef FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_DOCUMENT_CHANGE_H_
+#define FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_DOCUMENT_CHANGE_H_
 
 #include <cstddef>
 
@@ -174,4 +174,4 @@ class DocumentChange {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_DOCUMENT_CHANGE_H_
+#endif  // FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_DOCUMENT_CHANGE_H_
diff --git a/firestore/src/include/firebase/firestore/document_reference.h b/firestore/src/include/firebase/firestore/document_reference.h
index 3cf914b2cc..158452ad81 100644
--- a/firestore/src/include/firebase/firestore/document_reference.h
+++ b/firestore/src/include/firebase/firestore/document_reference.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_DOCUMENT_REFERENCE_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_DOCUMENT_REFERENCE_H_
+#ifndef FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_DOCUMENT_REFERENCE_H_
+#define FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_DOCUMENT_REFERENCE_H_
 
 #include <functional>
 #include <iosfwd>
@@ -347,4 +347,4 @@ inline bool operator!=(const DocumentReference& lhs,
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_DOCUMENT_REFERENCE_H_
+#endif  // FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_DOCUMENT_REFERENCE_H_
diff --git a/firestore/src/include/firebase/firestore/document_snapshot.h b/firestore/src/include/firebase/firestore/document_snapshot.h
index 8a19919dd8..827b480ae2 100644
--- a/firestore/src/include/firebase/firestore/document_snapshot.h
+++ b/firestore/src/include/firebase/firestore/document_snapshot.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_DOCUMENT_SNAPSHOT_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_DOCUMENT_SNAPSHOT_H_
+#ifndef FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_DOCUMENT_SNAPSHOT_H_
+#define FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_DOCUMENT_SNAPSHOT_H_
 
 #include <iosfwd>
 #include <string>
@@ -266,4 +266,4 @@ class DocumentSnapshot {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_DOCUMENT_SNAPSHOT_H_
+#endif  // FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_DOCUMENT_SNAPSHOT_H_
diff --git a/firestore/src/include/firebase/firestore/field_path.h b/firestore/src/include/firebase/firestore/field_path.h
index d6c109d26b..79c9cee631 100644
--- a/firestore/src/include/firebase/firestore/field_path.h
+++ b/firestore/src/include/firebase/firestore/field_path.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_FIELD_PATH_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_FIELD_PATH_H_
+#ifndef FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_FIELD_PATH_H_
+#define FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_FIELD_PATH_H_
 
 #include <initializer_list>
 #include <iosfwd>
@@ -191,4 +191,4 @@ struct hash<firebase::firestore::FieldPath> {
 }  // namespace std
 #endif  // !defined(SWIG)
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_FIELD_PATH_H_
+#endif  // FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_FIELD_PATH_H_
diff --git a/firestore/src/include/firebase/firestore/field_value.h b/firestore/src/include/firebase/firestore/field_value.h
index 6718705a87..eb51e59053 100644
--- a/firestore/src/include/firebase/firestore/field_value.h
+++ b/firestore/src/include/firebase/firestore/field_value.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_FIELD_VALUE_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_FIELD_VALUE_H_
+#ifndef FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_FIELD_VALUE_H_
+#define FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_FIELD_VALUE_H_
 
 #include <cstdint>
 #include <iosfwd>
@@ -437,4 +437,4 @@ inline bool operator!=(const FieldValue& lhs, const FieldValue& rhs) {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_FIELD_VALUE_H_
+#endif  // FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_FIELD_VALUE_H_
diff --git a/firestore/src/include/firebase/firestore/listener_registration.h b/firestore/src/include/firebase/firestore/listener_registration.h
index 90341de949..5e217e5559 100644
--- a/firestore/src/include/firebase/firestore/listener_registration.h
+++ b/firestore/src/include/firebase/firestore/listener_registration.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_LISTENER_REGISTRATION_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_LISTENER_REGISTRATION_H_
+#ifndef FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_LISTENER_REGISTRATION_H_
+#define FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_LISTENER_REGISTRATION_H_
 
 namespace firebase {
 namespace firestore {
@@ -114,4 +114,4 @@ class ListenerRegistration {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_LISTENER_REGISTRATION_H_
+#endif  // FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_LISTENER_REGISTRATION_H_
diff --git a/firestore/src/include/firebase/firestore/load_bundle_task_progress.h b/firestore/src/include/firebase/firestore/load_bundle_task_progress.h
index d27f8ab9e4..be9b235f12 100644
--- a/firestore/src/include/firebase/firestore/load_bundle_task_progress.h
+++ b/firestore/src/include/firebase/firestore/load_bundle_task_progress.h
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_LOAD_BUNDLE_TASK_PROGRESS_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_LOAD_BUNDLE_TASK_PROGRESS_H_
+#ifndef FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_LOAD_BUNDLE_TASK_PROGRESS_H_
+#define FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_LOAD_BUNDLE_TASK_PROGRESS_H_
 
 #include <stdint.h>
 
@@ -98,4 +98,4 @@ inline bool operator!=(const LoadBundleTaskProgress& lhs,
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_LOAD_BUNDLE_TASK_PROGRESS_H_
+#endif  // FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_LOAD_BUNDLE_TASK_PROGRESS_H_
diff --git a/firestore/src/include/firebase/firestore/map_field_value.h b/firestore/src/include/firebase/firestore/map_field_value.h
index aeea5de94b..b848471790 100644
--- a/firestore/src/include/firebase/firestore/map_field_value.h
+++ b/firestore/src/include/firebase/firestore/map_field_value.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_MAP_FIELD_VALUE_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_MAP_FIELD_VALUE_H_
+#ifndef FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_MAP_FIELD_VALUE_H_
+#define FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_MAP_FIELD_VALUE_H_
 
 #include <string>
 #include <unordered_map>
@@ -34,4 +34,4 @@ using MapFieldPathValue = std::unordered_map<FieldPath, FieldValue>;
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_MAP_FIELD_VALUE_H_
+#endif  // FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_MAP_FIELD_VALUE_H_
diff --git a/firestore/src/include/firebase/firestore/metadata_changes.h b/firestore/src/include/firebase/firestore/metadata_changes.h
index 3d28753f85..70072be51b 100644
--- a/firestore/src/include/firebase/firestore/metadata_changes.h
+++ b/firestore/src/include/firebase/firestore/metadata_changes.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_METADATA_CHANGES_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_METADATA_CHANGES_H_
+#ifndef FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_METADATA_CHANGES_H_
+#define FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_METADATA_CHANGES_H_
 
 namespace firebase {
 namespace firestore {
@@ -38,4 +38,4 @@ enum class MetadataChanges {
 
 }  // namespace firestore
 }  // namespace firebase
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_METADATA_CHANGES_H_
+#endif  // FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_METADATA_CHANGES_H_
diff --git a/firestore/src/include/firebase/firestore/query.h b/firestore/src/include/firebase/firestore/query.h
index 68ea6b2e06..3796cf6574 100644
--- a/firestore/src/include/firebase/firestore/query.h
+++ b/firestore/src/include/firebase/firestore/query.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_QUERY_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_QUERY_H_
+#ifndef FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_QUERY_H_
+#define FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_QUERY_H_
 
 #include <cstddef>
 #include <cstdint>
@@ -665,4 +665,4 @@ inline bool operator!=(const Query& lhs, const Query& rhs) {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_QUERY_H_
+#endif  // FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_QUERY_H_
diff --git a/firestore/src/include/firebase/firestore/query_snapshot.h b/firestore/src/include/firebase/firestore/query_snapshot.h
index 71718e0854..aaa9fa1d55 100644
--- a/firestore/src/include/firebase/firestore/query_snapshot.h
+++ b/firestore/src/include/firebase/firestore/query_snapshot.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_QUERY_SNAPSHOT_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_QUERY_SNAPSHOT_H_
+#ifndef FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_QUERY_SNAPSHOT_H_
+#define FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_QUERY_SNAPSHOT_H_
 
 #include <cstddef>
 #include <vector>
@@ -165,4 +165,4 @@ class QuerySnapshot {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_QUERY_SNAPSHOT_H_
+#endif  // FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_QUERY_SNAPSHOT_H_
diff --git a/firestore/src/include/firebase/firestore/set_options.h b/firestore/src/include/firebase/firestore/set_options.h
index c78dbbafe7..7f46b55424 100644
--- a/firestore/src/include/firebase/firestore/set_options.h
+++ b/firestore/src/include/firebase/firestore/set_options.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_SET_OPTIONS_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_SET_OPTIONS_H_
+#ifndef FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_SET_OPTIONS_H_
+#define FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_SET_OPTIONS_H_
 
 #include <string>
 #include <vector>
@@ -146,4 +146,4 @@ class SetOptions final {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_SET_OPTIONS_H_
+#endif  // FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_SET_OPTIONS_H_
diff --git a/firestore/src/include/firebase/firestore/settings.h b/firestore/src/include/firebase/firestore/settings.h
index f380cf95db..64d5114900 100644
--- a/firestore/src/include/firebase/firestore/settings.h
+++ b/firestore/src/include/firebase/firestore/settings.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_SETTINGS_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_SETTINGS_H_
+#ifndef FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_SETTINGS_H_
+#define FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_SETTINGS_H_
 
 #if defined(__OBJC__)
 #include <dispatch/dispatch.h>
@@ -231,4 +231,4 @@ class Settings final {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_SETTINGS_H_
+#endif  // FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_SETTINGS_H_
diff --git a/firestore/src/include/firebase/firestore/snapshot_metadata.h b/firestore/src/include/firebase/firestore/snapshot_metadata.h
index e394f5459e..b657298565 100644
--- a/firestore/src/include/firebase/firestore/snapshot_metadata.h
+++ b/firestore/src/include/firebase/firestore/snapshot_metadata.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_SNAPSHOT_METADATA_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_SNAPSHOT_METADATA_H_
+#ifndef FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_SNAPSHOT_METADATA_H_
+#define FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_SNAPSHOT_METADATA_H_
 
 #include <iosfwd>
 #include <string>
@@ -143,4 +143,4 @@ class SnapshotMetadata final {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_SNAPSHOT_METADATA_H_
+#endif  // FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_SNAPSHOT_METADATA_H_
diff --git a/firestore/src/include/firebase/firestore/source.h b/firestore/src/include/firebase/firestore/source.h
index d0412e42ab..8957323250 100644
--- a/firestore/src/include/firebase/firestore/source.h
+++ b/firestore/src/include/firebase/firestore/source.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_SOURCE_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_SOURCE_H_
+#ifndef FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_SOURCE_H_
+#define FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_SOURCE_H_
 
 namespace firebase {
 namespace firestore {
@@ -56,4 +56,4 @@ enum class Source {
 
 }  // namespace firestore
 }  // namespace firebase
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_SOURCE_H_
+#endif  // FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_SOURCE_H_
diff --git a/firestore/src/include/firebase/firestore/transaction.h b/firestore/src/include/firebase/firestore/transaction.h
index 4430ff5e83..92d954e72f 100644
--- a/firestore/src/include/firebase/firestore/transaction.h
+++ b/firestore/src/include/firebase/firestore/transaction.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_TRANSACTION_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_TRANSACTION_H_
+#ifndef FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_TRANSACTION_H_
+#define FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_TRANSACTION_H_
 
 #include <string>
 
@@ -161,4 +161,4 @@ class TransactionFunction {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_TRANSACTION_H_
+#endif  // FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_TRANSACTION_H_
diff --git a/firestore/src/include/firebase/firestore/write_batch.h b/firestore/src/include/firebase/firestore/write_batch.h
index ea42dba05a..8c7835bc35 100644
--- a/firestore/src/include/firebase/firestore/write_batch.h
+++ b/firestore/src/include/firebase/firestore/write_batch.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_WRITE_BATCH_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_WRITE_BATCH_H_
+#ifndef FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_WRITE_BATCH_H_
+#define FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_WRITE_BATCH_H_
 
 #include "firebase/firestore/map_field_value.h"
 #include "firebase/firestore/set_options.h"
@@ -172,4 +172,4 @@ class WriteBatch {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FIRESTORE_WRITE_BATCH_H_
+#endif  // FIREBASE_FIRESTORE_SRC_INCLUDE_FIREBASE_FIRESTORE_WRITE_BATCH_H_
diff --git a/firestore/src/jni/array.h b/firestore/src/jni/array.h
index 494f5ca045..79e74f2420 100644
--- a/firestore/src/jni/array.h
+++ b/firestore/src/jni/array.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_ARRAY_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_ARRAY_H_
+#ifndef FIREBASE_FIRESTORE_SRC_JNI_ARRAY_H_
+#define FIREBASE_FIRESTORE_SRC_JNI_ARRAY_H_
 
 #include "firestore/src/jni/env.h"
 #include "firestore/src/jni/jni_fwd.h"
@@ -37,4 +37,4 @@ class Array : public Object {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_ARRAY_H_
+#endif  // FIREBASE_FIRESTORE_SRC_JNI_ARRAY_H_
diff --git a/firestore/src/jni/array_list.h b/firestore/src/jni/array_list.h
index 71ef66324c..b2a9b014ca 100644
--- a/firestore/src/jni/array_list.h
+++ b/firestore/src/jni/array_list.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_ARRAY_LIST_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_ARRAY_LIST_H_
+#ifndef FIREBASE_FIRESTORE_SRC_JNI_ARRAY_LIST_H_
+#define FIREBASE_FIRESTORE_SRC_JNI_ARRAY_LIST_H_
 
 #include "firestore/src/jni/list.h"
 
@@ -24,4 +24,4 @@ class ArrayList : public List {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_ARRAY_LIST_H_
+#endif  // FIREBASE_FIRESTORE_SRC_JNI_ARRAY_LIST_H_
diff --git a/firestore/src/jni/boolean.h b/firestore/src/jni/boolean.h
index 410956d50f..ef6cdb8d23 100644
--- a/firestore/src/jni/boolean.h
+++ b/firestore/src/jni/boolean.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_BOOLEAN_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_BOOLEAN_H_
+#ifndef FIREBASE_FIRESTORE_SRC_JNI_BOOLEAN_H_
+#define FIREBASE_FIRESTORE_SRC_JNI_BOOLEAN_H_
 
 #include "firestore/src/jni/jni_fwd.h"
 #include "firestore/src/jni/object.h"
@@ -28,4 +28,4 @@ class Boolean : public Object {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_BOOLEAN_H_
+#endif  // FIREBASE_FIRESTORE_SRC_JNI_BOOLEAN_H_
diff --git a/firestore/src/jni/call_traits.h b/firestore/src/jni/call_traits.h
index d94e5563f2..9956401688 100644
--- a/firestore/src/jni/call_traits.h
+++ b/firestore/src/jni/call_traits.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_CALL_TRAITS_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_CALL_TRAITS_H_
+#ifndef FIREBASE_FIRESTORE_SRC_JNI_CALL_TRAITS_H_
+#define FIREBASE_FIRESTORE_SRC_JNI_CALL_TRAITS_H_
 
 #include <jni.h>
 
@@ -139,4 +139,4 @@ using ResultType = typename ResultTypeMap<T>::type;
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_CALL_TRAITS_H_
+#endif  // FIREBASE_FIRESTORE_SRC_JNI_CALL_TRAITS_H_
diff --git a/firestore/src/jni/class.h b/firestore/src/jni/class.h
index 5b5aeae79e..f2204d926c 100644
--- a/firestore/src/jni/class.h
+++ b/firestore/src/jni/class.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_CLASS_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_CLASS_H_
+#ifndef FIREBASE_FIRESTORE_SRC_JNI_CLASS_H_
+#define FIREBASE_FIRESTORE_SRC_JNI_CLASS_H_
 
 #include <string>
 
@@ -46,4 +46,4 @@ class Class : public Object {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_CLASS_H_
+#endif  // FIREBASE_FIRESTORE_SRC_JNI_CLASS_H_
diff --git a/firestore/src/jni/collection.h b/firestore/src/jni/collection.h
index efbb57d2c7..8d94743816 100644
--- a/firestore/src/jni/collection.h
+++ b/firestore/src/jni/collection.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_COLLECTION_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_COLLECTION_H_
+#ifndef FIREBASE_FIRESTORE_SRC_JNI_COLLECTION_H_
+#define FIREBASE_FIRESTORE_SRC_JNI_COLLECTION_H_
 
 #include "firestore/src/jni/jni_fwd.h"
 #include "firestore/src/jni/object.h"
@@ -28,4 +28,4 @@ class Collection : public Object {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_COLLECTION_H_
+#endif  // FIREBASE_FIRESTORE_SRC_JNI_COLLECTION_H_
diff --git a/firestore/src/jni/declaration.h b/firestore/src/jni/declaration.h
index fec91bbfa3..7c4c25bcdc 100644
--- a/firestore/src/jni/declaration.h
+++ b/firestore/src/jni/declaration.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_DECLARATION_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_DECLARATION_H_
+#ifndef FIREBASE_FIRESTORE_SRC_JNI_DECLARATION_H_
+#define FIREBASE_FIRESTORE_SRC_JNI_DECLARATION_H_
 
 #include <jni.h>
 
@@ -180,4 +180,4 @@ class StaticMethod : public StaticMethodBase {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_DECLARATION_H_
+#endif  // FIREBASE_FIRESTORE_SRC_JNI_DECLARATION_H_
diff --git a/firestore/src/jni/double.h b/firestore/src/jni/double.h
index 21b111030c..22d5e55e5a 100644
--- a/firestore/src/jni/double.h
+++ b/firestore/src/jni/double.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_DOUBLE_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_DOUBLE_H_
+#ifndef FIREBASE_FIRESTORE_SRC_JNI_DOUBLE_H_
+#define FIREBASE_FIRESTORE_SRC_JNI_DOUBLE_H_
 
 #include "firestore/src/jni/jni_fwd.h"
 #include "firestore/src/jni/object.h"
@@ -28,4 +28,4 @@ class Double : public Object {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_DOUBLE_H_
+#endif  // FIREBASE_FIRESTORE_SRC_JNI_DOUBLE_H_
diff --git a/firestore/src/jni/env.h b/firestore/src/jni/env.h
index 264926e02b..df085095e9 100644
--- a/firestore/src/jni/env.h
+++ b/firestore/src/jni/env.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_ENV_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_ENV_H_
+#ifndef FIREBASE_FIRESTORE_SRC_JNI_ENV_H_
+#define FIREBASE_FIRESTORE_SRC_JNI_ENV_H_
 
 #include <jni.h>
 
@@ -560,4 +560,4 @@ class ExceptionClearGuard {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_ENV_H_
+#endif  // FIREBASE_FIRESTORE_SRC_JNI_ENV_H_
diff --git a/firestore/src/jni/hash_map.h b/firestore/src/jni/hash_map.h
index abbc683453..5b5c8963bb 100644
--- a/firestore/src/jni/hash_map.h
+++ b/firestore/src/jni/hash_map.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_HASH_MAP_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_HASH_MAP_H_
+#ifndef FIREBASE_FIRESTORE_SRC_JNI_HASH_MAP_H_
+#define FIREBASE_FIRESTORE_SRC_JNI_HASH_MAP_H_
 
 #include "firestore/src/jni/jni_fwd.h"
 #include "firestore/src/jni/map.h"
@@ -24,4 +24,4 @@ class HashMap : public Map {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_HASH_MAP_H_
+#endif  // FIREBASE_FIRESTORE_SRC_JNI_HASH_MAP_H_
diff --git a/firestore/src/jni/integer.h b/firestore/src/jni/integer.h
index 28b16eb4d3..69baa20c67 100644
--- a/firestore/src/jni/integer.h
+++ b/firestore/src/jni/integer.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_INTEGER_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_INTEGER_H_
+#ifndef FIREBASE_FIRESTORE_SRC_JNI_INTEGER_H_
+#define FIREBASE_FIRESTORE_SRC_JNI_INTEGER_H_
 
 #include "firestore/src/jni/jni_fwd.h"
 #include "firestore/src/jni/object.h"
@@ -28,4 +28,4 @@ class Integer : public Object {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_INTEGER_H_
+#endif  // FIREBASE_FIRESTORE_SRC_JNI_INTEGER_H_
diff --git a/firestore/src/jni/iterator.h b/firestore/src/jni/iterator.h
index aa6880dd8d..91433d9044 100644
--- a/firestore/src/jni/iterator.h
+++ b/firestore/src/jni/iterator.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_ITERATOR_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_ITERATOR_H_
+#ifndef FIREBASE_FIRESTORE_SRC_JNI_ITERATOR_H_
+#define FIREBASE_FIRESTORE_SRC_JNI_ITERATOR_H_
 
 #include "firestore/src/jni/jni_fwd.h"
 #include "firestore/src/jni/object.h"
@@ -25,4 +25,4 @@ class Iterator : public Object {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_ITERATOR_H_
+#endif  // FIREBASE_FIRESTORE_SRC_JNI_ITERATOR_H_
diff --git a/firestore/src/jni/jni.h b/firestore/src/jni/jni.h
index f36d0164df..f2d8a99464 100644
--- a/firestore/src/jni/jni.h
+++ b/firestore/src/jni/jni.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_JNI_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_JNI_H_
+#ifndef FIREBASE_FIRESTORE_SRC_JNI_JNI_H_
+#define FIREBASE_FIRESTORE_SRC_JNI_JNI_H_
 
 #include <jni.h>
 
@@ -24,4 +24,4 @@ JNIEnv* GetEnv();
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_JNI_H_
+#endif  // FIREBASE_FIRESTORE_SRC_JNI_JNI_H_
diff --git a/firestore/src/jni/jni_fwd.h b/firestore/src/jni/jni_fwd.h
index f9a2311708..ef3d29ef90 100644
--- a/firestore/src/jni/jni_fwd.h
+++ b/firestore/src/jni/jni_fwd.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_JNI_FWD_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_JNI_FWD_H_
+#ifndef FIREBASE_FIRESTORE_SRC_JNI_JNI_FWD_H_
+#define FIREBASE_FIRESTORE_SRC_JNI_JNI_FWD_H_
 
 #include <jni.h>
 
@@ -66,4 +66,4 @@ class Map;
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_JNI_FWD_H_
+#endif  // FIREBASE_FIRESTORE_SRC_JNI_JNI_FWD_H_
diff --git a/firestore/src/jni/list.h b/firestore/src/jni/list.h
index 575733d4ca..35ffaf46cf 100644
--- a/firestore/src/jni/list.h
+++ b/firestore/src/jni/list.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_LIST_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_LIST_H_
+#ifndef FIREBASE_FIRESTORE_SRC_JNI_LIST_H_
+#define FIREBASE_FIRESTORE_SRC_JNI_LIST_H_
 
 #include "firestore/src/jni/collection.h"
 #include "firestore/src/jni/jni_fwd.h"
@@ -27,4 +27,4 @@ class List : public Collection {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_LIST_H_
+#endif  // FIREBASE_FIRESTORE_SRC_JNI_LIST_H_
diff --git a/firestore/src/jni/loader.h b/firestore/src/jni/loader.h
index efb3b7c1ba..2464cb7c1d 100644
--- a/firestore/src/jni/loader.h
+++ b/firestore/src/jni/loader.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_LOADER_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_LOADER_H_
+#ifndef FIREBASE_FIRESTORE_SRC_JNI_LOADER_H_
+#define FIREBASE_FIRESTORE_SRC_JNI_LOADER_H_
 
 #include <jni.h>
 
@@ -165,4 +165,4 @@ class Loader {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_LOADER_H_
+#endif  // FIREBASE_FIRESTORE_SRC_JNI_LOADER_H_
diff --git a/firestore/src/jni/long.h b/firestore/src/jni/long.h
index fe881f50af..70bcd89c7a 100644
--- a/firestore/src/jni/long.h
+++ b/firestore/src/jni/long.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_LONG_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_LONG_H_
+#ifndef FIREBASE_FIRESTORE_SRC_JNI_LONG_H_
+#define FIREBASE_FIRESTORE_SRC_JNI_LONG_H_
 
 #include "firestore/src/jni/jni_fwd.h"
 #include "firestore/src/jni/object.h"
@@ -28,4 +28,4 @@ class Long : public Object {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_LONG_H_
+#endif  // FIREBASE_FIRESTORE_SRC_JNI_LONG_H_
diff --git a/firestore/src/jni/map.h b/firestore/src/jni/map.h
index 0d04f0a1c3..450fb5e821 100644
--- a/firestore/src/jni/map.h
+++ b/firestore/src/jni/map.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_MAP_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_MAP_H_
+#ifndef FIREBASE_FIRESTORE_SRC_JNI_MAP_H_
+#define FIREBASE_FIRESTORE_SRC_JNI_MAP_H_
 
 #include "firestore/src/jni/jni_fwd.h"
 #include "firestore/src/jni/object.h"
@@ -33,4 +33,4 @@ class Map : public Object {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_MAP_H_
+#endif  // FIREBASE_FIRESTORE_SRC_JNI_MAP_H_
diff --git a/firestore/src/jni/object.h b/firestore/src/jni/object.h
index 3bcefb6806..39218d9086 100644
--- a/firestore/src/jni/object.h
+++ b/firestore/src/jni/object.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_OBJECT_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_OBJECT_H_
+#ifndef FIREBASE_FIRESTORE_SRC_JNI_OBJECT_H_
+#define FIREBASE_FIRESTORE_SRC_JNI_OBJECT_H_
 
 #include <jni.h>
 
@@ -72,4 +72,4 @@ inline bool operator!=(const Object& lhs, const Object& rhs) {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_OBJECT_H_
+#endif  // FIREBASE_FIRESTORE_SRC_JNI_OBJECT_H_
diff --git a/firestore/src/jni/ownership.h b/firestore/src/jni/ownership.h
index d86943dddf..2b7d0340c0 100644
--- a/firestore/src/jni/ownership.h
+++ b/firestore/src/jni/ownership.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_OWNERSHIP_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_OWNERSHIP_H_
+#ifndef FIREBASE_FIRESTORE_SRC_JNI_OWNERSHIP_H_
+#define FIREBASE_FIRESTORE_SRC_JNI_OWNERSHIP_H_
 
 #include <jni.h>
 
@@ -273,4 +273,4 @@ class Global : public T {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_OWNERSHIP_H_
+#endif  // FIREBASE_FIRESTORE_SRC_JNI_OWNERSHIP_H_
diff --git a/firestore/src/jni/set.h b/firestore/src/jni/set.h
index e617c581a0..0180e04a22 100644
--- a/firestore/src/jni/set.h
+++ b/firestore/src/jni/set.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_SET_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_SET_H_
+#ifndef FIREBASE_FIRESTORE_SRC_JNI_SET_H_
+#define FIREBASE_FIRESTORE_SRC_JNI_SET_H_
 
 #include "firestore/src/jni/collection.h"
 #include "firestore/src/jni/jni_fwd.h"
@@ -25,4 +25,4 @@ class Set : public Collection {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_SET_H_
+#endif  // FIREBASE_FIRESTORE_SRC_JNI_SET_H_
diff --git a/firestore/src/jni/string.h b/firestore/src/jni/string.h
index 88cfbf7846..184da3b48b 100644
--- a/firestore/src/jni/string.h
+++ b/firestore/src/jni/string.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_STRING_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_STRING_H_
+#ifndef FIREBASE_FIRESTORE_SRC_JNI_STRING_H_
+#define FIREBASE_FIRESTORE_SRC_JNI_STRING_H_
 
 #include "firestore/src/jni/object.h"
 
@@ -60,4 +60,4 @@ class String : public Object {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_STRING_H_
+#endif  // FIREBASE_FIRESTORE_SRC_JNI_STRING_H_
diff --git a/firestore/src/jni/task.h b/firestore/src/jni/task.h
index 61b0378b3a..5550883027 100644
--- a/firestore/src/jni/task.h
+++ b/firestore/src/jni/task.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_TASK_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_TASK_H_
+#ifndef FIREBASE_FIRESTORE_SRC_JNI_TASK_H_
+#define FIREBASE_FIRESTORE_SRC_JNI_TASK_H_
 
 #include "firestore/src/jni/jni_fwd.h"
 #include "firestore/src/jni/object.h"
@@ -31,4 +31,4 @@ class Task : public Object {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_TASK_H_
+#endif  // FIREBASE_FIRESTORE_SRC_JNI_TASK_H_
diff --git a/firestore/src/jni/throwable.h b/firestore/src/jni/throwable.h
index 81af55c477..e1a954245e 100644
--- a/firestore/src/jni/throwable.h
+++ b/firestore/src/jni/throwable.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_THROWABLE_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_THROWABLE_H_
+#ifndef FIREBASE_FIRESTORE_SRC_JNI_THROWABLE_H_
+#define FIREBASE_FIRESTORE_SRC_JNI_THROWABLE_H_
 
 #include "firestore/src/jni/object.h"
 
@@ -36,4 +36,4 @@ class Throwable : public Object {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_THROWABLE_H_
+#endif  // FIREBASE_FIRESTORE_SRC_JNI_THROWABLE_H_
diff --git a/firestore/src/jni/traits.h b/firestore/src/jni/traits.h
index d4734cdc4f..fcdcd5a2b8 100644
--- a/firestore/src/jni/traits.h
+++ b/firestore/src/jni/traits.h
@@ -1,7 +1,7 @@
 // Copyright 2020 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_TRAITS_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_TRAITS_H_
+#ifndef FIREBASE_FIRESTORE_SRC_JNI_TRAITS_H_
+#define FIREBASE_FIRESTORE_SRC_JNI_TRAITS_H_
 
 #include <jni.h>
 
@@ -215,4 +215,4 @@ auto ToJni(const T& value)
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_JNI_TRAITS_H_
+#endif  // FIREBASE_FIRESTORE_SRC_JNI_TRAITS_H_
diff --git a/firestore/src/main/collection_reference_main.h b/firestore/src/main/collection_reference_main.h
index 259b9a8b2f..9646abff1a 100644
--- a/firestore/src/main/collection_reference_main.h
+++ b/firestore/src/main/collection_reference_main.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_COLLECTION_REFERENCE_MAIN_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_COLLECTION_REFERENCE_MAIN_H_
+#ifndef FIREBASE_FIRESTORE_SRC_MAIN_COLLECTION_REFERENCE_MAIN_H_
+#define FIREBASE_FIRESTORE_SRC_MAIN_COLLECTION_REFERENCE_MAIN_H_
 
 #include <string>
 
@@ -33,4 +33,4 @@ class CollectionReferenceInternal : public QueryInternal {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_COLLECTION_REFERENCE_MAIN_H_
+#endif  // FIREBASE_FIRESTORE_SRC_MAIN_COLLECTION_REFERENCE_MAIN_H_
diff --git a/firestore/src/main/converter_main.h b/firestore/src/main/converter_main.h
index 989d4f0ef9..5c5f9d168b 100644
--- a/firestore/src/main/converter_main.h
+++ b/firestore/src/main/converter_main.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_CONVERTER_MAIN_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_CONVERTER_MAIN_H_
+#ifndef FIREBASE_FIRESTORE_SRC_MAIN_CONVERTER_MAIN_H_
+#define FIREBASE_FIRESTORE_SRC_MAIN_CONVERTER_MAIN_H_
 
 #include <memory>
 #include <utility>
@@ -132,4 +132,4 @@ inline const api::DocumentSnapshot& GetCoreApi(const DocumentSnapshot& from) {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_CONVERTER_MAIN_H_
+#endif  // FIREBASE_FIRESTORE_SRC_MAIN_CONVERTER_MAIN_H_
diff --git a/firestore/src/main/create_credentials_provider.h b/firestore/src/main/create_credentials_provider.h
index 52b3356a7d..c7b115b5ff 100644
--- a/firestore/src/main/create_credentials_provider.h
+++ b/firestore/src/main/create_credentials_provider.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_CREATE_CREDENTIALS_PROVIDER_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_CREATE_CREDENTIALS_PROVIDER_H_
+#ifndef FIREBASE_FIRESTORE_SRC_MAIN_CREATE_CREDENTIALS_PROVIDER_H_
+#define FIREBASE_FIRESTORE_SRC_MAIN_CREATE_CREDENTIALS_PROVIDER_H_
 
 #include <memory>
 
@@ -18,4 +18,4 @@ std::unique_ptr<auth::CredentialsProvider> CreateCredentialsProvider(App& app);
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_CREATE_CREDENTIALS_PROVIDER_H_
+#endif  // FIREBASE_FIRESTORE_SRC_MAIN_CREATE_CREDENTIALS_PROVIDER_H_
diff --git a/firestore/src/main/create_firebase_metadata_provider.h b/firestore/src/main/create_firebase_metadata_provider.h
index 0fa8a89708..0177e70973 100644
--- a/firestore/src/main/create_firebase_metadata_provider.h
+++ b/firestore/src/main/create_firebase_metadata_provider.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_CREATE_FIREBASE_METADATA_PROVIDER_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_CREATE_FIREBASE_METADATA_PROVIDER_H_
+#ifndef FIREBASE_FIRESTORE_SRC_MAIN_CREATE_FIREBASE_METADATA_PROVIDER_H_
+#define FIREBASE_FIRESTORE_SRC_MAIN_CREATE_FIREBASE_METADATA_PROVIDER_H_
 
 #include <memory>
 
@@ -19,4 +19,4 @@ CreateFirebaseMetadataProvider(App& app);
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_CREATE_FIREBASE_METADATA_PROVIDER_H_
+#endif  // FIREBASE_FIRESTORE_SRC_MAIN_CREATE_FIREBASE_METADATA_PROVIDER_H_
diff --git a/firestore/src/main/credentials_provider_desktop.h b/firestore/src/main/credentials_provider_desktop.h
index cdfd231a4a..e579f3791c 100644
--- a/firestore/src/main/credentials_provider_desktop.h
+++ b/firestore/src/main/credentials_provider_desktop.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_CREDENTIALS_PROVIDER_DESKTOP_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_CREDENTIALS_PROVIDER_DESKTOP_H_
+#ifndef FIREBASE_FIRESTORE_SRC_MAIN_CREDENTIALS_PROVIDER_DESKTOP_H_
+#define FIREBASE_FIRESTORE_SRC_MAIN_CREDENTIALS_PROVIDER_DESKTOP_H_
 
 #include <memory>
 #include <mutex>  // NOLINT(build/c++11)
@@ -97,4 +97,4 @@ class FirebaseCppCredentialsProvider
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_CREDENTIALS_PROVIDER_DESKTOP_H_
+#endif  // FIREBASE_FIRESTORE_SRC_MAIN_CREDENTIALS_PROVIDER_DESKTOP_H_
diff --git a/firestore/src/main/document_change_main.h b/firestore/src/main/document_change_main.h
index 56a6df64e3..36d0f035f9 100644
--- a/firestore/src/main/document_change_main.h
+++ b/firestore/src/main/document_change_main.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_DOCUMENT_CHANGE_MAIN_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_DOCUMENT_CHANGE_MAIN_H_
+#ifndef FIREBASE_FIRESTORE_SRC_MAIN_DOCUMENT_CHANGE_MAIN_H_
+#define FIREBASE_FIRESTORE_SRC_MAIN_DOCUMENT_CHANGE_MAIN_H_
 
 #include <cstdint>
 
@@ -30,4 +30,4 @@ class DocumentChangeInternal {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_DOCUMENT_CHANGE_MAIN_H_
+#endif  // FIREBASE_FIRESTORE_SRC_MAIN_DOCUMENT_CHANGE_MAIN_H_
diff --git a/firestore/src/main/document_reference_main.h b/firestore/src/main/document_reference_main.h
index bb5b769850..765d3d3d2c 100644
--- a/firestore/src/main/document_reference_main.h
+++ b/firestore/src/main/document_reference_main.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_DOCUMENT_REFERENCE_MAIN_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_DOCUMENT_REFERENCE_MAIN_H_
+#ifndef FIREBASE_FIRESTORE_SRC_MAIN_DOCUMENT_REFERENCE_MAIN_H_
+#define FIREBASE_FIRESTORE_SRC_MAIN_DOCUMENT_REFERENCE_MAIN_H_
 
 #include <functional>
 #include <memory>
@@ -81,4 +81,4 @@ class DocumentReferenceInternal {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_DOCUMENT_REFERENCE_MAIN_H_
+#endif  // FIREBASE_FIRESTORE_SRC_MAIN_DOCUMENT_REFERENCE_MAIN_H_
diff --git a/firestore/src/main/document_snapshot_main.h b/firestore/src/main/document_snapshot_main.h
index de29741703..fc0d4b97a4 100644
--- a/firestore/src/main/document_snapshot_main.h
+++ b/firestore/src/main/document_snapshot_main.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_DOCUMENT_SNAPSHOT_MAIN_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_DOCUMENT_SNAPSHOT_MAIN_H_
+#ifndef FIREBASE_FIRESTORE_SRC_MAIN_DOCUMENT_SNAPSHOT_MAIN_H_
+#define FIREBASE_FIRESTORE_SRC_MAIN_DOCUMENT_SNAPSHOT_MAIN_H_
 
 #include <memory>
 #include <string>
@@ -73,4 +73,4 @@ class DocumentSnapshotInternal {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_DOCUMENT_SNAPSHOT_MAIN_H_
+#endif  // FIREBASE_FIRESTORE_SRC_MAIN_DOCUMENT_SNAPSHOT_MAIN_H_
diff --git a/firestore/src/main/field_value_main.h b/firestore/src/main/field_value_main.h
index 4cd9f2959d..9022ee3b2a 100644
--- a/firestore/src/main/field_value_main.h
+++ b/firestore/src/main/field_value_main.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_FIELD_VALUE_MAIN_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_FIELD_VALUE_MAIN_H_
+#ifndef FIREBASE_FIRESTORE_SRC_MAIN_FIELD_VALUE_MAIN_H_
+#define FIREBASE_FIRESTORE_SRC_MAIN_FIELD_VALUE_MAIN_H_
 
 #include <cstdint>
 #include <string>
@@ -87,4 +87,4 @@ std::string Describe(FieldValue::Type type);
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_FIELD_VALUE_MAIN_H_
+#endif  // FIREBASE_FIRESTORE_SRC_MAIN_FIELD_VALUE_MAIN_H_
diff --git a/firestore/src/main/firebase_metadata_provider_desktop.h b/firestore/src/main/firebase_metadata_provider_desktop.h
index bdefb5200b..557da90c00 100644
--- a/firestore/src/main/firebase_metadata_provider_desktop.h
+++ b/firestore/src/main/firebase_metadata_provider_desktop.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_FIREBASE_METADATA_PROVIDER_DESKTOP_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_FIREBASE_METADATA_PROVIDER_DESKTOP_H_
+#ifndef FIREBASE_FIRESTORE_SRC_MAIN_FIREBASE_METADATA_PROVIDER_DESKTOP_H_
+#define FIREBASE_FIRESTORE_SRC_MAIN_FIREBASE_METADATA_PROVIDER_DESKTOP_H_
 
 #include "Firestore/core/src/remote/firebase_metadata_provider.h"
 
@@ -17,4 +17,4 @@ class FirebaseMetadataProviderCpp : public remote::FirebaseMetadataProvider {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_FIREBASE_METADATA_PROVIDER_DESKTOP_H_
+#endif  // FIREBASE_FIRESTORE_SRC_MAIN_FIREBASE_METADATA_PROVIDER_DESKTOP_H_
diff --git a/firestore/src/main/firestore_main.h b/firestore/src/main/firestore_main.h
index 9753579ccf..3db6d4c795 100644
--- a/firestore/src/main/firestore_main.h
+++ b/firestore/src/main/firestore_main.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_FIRESTORE_MAIN_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_FIRESTORE_MAIN_H_
+#ifndef FIREBASE_FIRESTORE_SRC_MAIN_FIRESTORE_MAIN_H_
+#define FIREBASE_FIRESTORE_SRC_MAIN_FIRESTORE_MAIN_H_
 
 #include <cstdint>
 #include <functional>
@@ -164,4 +164,4 @@ class FirestoreInternal {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_FIRESTORE_MAIN_H_
+#endif  // FIREBASE_FIRESTORE_SRC_MAIN_FIRESTORE_MAIN_H_
diff --git a/firestore/src/main/listener_main.h b/firestore/src/main/listener_main.h
index 9221566b83..275b2aca49 100644
--- a/firestore/src/main/listener_main.h
+++ b/firestore/src/main/listener_main.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_LISTENER_MAIN_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_LISTENER_MAIN_H_
+#ifndef FIREBASE_FIRESTORE_SRC_MAIN_LISTENER_MAIN_H_
+#define FIREBASE_FIRESTORE_SRC_MAIN_LISTENER_MAIN_H_
 
 #include <functional>
 #include <memory>
@@ -96,4 +96,4 @@ inline util::StatusCallback StatusCallbackWithPromise(Promise<void> promise) {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_LISTENER_MAIN_H_
+#endif  // FIREBASE_FIRESTORE_SRC_MAIN_LISTENER_MAIN_H_
diff --git a/firestore/src/main/listener_registration_main.h b/firestore/src/main/listener_registration_main.h
index 907050b289..5d3b1117b3 100644
--- a/firestore/src/main/listener_registration_main.h
+++ b/firestore/src/main/listener_registration_main.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_LISTENER_REGISTRATION_MAIN_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_LISTENER_REGISTRATION_MAIN_H_
+#ifndef FIREBASE_FIRESTORE_SRC_MAIN_LISTENER_REGISTRATION_MAIN_H_
+#define FIREBASE_FIRESTORE_SRC_MAIN_LISTENER_REGISTRATION_MAIN_H_
 
 #include <memory>
 
@@ -36,4 +36,4 @@ class ListenerRegistrationInternal {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_LISTENER_REGISTRATION_MAIN_H_
+#endif  // FIREBASE_FIRESTORE_SRC_MAIN_LISTENER_REGISTRATION_MAIN_H_
diff --git a/firestore/src/main/promise_factory_main.h b/firestore/src/main/promise_factory_main.h
index ce38babe63..254bf8061d 100644
--- a/firestore/src/main/promise_factory_main.h
+++ b/firestore/src/main/promise_factory_main.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_PROMISE_FACTORY_MAIN_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_PROMISE_FACTORY_MAIN_H_
+#ifndef FIREBASE_FIRESTORE_SRC_MAIN_PROMISE_FACTORY_MAIN_H_
+#define FIREBASE_FIRESTORE_SRC_MAIN_PROMISE_FACTORY_MAIN_H_
 
 #include <utility>
 
@@ -70,4 +70,4 @@ class PromiseFactory {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_PROMISE_FACTORY_MAIN_H_
+#endif  // FIREBASE_FIRESTORE_SRC_MAIN_PROMISE_FACTORY_MAIN_H_
diff --git a/firestore/src/main/promise_main.h b/firestore/src/main/promise_main.h
index 670dcdcb3f..dea36000f5 100644
--- a/firestore/src/main/promise_main.h
+++ b/firestore/src/main/promise_main.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_PROMISE_MAIN_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_PROMISE_MAIN_H_
+#ifndef FIREBASE_FIRESTORE_SRC_MAIN_PROMISE_MAIN_H_
+#define FIREBASE_FIRESTORE_SRC_MAIN_PROMISE_MAIN_H_
 
 #include <mutex>  // NOLINT(build/c++11)
 #include <utility>
@@ -201,4 +201,4 @@ class Promise {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_PROMISE_MAIN_H_
+#endif  // FIREBASE_FIRESTORE_SRC_MAIN_PROMISE_MAIN_H_
diff --git a/firestore/src/main/query_main.h b/firestore/src/main/query_main.h
index 8e47b838df..0498163681 100644
--- a/firestore/src/main/query_main.h
+++ b/firestore/src/main/query_main.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_QUERY_MAIN_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_QUERY_MAIN_H_
+#ifndef FIREBASE_FIRESTORE_SRC_MAIN_QUERY_MAIN_H_
+#define FIREBASE_FIRESTORE_SRC_MAIN_QUERY_MAIN_H_
 
 #include <cstdint>
 #include <vector>
@@ -198,4 +198,4 @@ inline bool operator!=(const QueryInternal& lhs, const QueryInternal& rhs) {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_QUERY_MAIN_H_
+#endif  // FIREBASE_FIRESTORE_SRC_MAIN_QUERY_MAIN_H_
diff --git a/firestore/src/main/query_snapshot_main.h b/firestore/src/main/query_snapshot_main.h
index 22331d6b0a..046ceffcb0 100644
--- a/firestore/src/main/query_snapshot_main.h
+++ b/firestore/src/main/query_snapshot_main.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_QUERY_SNAPSHOT_MAIN_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_QUERY_SNAPSHOT_MAIN_H_
+#ifndef FIREBASE_FIRESTORE_SRC_MAIN_QUERY_SNAPSHOT_MAIN_H_
+#define FIREBASE_FIRESTORE_SRC_MAIN_QUERY_SNAPSHOT_MAIN_H_
 
 #include <cstddef>
 #include <vector>
@@ -46,4 +46,4 @@ class QuerySnapshotInternal {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_QUERY_SNAPSHOT_MAIN_H_
+#endif  // FIREBASE_FIRESTORE_SRC_MAIN_QUERY_SNAPSHOT_MAIN_H_
diff --git a/firestore/src/main/set_options_main.h b/firestore/src/main/set_options_main.h
index de167c865f..9407ceb0d7 100644
--- a/firestore/src/main/set_options_main.h
+++ b/firestore/src/main/set_options_main.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_SET_OPTIONS_MAIN_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_SET_OPTIONS_MAIN_H_
+#ifndef FIREBASE_FIRESTORE_SRC_MAIN_SET_OPTIONS_MAIN_H_
+#define FIREBASE_FIRESTORE_SRC_MAIN_SET_OPTIONS_MAIN_H_
 
 #include <utility>
 
@@ -32,4 +32,4 @@ class SetOptionsInternal {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_SET_OPTIONS_MAIN_H_
+#endif  // FIREBASE_FIRESTORE_SRC_MAIN_SET_OPTIONS_MAIN_H_
diff --git a/firestore/src/main/source_main.h b/firestore/src/main/source_main.h
index 314d881f69..d2a16f1fbb 100644
--- a/firestore/src/main/source_main.h
+++ b/firestore/src/main/source_main.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_SOURCE_MAIN_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_SOURCE_MAIN_H_
+#ifndef FIREBASE_FIRESTORE_SRC_MAIN_SOURCE_MAIN_H_
+#define FIREBASE_FIRESTORE_SRC_MAIN_SOURCE_MAIN_H_
 
 #include "Firestore/core/src/api/source.h"
 #include "firestore/src/common/hard_assert_common.h"
@@ -25,4 +25,4 @@ inline api::Source ToCoreApi(Source source) {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_SOURCE_MAIN_H_
+#endif  // FIREBASE_FIRESTORE_SRC_MAIN_SOURCE_MAIN_H_
diff --git a/firestore/src/main/transaction_main.h b/firestore/src/main/transaction_main.h
index cdb6cdd2c6..1a893b21fb 100644
--- a/firestore/src/main/transaction_main.h
+++ b/firestore/src/main/transaction_main.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_TRANSACTION_MAIN_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_TRANSACTION_MAIN_H_
+#ifndef FIREBASE_FIRESTORE_SRC_MAIN_TRANSACTION_MAIN_H_
+#define FIREBASE_FIRESTORE_SRC_MAIN_TRANSACTION_MAIN_H_
 
 #include <memory>
 #include <string>
@@ -50,4 +50,4 @@ class TransactionInternal {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_TRANSACTION_MAIN_H_
+#endif  // FIREBASE_FIRESTORE_SRC_MAIN_TRANSACTION_MAIN_H_
diff --git a/firestore/src/main/user_data_converter_main.h b/firestore/src/main/user_data_converter_main.h
index 540aefcec4..670ced3dc3 100644
--- a/firestore/src/main/user_data_converter_main.h
+++ b/firestore/src/main/user_data_converter_main.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_USER_DATA_CONVERTER_MAIN_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_USER_DATA_CONVERTER_MAIN_H_
+#ifndef FIREBASE_FIRESTORE_SRC_MAIN_USER_DATA_CONVERTER_MAIN_H_
+#define FIREBASE_FIRESTORE_SRC_MAIN_USER_DATA_CONVERTER_MAIN_H_
 
 #include <utility>
 #include <vector>
@@ -99,4 +99,4 @@ class UserDataConverter {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_USER_DATA_CONVERTER_MAIN_H_
+#endif  // FIREBASE_FIRESTORE_SRC_MAIN_USER_DATA_CONVERTER_MAIN_H_
diff --git a/firestore/src/main/util_main.h b/firestore/src/main/util_main.h
index 7d61039bd7..b3ac381880 100644
--- a/firestore/src/main/util_main.h
+++ b/firestore/src/main/util_main.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_UTIL_MAIN_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_UTIL_MAIN_H_
+#ifndef FIREBASE_FIRESTORE_SRC_MAIN_UTIL_MAIN_H_
+#define FIREBASE_FIRESTORE_SRC_MAIN_UTIL_MAIN_H_
 
 #include "Firestore/core/src/api/firestore.h"
 #include "firestore/src/include/firebase/firestore.h"
@@ -24,4 +24,4 @@ Firestore* GetFirestore(T* object) {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_UTIL_MAIN_H_
+#endif  // FIREBASE_FIRESTORE_SRC_MAIN_UTIL_MAIN_H_
diff --git a/firestore/src/main/write_batch_main.h b/firestore/src/main/write_batch_main.h
index 3265849d2a..adc47a3d4c 100644
--- a/firestore/src/main/write_batch_main.h
+++ b/firestore/src/main/write_batch_main.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_WRITE_BATCH_MAIN_H_
-#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_WRITE_BATCH_MAIN_H_
+#ifndef FIREBASE_FIRESTORE_SRC_MAIN_WRITE_BATCH_MAIN_H_
+#define FIREBASE_FIRESTORE_SRC_MAIN_WRITE_BATCH_MAIN_H_
 
 #include "Firestore/core/src/api/write_batch.h"
 #include "firestore/src/include/firebase/firestore/document_reference.h"
@@ -46,4 +46,4 @@ class WriteBatchInternal {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_CLIENT_CPP_SRC_MAIN_WRITE_BATCH_MAIN_H_
+#endif  // FIREBASE_FIRESTORE_SRC_MAIN_WRITE_BATCH_MAIN_H_
diff --git a/functions/src/android/callable_reference_android.h b/functions/src/android/callable_reference_android.h
index 4643b07126..54a9d84e5c 100644
--- a/functions/src/android/callable_reference_android.h
+++ b/functions/src/android/callable_reference_android.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_ANDROID_CALLABLE_REFERENCE_ANDROID_H_
-#define FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_ANDROID_CALLABLE_REFERENCE_ANDROID_H_
+#ifndef FIREBASE_FUNCTIONS_SRC_ANDROID_CALLABLE_REFERENCE_ANDROID_H_
+#define FIREBASE_FUNCTIONS_SRC_ANDROID_CALLABLE_REFERENCE_ANDROID_H_
 
 #include <jni.h>
 
@@ -82,4 +82,4 @@ class HttpsCallableReferenceInternal {
 }  // namespace functions
 }  // namespace firebase
 
-#endif  // FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_ANDROID_CALLABLE_REFERENCE_ANDROID_H_
+#endif  // FIREBASE_FUNCTIONS_SRC_ANDROID_CALLABLE_REFERENCE_ANDROID_H_
diff --git a/functions/src/android/functions_android.h b/functions/src/android/functions_android.h
index 49104fded4..3716462270 100644
--- a/functions/src/android/functions_android.h
+++ b/functions/src/android/functions_android.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_ANDROID_FUNCTIONS_ANDROID_H_
-#define FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_ANDROID_FUNCTIONS_ANDROID_H_
+#ifndef FIREBASE_FUNCTIONS_SRC_ANDROID_FUNCTIONS_ANDROID_H_
+#define FIREBASE_FUNCTIONS_SRC_ANDROID_FUNCTIONS_ANDROID_H_
 
 #include <jni.h>
 
@@ -99,4 +99,4 @@ class FunctionsInternal {
 }  // namespace functions
 }  // namespace firebase
 
-#endif  // FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_ANDROID_FUNCTIONS_ANDROID_H_
+#endif  // FIREBASE_FUNCTIONS_SRC_ANDROID_FUNCTIONS_ANDROID_H_
diff --git a/functions/src/desktop/callable_reference_desktop.h b/functions/src/desktop/callable_reference_desktop.h
index 1676b0df1b..6dfb30f4e5 100644
--- a/functions/src/desktop/callable_reference_desktop.h
+++ b/functions/src/desktop/callable_reference_desktop.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_DESKTOP_CALLABLE_REFERENCE_DESKTOP_H_
-#define FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_DESKTOP_CALLABLE_REFERENCE_DESKTOP_H_
+#ifndef FIREBASE_FUNCTIONS_SRC_DESKTOP_CALLABLE_REFERENCE_DESKTOP_H_
+#define FIREBASE_FUNCTIONS_SRC_DESKTOP_CALLABLE_REFERENCE_DESKTOP_H_
 
 #include "app/rest/transport_curl.h"
 #include "app/rest/transport_interface.h"
@@ -123,4 +123,4 @@ class HttpsCallableReferenceInternal {
 }  // namespace functions
 }  // namespace firebase
 
-#endif  // FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_DESKTOP_CALLABLE_REFERENCE_DESKTOP_H_
+#endif  // FIREBASE_FUNCTIONS_SRC_DESKTOP_CALLABLE_REFERENCE_DESKTOP_H_
diff --git a/functions/src/desktop/functions_desktop.h b/functions/src/desktop/functions_desktop.h
index ae84237edb..07b14040cb 100644
--- a/functions/src/desktop/functions_desktop.h
+++ b/functions/src/desktop/functions_desktop.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_DESKTOP_FUNCTIONS_DESKTOP_H_
-#define FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_DESKTOP_FUNCTIONS_DESKTOP_H_
+#ifndef FIREBASE_FUNCTIONS_SRC_DESKTOP_FUNCTIONS_DESKTOP_H_
+#define FIREBASE_FUNCTIONS_SRC_DESKTOP_FUNCTIONS_DESKTOP_H_
 
 #include "app/src/cleanup_notifier.h"
 #include "app/src/future_manager.h"
@@ -70,4 +70,4 @@ class FunctionsInternal {
 }  // namespace functions
 }  // namespace firebase
 
-#endif  // FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_DESKTOP_FUNCTIONS_DESKTOP_H_
+#endif  // FIREBASE_FUNCTIONS_SRC_DESKTOP_FUNCTIONS_DESKTOP_H_
diff --git a/functions/src/desktop/serialization.h b/functions/src/desktop/serialization.h
index 777c0a30cb..abe3c9aee6 100644
--- a/functions/src/desktop/serialization.h
+++ b/functions/src/desktop/serialization.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_DESKTOP_SERIALIZATION_H_
-#define FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_DESKTOP_SERIALIZATION_H_
+#ifndef FIREBASE_FUNCTIONS_SRC_DESKTOP_SERIALIZATION_H_
+#define FIREBASE_FUNCTIONS_SRC_DESKTOP_SERIALIZATION_H_
 
 #include "app/src/include/firebase/variant.h"
 
@@ -31,4 +31,4 @@ firebase::Variant Decode(const firebase::Variant& variant);
 }  // namespace functions
 }  // namespace firebase
 
-#endif  // FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_DESKTOP_SERIALIZATION_H_
+#endif  // FIREBASE_FUNCTIONS_SRC_DESKTOP_SERIALIZATION_H_
diff --git a/functions/src/include/firebase/functions.h b/functions/src/include/firebase/functions.h
index eec8c09b62..39335188b5 100644
--- a/functions/src/include/firebase/functions.h
+++ b/functions/src/include/firebase/functions.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FUNCTIONS_H_
-#define FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FUNCTIONS_H_
+#ifndef FIREBASE_FUNCTIONS_SRC_INCLUDE_FIREBASE_FUNCTIONS_H_
+#define FIREBASE_FUNCTIONS_SRC_INCLUDE_FIREBASE_FUNCTIONS_H_
 
 #include <string>
 
@@ -109,4 +109,4 @@ class Functions {
 }  // namespace functions
 }  // namespace firebase
 
-#endif  // FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FUNCTIONS_H_
+#endif  // FIREBASE_FUNCTIONS_SRC_INCLUDE_FIREBASE_FUNCTIONS_H_
diff --git a/functions/src/include/firebase/functions/callable_reference.h b/functions/src/include/firebase/functions/callable_reference.h
index 7fc8231378..9641c23564 100644
--- a/functions/src/include/firebase/functions/callable_reference.h
+++ b/functions/src/include/firebase/functions/callable_reference.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FUNCTIONS_CALLABLE_REFERENCE_H_
-#define FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FUNCTIONS_CALLABLE_REFERENCE_H_
+#ifndef FIREBASE_FUNCTIONS_SRC_INCLUDE_FIREBASE_FUNCTIONS_CALLABLE_REFERENCE_H_
+#define FIREBASE_FUNCTIONS_SRC_INCLUDE_FIREBASE_FUNCTIONS_CALLABLE_REFERENCE_H_
 
 #include <string>
 #include <vector>
@@ -121,4 +121,4 @@ class HttpsCallableReference {
 }  // namespace functions
 }  // namespace firebase
 
-#endif  // FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FUNCTIONS_CALLABLE_REFERENCE_H_
+#endif  // FIREBASE_FUNCTIONS_SRC_INCLUDE_FIREBASE_FUNCTIONS_CALLABLE_REFERENCE_H_
diff --git a/functions/src/include/firebase/functions/callable_result.h b/functions/src/include/firebase/functions/callable_result.h
index ddc9536b1b..84cf870df1 100644
--- a/functions/src/include/firebase/functions/callable_result.h
+++ b/functions/src/include/firebase/functions/callable_result.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FUNCTIONS_CALLABLE_RESULT_H_
-#define FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FUNCTIONS_CALLABLE_RESULT_H_
+#ifndef FIREBASE_FUNCTIONS_SRC_INCLUDE_FIREBASE_FUNCTIONS_CALLABLE_RESULT_H_
+#define FIREBASE_FUNCTIONS_SRC_INCLUDE_FIREBASE_FUNCTIONS_CALLABLE_RESULT_H_
 
 #include "firebase/variant.h"
 #include "firebase/functions/common.h"
@@ -93,4 +93,4 @@ class HttpsCallableResult {
 }  // namespace functions
 }  // namespace firebase
 
-#endif  // FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FUNCTIONS_CALLABLE_RESULT_H_
+#endif  // FIREBASE_FUNCTIONS_SRC_INCLUDE_FIREBASE_FUNCTIONS_CALLABLE_RESULT_H_
diff --git a/functions/src/include/firebase/functions/common.h b/functions/src/include/firebase/functions/common.h
index 2f29ae84ee..aa4b864dab 100644
--- a/functions/src/include/firebase/functions/common.h
+++ b/functions/src/include/firebase/functions/common.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FUNCTIONS_COMMON_H_
-#define FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FUNCTIONS_COMMON_H_
+#ifndef FIREBASE_FUNCTIONS_SRC_INCLUDE_FIREBASE_FUNCTIONS_COMMON_H_
+#define FIREBASE_FUNCTIONS_SRC_INCLUDE_FIREBASE_FUNCTIONS_COMMON_H_
 
 #include "firebase/variant.h"
 
@@ -203,4 +203,4 @@ const char* GetErrorMessage(Error error);
 }  // namespace functions
 }  // namespace firebase
 
-#endif  // FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_INCLUDE_FIREBASE_FUNCTIONS_COMMON_H_
+#endif  // FIREBASE_FUNCTIONS_SRC_INCLUDE_FIREBASE_FUNCTIONS_COMMON_H_
diff --git a/functions/src/ios/callable_reference_ios.h b/functions/src/ios/callable_reference_ios.h
index bf2692fd07..c130d814e0 100644
--- a/functions/src/ios/callable_reference_ios.h
+++ b/functions/src/ios/callable_reference_ios.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_IOS_FUNCTIONS_REFERENCE_IOS_H_
-#define FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_IOS_FUNCTIONS_REFERENCE_IOS_H_
+#ifndef FIREBASE_FUNCTIONS_SRC_IOS_CALLABLE_REFERENCE_IOS_H_
+#define FIREBASE_FUNCTIONS_SRC_IOS_CALLABLE_REFERENCE_IOS_H_
 
 #include "app/memory/unique_ptr.h"
 #include "app/src/include/firebase/future.h"
@@ -100,4 +100,4 @@ class HttpsCallableReferenceInternal {
 }  // namespace functions
 }  // namespace firebase
 
-#endif  // FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_IOS_FUNCTIONS_REFERENCE_IOS_H_
+#endif  // FIREBASE_FUNCTIONS_SRC_IOS_CALLABLE_REFERENCE_IOS_H_
diff --git a/functions/src/ios/functions_ios.h b/functions/src/ios/functions_ios.h
index 0cb936f7a3..1b337376dc 100644
--- a/functions/src/ios/functions_ios.h
+++ b/functions/src/ios/functions_ios.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_IOS_FUNCTIONS_IOS_H_
-#define FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_IOS_FUNCTIONS_IOS_H_
+#ifndef FIREBASE_FUNCTIONS_SRC_IOS_FUNCTIONS_IOS_H_
+#define FIREBASE_FUNCTIONS_SRC_IOS_FUNCTIONS_IOS_H_
 
 #include <map>
 #include <set>
@@ -86,4 +86,4 @@ class FunctionsInternal {
 }  // namespace functions
 }  // namespace firebase
 
-#endif  // FIREBASE_FUNCTIONS_CLIENT_CPP_SRC_IOS_FUNCTIONS_IOS_H_
+#endif  // FIREBASE_FUNCTIONS_SRC_IOS_FUNCTIONS_IOS_H_
diff --git a/installations/src/android/installations_android.h b/installations/src/android/installations_android.h
index f8cc68c0fa..ec0212098e 100644
--- a/installations/src/android/installations_android.h
+++ b/installations/src/android/installations_android.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_FIS_CLIENT_CPP_SRC_ANDROID_INSTALLATIONS_ANDROID_H_
-#define FIREBASE_FIS_CLIENT_CPP_SRC_ANDROID_INSTALLATIONS_ANDROID_H_
+#ifndef FIREBASE_INSTALLATIONS_SRC_ANDROID_INSTALLATIONS_ANDROID_H_
+#define FIREBASE_INSTALLATIONS_SRC_ANDROID_INSTALLATIONS_ANDROID_H_
 
 #include "app/src/reference_count.h"
 #include "app/src/reference_counted_future_impl.h"
@@ -62,4 +62,4 @@ class InstallationsInternal {
 }  // namespace installations
 }  // namespace firebase
 
-#endif  // FIREBASE_FIS_CLIENT_CPP_SRC_ANDROID_INSTALLATIONS_ANDROID_H_
+#endif  // FIREBASE_INSTALLATIONS_SRC_ANDROID_INSTALLATIONS_ANDROID_H_
diff --git a/installations/src/common.h b/installations/src/common.h
index d36f62d9ad..19642c9551 100644
--- a/installations/src/common.h
+++ b/installations/src/common.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_FIS_CLIENT_CPP_SRC_COMMON_H_
-#define FIREBASE_FIS_CLIENT_CPP_SRC_COMMON_H_
+#ifndef FIREBASE_INSTALLATIONS_SRC_COMMON_H_
+#define FIREBASE_INSTALLATIONS_SRC_COMMON_H_
 
 namespace firebase {
 namespace installations {
@@ -38,4 +38,4 @@ enum InstallationsError {
 }  // namespace installations
 }  // namespace firebase
 
-#endif  // FIREBASE_FIS_CLIENT_CPP_SRC_COMMON_H_
+#endif  // FIREBASE_INSTALLATIONS_SRC_COMMON_H_
diff --git a/installations/src/include/firebase/installations.h b/installations/src/include/firebase/installations.h
index 55d2ab1d04..c9774bc37e 100644
--- a/installations/src/include/firebase/installations.h
+++ b/installations/src/include/firebase/installations.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_FIS_CLIENT_CPP_SRC_INCLUDE_FIREBASE_INSTALLATIONS_H_
-#define FIREBASE_FIS_CLIENT_CPP_SRC_INCLUDE_FIREBASE_INSTALLATIONS_H_
+#ifndef FIREBASE_INSTALLATIONS_SRC_INCLUDE_FIREBASE_INSTALLATIONS_H_
+#define FIREBASE_INSTALLATIONS_SRC_INCLUDE_FIREBASE_INSTALLATIONS_H_
 
 #include <cstdint>
 #include <string>
@@ -120,4 +120,4 @@ class Installations {
 
 }  // namespace firebase
 
-#endif  // FIREBASE_FIS_CLIENT_CPP_SRC_INCLUDE_FIREBASE_INSTALLATIONS_H_
+#endif  // FIREBASE_INSTALLATIONS_SRC_INCLUDE_FIREBASE_INSTALLATIONS_H_
diff --git a/installations/src/installations_internal.h b/installations/src/installations_internal.h
index c7ecd7880f..aadb5b6364 100644
--- a/installations/src/installations_internal.h
+++ b/installations/src/installations_internal.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_FIS_CLIENT_CPP_SRC_INSTALLATIONS_INTERNAL_H_
-#define FIREBASE_FIS_CLIENT_CPP_SRC_INSTALLATIONS_INTERNAL_H_
+#ifndef FIREBASE_INSTALLATIONS_SRC_INSTALLATIONS_INTERNAL_H_
+#define FIREBASE_INSTALLATIONS_SRC_INSTALLATIONS_INTERNAL_H_
 
 #include "app/src/include/firebase/internal/platform.h"
 
@@ -28,4 +28,4 @@
 #endif  // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS,
         // FIREBASE_PLATFORM_TVOS
 
-#endif  // FIREBASE_FIS_CLIENT_CPP_SRC_INSTALLATIONS_INTERNAL_H_
+#endif  // FIREBASE_INSTALLATIONS_SRC_INSTALLATIONS_INTERNAL_H_
diff --git a/installations/src/ios/installations_ios.h b/installations/src/ios/installations_ios.h
index 4a1997bdce..b54cf2ab45 100644
--- a/installations/src/ios/installations_ios.h
+++ b/installations/src/ios/installations_ios.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_FIS_CLIENT_CPP_SRC_IOS_INSTALLATIONS_IOS_H_
-#define FIREBASE_FIS_CLIENT_CPP_SRC_IOS_INSTALLATIONS_IOS_H_
+#ifndef FIREBASE_INSTALLATIONS_SRC_IOS_INSTALLATIONS_IOS_H_
+#define FIREBASE_INSTALLATIONS_SRC_IOS_INSTALLATIONS_IOS_H_
 
 #include "firebase/app.h"
 #include "app/memory/unique_ptr.h"
@@ -72,4 +72,4 @@ class InstallationsInternal {
 }  // namespace installations
 }  // namespace firebase
 
-#endif  // FIREBASE_FIS_CLIENT_CPP_SRC_IOS_INSTALLATIONS_IOS_H_
+#endif  // FIREBASE_INSTALLATIONS_SRC_IOS_INSTALLATIONS_IOS_H_
diff --git a/installations/src/stub/installations_stub.h b/installations/src/stub/installations_stub.h
index 2c30b2e9f4..74a4c71319 100644
--- a/installations/src/stub/installations_stub.h
+++ b/installations/src/stub/installations_stub.h
@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef FIREBASE_FIS_CLIENT_CPP_SRC_STUB_INSTALLATIONS_STUB_H_
-#define FIREBASE_FIS_CLIENT_CPP_SRC_STUB_INSTALLATIONS_STUB_H_
+#ifndef FIREBASE_INSTALLATIONS_SRC_STUB_INSTALLATIONS_STUB_H_
+#define FIREBASE_INSTALLATIONS_SRC_STUB_INSTALLATIONS_STUB_H_
 
 #include "app/src/reference_counted_future_impl.h"
 #include "firebase/app.h"
@@ -55,4 +55,4 @@ class InstallationsInternal {
 }  // namespace installations
 }  // namespace firebase
 
-#endif  // FIREBASE_FIS_CLIENT_CPP_SRC_STUB_INSTALLATIONS_STUB_H_
+#endif  // FIREBASE_INSTALLATIONS_SRC_STUB_INSTALLATIONS_STUB_H_
diff --git a/installations/src_ios/fake/FIRInstallations.h b/installations/src_ios/fake/FIRInstallations.h
index d140761980..0f877a0fb3 100644
--- a/installations/src_ios/fake/FIRInstallations.h
+++ b/installations/src_ios/fake/FIRInstallations.h
@@ -16,8 +16,8 @@
 
 #import <Foundation/Foundation.h>
 
-#ifndef FIREBASE_FIS_CLIENT_CPP_SRC_IOS_FAKE_FIRINSTALLATIONS_H_
-#define FIREBASE_FIS_CLIENT_CPP_SRC_IOS_FAKE_FIRINSTALLATIONS_H_
+#ifndef FIREBASE_INSTALLATIONS_SRC_IOS_FAKE_FIRINSTALLATIONS_H_
+#define FIREBASE_INSTALLATIONS_SRC_IOS_FAKE_FIRINSTALLATIONS_H_
 
 @class FIRApp;
 @class FIRInstallationsAuthTokenResult;
@@ -117,4 +117,4 @@ NS_SWIFT_NAME(Installations)
 
 NS_ASSUME_NONNULL_END
 
-#endif  // FIREBASE_FIS_CLIENT_CPP_SRC_IOS_FAKE_FIRINSTALLATIONS_H_
+#endif  // FIREBASE_INSTALLATIONS_SRC_IOS_FAKE_FIRINSTALLATIONS_H_
diff --git a/installations/src_ios/fake/FIRInstallationsAuthTokenResult.h b/installations/src_ios/fake/FIRInstallationsAuthTokenResult.h
index 7f8f218b31..e51754cca5 100644
--- a/installations/src_ios/fake/FIRInstallationsAuthTokenResult.h
+++ b/installations/src_ios/fake/FIRInstallationsAuthTokenResult.h
@@ -15,8 +15,8 @@
  */
 
 
-#ifndef FIREBASE_FIS_CLIENT_CPP_SRC_IOS_FAKE_FIRINSTALLATIONSAUTHTOKENRESULT_H_
-#define FIREBASE_FIS_CLIENT_CPP_SRC_IOS_FAKE_FIRINSTALLATIONSAUTHTOKENRESULT_H_
+#ifndef FIREBASE_INSTALLATIONS_SRC_IOS_FAKE_FIRINSTALLATIONSAUTHTOKENRESULT_H_
+#define FIREBASE_INSTALLATIONS_SRC_IOS_FAKE_FIRINSTALLATIONSAUTHTOKENRESULT_H_
 
 #import <Foundation/Foundation.h>
 
@@ -38,4 +38,4 @@ NS_SWIFT_NAME(InstallationsAuthTokenResult)
 
 NS_ASSUME_NONNULL_END
 
-#endif  // FIREBASE_FIS_CLIENT_CPP_SRC_IOS_FAKE_FIRINSTALLATIONSAUTHTOKENRESULT_H_
+#endif  // FIREBASE_INSTALLATIONS_SRC_IOS_FAKE_FIRINSTALLATIONSAUTHTOKENRESULT_H_
diff --git a/messaging/src/android/cpp/message_reader.h b/messaging/src/android/cpp/message_reader.h
index 2286581d9f..2eff3896cd 100644
--- a/messaging/src/android/cpp/message_reader.h
+++ b/messaging/src/android/cpp/message_reader.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_MESSAGING_CLIENT_CPP_SRC_ANDROID_CPP_MESSAGE_READER_H_
-#define FIREBASE_MESSAGING_CLIENT_CPP_SRC_ANDROID_CPP_MESSAGE_READER_H_
+#ifndef FIREBASE_MESSAGING_SRC_ANDROID_CPP_MESSAGE_READER_H_
+#define FIREBASE_MESSAGING_SRC_ANDROID_CPP_MESSAGE_READER_H_
 
 #include <string>
 
@@ -87,4 +87,4 @@ class MessageReader {
 }  // namespace messaging
 }  // namespace firebase
 
-#endif  // FIREBASE_MESSAGING_CLIENT_CPP_SRC_ANDROID_CPP_MESSAGE_READER_H_
+#endif  // FIREBASE_MESSAGING_SRC_ANDROID_CPP_MESSAGE_READER_H_
diff --git a/messaging/src/android/cpp/messaging_internal.h b/messaging/src/android/cpp/messaging_internal.h
index 4bdf64f014..4b83e8d05d 100644
--- a/messaging/src/android/cpp/messaging_internal.h
+++ b/messaging/src/android/cpp/messaging_internal.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_MESSAGING_CLIENT_CPP_SRC_ANDROID_CPP_MESSAGING_INTERNAL_H_
-#define FIREBASE_MESSAGING_CLIENT_CPP_SRC_ANDROID_CPP_MESSAGING_INTERNAL_H_
+#ifndef FIREBASE_MESSAGING_SRC_ANDROID_CPP_MESSAGING_INTERNAL_H_
+#define FIREBASE_MESSAGING_SRC_ANDROID_CPP_MESSAGING_INTERNAL_H_
 
 namespace firebase {
 namespace messaging {
@@ -54,4 +54,4 @@ class FileLocker {
 }  // namespace messaging
 }  // namespace firebase
 
-#endif  // FIREBASE_MESSAGING_CLIENT_CPP_SRC_ANDROID_CPP_MESSAGING_INTERNAL_H_
+#endif  // FIREBASE_MESSAGING_SRC_ANDROID_CPP_MESSAGING_INTERNAL_H_
diff --git a/messaging/src/common.h b/messaging/src/common.h
index 627421d244..09453a433f 100644
--- a/messaging/src/common.h
+++ b/messaging/src/common.h
@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef FIREBASE_MESSAGING_CLIENT_CPP_SRC_COMMON_H_
-#define FIREBASE_MESSAGING_CLIENT_CPP_SRC_COMMON_H_
+#ifndef FIREBASE_MESSAGING_SRC_COMMON_H_
+#define FIREBASE_MESSAGING_SRC_COMMON_H_
 
 #include "app/src/reference_counted_future_impl.h"
 #include "messaging/src/include/firebase/messaging.h"
@@ -84,4 +84,4 @@ void NotifyListenerOnTokenReceived(const char* token);
 }  // namespace messaging
 }  // namespace firebase
 
-#endif  // FIREBASE_MESSAGING_CLIENT_CPP_SRC_COMMON_H_
+#endif  // FIREBASE_MESSAGING_SRC_COMMON_H_
diff --git a/messaging/src/include/firebase/messaging.h b/messaging/src/include/firebase/messaging.h
index 5f3d8328ef..b3283b2b21 100644
--- a/messaging/src/include/firebase/messaging.h
+++ b/messaging/src/include/firebase/messaging.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_MESSAGING_CLIENT_CPP_INCLUDE_FIREBASE_MESSAGING_H_
-#define FIREBASE_MESSAGING_CLIENT_CPP_INCLUDE_FIREBASE_MESSAGING_H_
+#ifndef FIREBASE_MESSAGING_SRC_INCLUDE_FIREBASE_MESSAGING_H_
+#define FIREBASE_MESSAGING_SRC_INCLUDE_FIREBASE_MESSAGING_H_
 
 #include <stdint.h>
 
@@ -725,4 +725,4 @@ class PollableListener : public Listener {
 }  // namespace messaging
 }  // namespace firebase
 
-#endif  // FIREBASE_MESSAGING_CLIENT_CPP_SRC_INCLUDE_FIREBASE_MESSAGING_H_
+#endif  // FIREBASE_MESSAGING_SRC_INCLUDE_FIREBASE_MESSAGING_H_
diff --git a/messaging/tests/messaging_test_util.h b/messaging/tests/messaging_test_util.h
index b027cd8ef7..78ee6f6fee 100644
--- a/messaging/tests/messaging_test_util.h
+++ b/messaging/tests/messaging_test_util.h
@@ -14,8 +14,8 @@
 
 // This file contains utility methods used by messaging tests where the
 // implementation diverges across platforms.
-#ifndef FIREBASE_MESSAGING_CLIENT_CPP_TESTS_MESSAGING_TEST_UTIL_H_
-#define FIREBASE_MESSAGING_CLIENT_CPP_TESTS_MESSAGING_TEST_UTIL_H_
+#ifndef FIREBASE_MESSAGING_TESTS_MESSAGING_TEST_UTIL_H_
+#define FIREBASE_MESSAGING_TESTS_MESSAGING_TEST_UTIL_H_
 
 namespace firebase {
 namespace messaging {
@@ -48,4 +48,4 @@ void OnMessageSentError(const char* message_id, const char* error);
 }  // namespace messaging
 }  // namespace firebase
 
-#endif  // FIREBASE_MESSAGING_CLIENT_CPP_TESTS_MESSAGING_TEST_UTIL_H_
+#endif  // FIREBASE_MESSAGING_TESTS_MESSAGING_TEST_UTIL_H_
diff --git a/performance/src/android/performance_android_internal.h b/performance/src/android/performance_android_internal.h
index be4d9cd08f..d72e65a39b 100644
--- a/performance/src/android/performance_android_internal.h
+++ b/performance/src/android/performance_android_internal.h
@@ -3,8 +3,8 @@
 // This file contains the declarations of common internal functions that are
 // needed for the android implementation of the Firebase Performance C++
 // bindings to work. Their definitions live in firebase_performance.cc.
-#ifndef FIREBASE_PERFORMANCE_CLIENT_CPP_SRC_ANDROID_PERFORMANCE_ANDROID_INTERNAL_H_
-#define FIREBASE_PERFORMANCE_CLIENT_CPP_SRC_ANDROID_PERFORMANCE_ANDROID_INTERNAL_H_
+#ifndef FIREBASE_PERFORMANCE_SRC_ANDROID_PERFORMANCE_ANDROID_INTERNAL_H_
+#define FIREBASE_PERFORMANCE_SRC_ANDROID_PERFORMANCE_ANDROID_INTERNAL_H_
 
 #include <jni.h>
 
@@ -77,4 +77,4 @@ const ::firebase::App* GetFirebaseApp();
 }  // namespace performance
 }  // namespace firebase
 
-#endif  // FIREBASE_PERFORMANCE_CLIENT_CPP_SRC_ANDROID_PERFORMANCE_ANDROID_INTERNAL_H_
+#endif  // FIREBASE_PERFORMANCE_SRC_ANDROID_PERFORMANCE_ANDROID_INTERNAL_H_
diff --git a/performance/src/include/firebase/performance.h b/performance/src/include/firebase/performance.h
index a517812795..f37d45c2cf 100644
--- a/performance/src/include/firebase/performance.h
+++ b/performance/src/include/firebase/performance.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_PERFORMANCE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_PERFORMANCE_H_
-#define FIREBASE_PERFORMANCE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_PERFORMANCE_H_
+#ifndef FIREBASE_PERFORMANCE_SRC_INCLUDE_FIREBASE_PERFORMANCE_H_
+#define FIREBASE_PERFORMANCE_SRC_INCLUDE_FIREBASE_PERFORMANCE_H_
 
 #include "firebase/app.h"
 #include "firebase/performance/http_metric.h"
@@ -61,4 +61,4 @@ void SetPerformanceCollectionEnabled(bool enabled);
 }  // namespace performance
 }  // namespace firebase
 
-#endif  // FIREBASE_PERFORMANCE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_PERFORMANCE_H_
+#endif  // FIREBASE_PERFORMANCE_SRC_INCLUDE_FIREBASE_PERFORMANCE_H_
diff --git a/performance/src/include/firebase/performance/http_metric.h b/performance/src/include/firebase/performance/http_metric.h
index d561b4bb3d..c8bcd45f24 100644
--- a/performance/src/include/firebase/performance/http_metric.h
+++ b/performance/src/include/firebase/performance/http_metric.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_PERFORMANCE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_PERFORMANCE_HTTP_METRIC_H_
-#define FIREBASE_PERFORMANCE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_PERFORMANCE_HTTP_METRIC_H_
+#ifndef FIREBASE_PERFORMANCE_SRC_INCLUDE_FIREBASE_PERFORMANCE_HTTP_METRIC_H_
+#define FIREBASE_PERFORMANCE_SRC_INCLUDE_FIREBASE_PERFORMANCE_HTTP_METRIC_H_
 
 #include <cstdint>
 #include <string>
@@ -167,4 +167,4 @@ class HttpMetric {
 }  // namespace performance
 }  // namespace firebase
 
-#endif  // FIREBASE_PERFORMANCE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_PERFORMANCE_HTTP_METRIC_H_
+#endif  // FIREBASE_PERFORMANCE_SRC_INCLUDE_FIREBASE_PERFORMANCE_HTTP_METRIC_H_
diff --git a/performance/src/include/firebase/performance/trace.h b/performance/src/include/firebase/performance/trace.h
index ac3f7130e9..1b172c3e8c 100644
--- a/performance/src/include/firebase/performance/trace.h
+++ b/performance/src/include/firebase/performance/trace.h
@@ -1,7 +1,7 @@
 // Copyright 2021 Google LLC
 
-#ifndef FIREBASE_PERFORMANCE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_PERFORMANCE_TRACE_H_
-#define FIREBASE_PERFORMANCE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_PERFORMANCE_TRACE_H_
+#ifndef FIREBASE_PERFORMANCE_SRC_INCLUDE_FIREBASE_PERFORMANCE_TRACE_H_
+#define FIREBASE_PERFORMANCE_SRC_INCLUDE_FIREBASE_PERFORMANCE_TRACE_H_
 
 #include <cstdint>
 #include <string>
@@ -133,4 +133,4 @@ class Trace {
 }  // namespace performance
 }  // namespace firebase
 
-#endif  // FIREBASE_PERFORMANCE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_PERFORMANCE_TRACE_H_
+#endif  // FIREBASE_PERFORMANCE_SRC_INCLUDE_FIREBASE_PERFORMANCE_TRACE_H_
diff --git a/performance/src/performance_common.h b/performance/src/performance_common.h
index 080361589e..e816d08ce1 100644
--- a/performance/src/performance_common.h
+++ b/performance/src/performance_common.h
@@ -5,8 +5,8 @@
 // lifecycle of the common FirebaseApp instance. Some of these functions are
 // implemented in a platform independent manner, while some are implemented
 // specific to each platform.
-#ifndef FIREBASE_PERFORMANCE_CLIENT_CPP_SRC_PERFORMANCE_COMMON_H_
-#define FIREBASE_PERFORMANCE_CLIENT_CPP_SRC_PERFORMANCE_COMMON_H_
+#ifndef FIREBASE_PERFORMANCE_SRC_PERFORMANCE_COMMON_H_
+#define FIREBASE_PERFORMANCE_SRC_PERFORMANCE_COMMON_H_
 
 namespace firebase {
 namespace performance {
@@ -29,4 +29,4 @@ void UnregisterTerminateOnDefaultAppDestroy();
 }  // namespace performance
 }  // namespace firebase
 
-#endif  // FIREBASE_PERFORMANCE_CLIENT_CPP_SRC_PERFORMANCE_COMMON_H_
+#endif  // FIREBASE_PERFORMANCE_SRC_PERFORMANCE_COMMON_H_
diff --git a/remote_config/src/android/remote_config_android.h b/remote_config/src/android/remote_config_android.h
index 720b798cd3..f10b3164f4 100644
--- a/remote_config/src/android/remote_config_android.h
+++ b/remote_config/src/android/remote_config_android.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_ANDROID_REMOTE_CONFIG_ANDROID_H_
-#define FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_ANDROID_REMOTE_CONFIG_ANDROID_H_
+#ifndef FIREBASE_REMOTE_CONFIG_SRC_ANDROID_REMOTE_CONFIG_ANDROID_H_
+#define FIREBASE_REMOTE_CONFIG_SRC_ANDROID_REMOTE_CONFIG_ANDROID_H_
 
 #include "app/meta/move.h"
 #include "app/src/include/firebase/internal/common.h"
@@ -120,4 +120,4 @@ class RemoteConfigInternal {
 }  // namespace remote_config
 }  // namespace firebase
 
-#endif  // FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_ANDROID_REMOTE_CONFIG_ANDROID_H_
+#endif  // FIREBASE_REMOTE_CONFIG_SRC_ANDROID_REMOTE_CONFIG_ANDROID_H_
diff --git a/remote_config/src/common.h b/remote_config/src/common.h
index 4001bc8515..089c8795f5 100644
--- a/remote_config/src/common.h
+++ b/remote_config/src/common.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_COMMON_H_
-#define FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_COMMON_H_
+#ifndef FIREBASE_REMOTE_CONFIG_SRC_COMMON_H_
+#define FIREBASE_REMOTE_CONFIG_SRC_COMMON_H_
 
 #include "app/src/reference_counted_future_impl.h"
 #include "app/src/semaphore.h"
@@ -101,4 +101,4 @@ void WaitForFuture(const firebase::Future<T>& future, Semaphore* future_sem,
 }  // namespace remote_config
 }  // namespace firebase
 
-#endif  // FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_COMMON_H_
+#endif  // FIREBASE_REMOTE_CONFIG_SRC_COMMON_H_
diff --git a/remote_config/src/desktop/config_data.h b/remote_config/src/desktop/config_data.h
index 2d20424605..4361f5d528 100644
--- a/remote_config/src/desktop/config_data.h
+++ b/remote_config/src/desktop/config_data.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_DESKTOP_CONFIG_DATA_H_
-#define FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_DESKTOP_CONFIG_DATA_H_
+#ifndef FIREBASE_REMOTE_CONFIG_SRC_DESKTOP_CONFIG_DATA_H_
+#define FIREBASE_REMOTE_CONFIG_SRC_DESKTOP_CONFIG_DATA_H_
 
 #include <cstdint>  // for uint64_t
 #include <map>
@@ -115,4 +115,4 @@ struct LayeredConfigs {
 }  // namespace remote_config
 }  // namespace firebase
 
-#endif  // FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_DESKTOP_CONFIG_DATA_H_
+#endif  // FIREBASE_REMOTE_CONFIG_SRC_DESKTOP_CONFIG_DATA_H_
diff --git a/remote_config/src/desktop/file_manager.h b/remote_config/src/desktop/file_manager.h
index b3cd3ce6fc..9caef187bb 100644
--- a/remote_config/src/desktop/file_manager.h
+++ b/remote_config/src/desktop/file_manager.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_DESKTOP_FILE_MANAGER_H_
-#define FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_DESKTOP_FILE_MANAGER_H_
+#ifndef FIREBASE_REMOTE_CONFIG_SRC_DESKTOP_FILE_MANAGER_H_
+#define FIREBASE_REMOTE_CONFIG_SRC_DESKTOP_FILE_MANAGER_H_
 
 #include <string>
 
@@ -44,4 +44,4 @@ class RemoteConfigFileManager {
 }  // namespace remote_config
 }  // namespace firebase
 
-#endif  // FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_DESKTOP_FILE_MANAGER_H_
+#endif  // FIREBASE_REMOTE_CONFIG_SRC_DESKTOP_FILE_MANAGER_H_
diff --git a/remote_config/src/desktop/metadata.h b/remote_config/src/desktop/metadata.h
index dfdb0b3599..891cb4dbd8 100644
--- a/remote_config/src/desktop/metadata.h
+++ b/remote_config/src/desktop/metadata.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_DESKTOP_METADATA_H_
-#define FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_DESKTOP_METADATA_H_
+#ifndef FIREBASE_REMOTE_CONFIG_SRC_DESKTOP_METADATA_H_
+#define FIREBASE_REMOTE_CONFIG_SRC_DESKTOP_METADATA_H_
 
 #include <map>
 #include <string>
@@ -95,4 +95,4 @@ inline void DeserializeMap(T* map, const flexbuffers::Map& map_ref) {
 }  // namespace remote_config
 }  // namespace firebase
 
-#endif  // FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_DESKTOP_METADATA_H_
+#endif  // FIREBASE_REMOTE_CONFIG_SRC_DESKTOP_METADATA_H_
diff --git a/remote_config/src/desktop/notification_channel.h b/remote_config/src/desktop/notification_channel.h
index 83c2285eb4..ca0114f305 100644
--- a/remote_config/src/desktop/notification_channel.h
+++ b/remote_config/src/desktop/notification_channel.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_DESKTOP_NOTIFICATION_CHANNEL_H_
-#define FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_DESKTOP_NOTIFICATION_CHANNEL_H_
+#ifndef FIREBASE_REMOTE_CONFIG_SRC_DESKTOP_NOTIFICATION_CHANNEL_H_
+#define FIREBASE_REMOTE_CONFIG_SRC_DESKTOP_NOTIFICATION_CHANNEL_H_
 
 #include <condition_variable>  // NOLINT
 
@@ -55,4 +55,4 @@ class NotificationChannel {
 }  // namespace remote_config
 }  // namespace firebase
 
-#endif  // FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_DESKTOP_NOTIFICATION_CHANNEL_H_
+#endif  // FIREBASE_REMOTE_CONFIG_SRC_DESKTOP_NOTIFICATION_CHANNEL_H_
diff --git a/remote_config/src/desktop/remote_config_desktop.h b/remote_config/src/desktop/remote_config_desktop.h
index 1199bfabb4..aa8f41ff88 100644
--- a/remote_config/src/desktop/remote_config_desktop.h
+++ b/remote_config/src/desktop/remote_config_desktop.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_DESKTOP_REMOTE_CONFIG_DESKTOP_H_
-#define FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_DESKTOP_REMOTE_CONFIG_DESKTOP_H_
+#ifndef FIREBASE_REMOTE_CONFIG_SRC_DESKTOP_REMOTE_CONFIG_DESKTOP_H_
+#define FIREBASE_REMOTE_CONFIG_SRC_DESKTOP_REMOTE_CONFIG_DESKTOP_H_
 
 #include <cstdint>
 #include <string>
@@ -231,4 +231,4 @@ class RemoteConfigInternal {
 }  // namespace remote_config
 }  // namespace firebase
 
-#endif  // FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_DESKTOP_REMOTE_CONFIG_DESKTOP_H_
+#endif  // FIREBASE_REMOTE_CONFIG_SRC_DESKTOP_REMOTE_CONFIG_DESKTOP_H_
diff --git a/remote_config/src/desktop/remote_config_request.h b/remote_config/src/desktop/remote_config_request.h
index 02c0fc0ae6..7a47ff8b41 100644
--- a/remote_config/src/desktop/remote_config_request.h
+++ b/remote_config/src/desktop/remote_config_request.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_DESKTOP_REMOTE_CONFIG_REQUEST_H_
-#define FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_DESKTOP_REMOTE_CONFIG_REQUEST_H_
+#ifndef FIREBASE_REMOTE_CONFIG_SRC_DESKTOP_REMOTE_CONFIG_REQUEST_H_
+#define FIREBASE_REMOTE_CONFIG_SRC_DESKTOP_REMOTE_CONFIG_REQUEST_H_
 
 #include "app/rest/request_json.h"
 #include "remote_config/request_generated.h"
@@ -94,4 +94,4 @@ class RemoteConfigRequest
 }  // namespace remote_config
 }  // namespace firebase
 
-#endif  // FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_DESKTOP_REMOTE_CONFIG_REQUEST_H_
+#endif  // FIREBASE_REMOTE_CONFIG_SRC_DESKTOP_REMOTE_CONFIG_REQUEST_H_
diff --git a/remote_config/src/desktop/remote_config_response.h b/remote_config/src/desktop/remote_config_response.h
index 9e15fd3bb3..fb5f876256 100644
--- a/remote_config/src/desktop/remote_config_response.h
+++ b/remote_config/src/desktop/remote_config_response.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_DESKTOP_REMOTE_CONFIG_RESPONSE_H_
-#define FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_DESKTOP_REMOTE_CONFIG_RESPONSE_H_
+#ifndef FIREBASE_REMOTE_CONFIG_SRC_DESKTOP_REMOTE_CONFIG_RESPONSE_H_
+#define FIREBASE_REMOTE_CONFIG_SRC_DESKTOP_REMOTE_CONFIG_RESPONSE_H_
 
 #include "app/rest/response_json.h"
 #include "app/src/include/firebase/variant.h"
@@ -59,4 +59,4 @@ class RemoteConfigResponse
 }  // namespace remote_config
 }  // namespace firebase
 
-#endif  // FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_DESKTOP_REMOTE_CONFIG_RESPONSE_H_
+#endif  // FIREBASE_REMOTE_CONFIG_SRC_DESKTOP_REMOTE_CONFIG_RESPONSE_H_
diff --git a/remote_config/src/desktop/rest.h b/remote_config/src/desktop/rest.h
index d8bee32bc2..3ebd5cf6dc 100644
--- a/remote_config/src/desktop/rest.h
+++ b/remote_config/src/desktop/rest.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_DESKTOP_REST_H_
-#define FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_DESKTOP_REST_H_
+#ifndef FIREBASE_REMOTE_CONFIG_SRC_DESKTOP_REST_H_
+#define FIREBASE_REMOTE_CONFIG_SRC_DESKTOP_REST_H_
 
 #include <cstdint>
 
@@ -143,4 +143,4 @@ class RemoteConfigREST {
 }  // namespace remote_config
 }  // namespace firebase
 
-#endif  // FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_DESKTOP_REST_H_
+#endif  // FIREBASE_REMOTE_CONFIG_SRC_DESKTOP_REST_H_
diff --git a/remote_config/src/include/firebase/remote_config.h b/remote_config/src/include/firebase/remote_config.h
index 4e27b01ce1..a2bd417757 100644
--- a/remote_config/src/include/firebase/remote_config.h
+++ b/remote_config/src/include/firebase/remote_config.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_INCLUDE_FIREBASE_REMOTE_CONFIG_H_
-#define FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_INCLUDE_FIREBASE_REMOTE_CONFIG_H_
+#ifndef FIREBASE_REMOTE_CONFIG_SRC_INCLUDE_FIREBASE_REMOTE_CONFIG_H_
+#define FIREBASE_REMOTE_CONFIG_SRC_INCLUDE_FIREBASE_REMOTE_CONFIG_H_
 
 #include <cstdint>
 #include <string>
@@ -523,4 +523,4 @@ class RemoteConfig {
 }  // namespace remote_config
 }  // namespace firebase
 
-#endif  // FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_INCLUDE_FIREBASE_REMOTE_CONFIG_H_
+#endif  // FIREBASE_REMOTE_CONFIG_SRC_INCLUDE_FIREBASE_REMOTE_CONFIG_H_
diff --git a/remote_config/src/ios/remote_config_ios.h b/remote_config/src/ios/remote_config_ios.h
index 68eb4eea67..6ab15ac208 100644
--- a/remote_config/src/ios/remote_config_ios.h
+++ b/remote_config/src/ios/remote_config_ios.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_IOS_REMOTE_CONFIG_IOS_H_
-#define FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_IOS_REMOTE_CONFIG_IOS_H_
+#ifndef FIREBASE_REMOTE_CONFIG_SRC_IOS_REMOTE_CONFIG_IOS_H_
+#define FIREBASE_REMOTE_CONFIG_SRC_IOS_REMOTE_CONFIG_IOS_H_
 
 #include "firebase/app.h"
 #include "app/memory/unique_ptr.h"
@@ -110,4 +110,4 @@ class RemoteConfigInternal {
 }  // namespace remote_config
 }  // namespace firebase
 
-#endif  // FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_IOS_REMOTE_CONFIG_IOS_H_
+#endif  // FIREBASE_REMOTE_CONFIG_SRC_IOS_REMOTE_CONFIG_IOS_H_
diff --git a/scripts/gha/lint_commenter.py b/scripts/gha/lint_commenter.py
index 2b42015c62..a08ef70964 100755
--- a/scripts/gha/lint_commenter.py
+++ b/scripts/gha/lint_commenter.py
@@ -38,9 +38,9 @@
 
 # Put any lint warnings you want to fully ignore into this list.
 IGNORE_LINT_WARNINGS = [
-    'build/header_guard',
-    'readability/casting',
-    'whitespace/line_length'
+  'build/include_subdir',
+  'readability/casting',
+  'whitespace/indent',
 ]
 # Exclude files within the following paths (specified as regexes)
 EXCLUDE_PATH_REGEX = [
@@ -229,7 +229,7 @@ def main():
               pr_comment['text'] +
               LINT_COMMENT_FOOTER +
               HIDDEN_COMMENT_TAG +
-              '<hidden value=%s></hidden>' % json.dumps(pr_comment['original_line'])
+              '<hidden value=%s></hidden>' % json.dumps(pr_comment['original_line'].replace('"','&quot;'))
                    ),
           'path': pr_comment['filename'],
           'line': pr_comment['line'],
diff --git a/storage/src/android/controller_android.h b/storage/src/android/controller_android.h
index 8bb2f3d071..85287e5f28 100644
--- a/storage/src/android/controller_android.h
+++ b/storage/src/android/controller_android.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_STORAGE_CLIENT_CPP_SRC_ANDROID_CONTROLLER_ANDROID_H_
-#define FIREBASE_STORAGE_CLIENT_CPP_SRC_ANDROID_CONTROLLER_ANDROID_H_
+#ifndef FIREBASE_STORAGE_SRC_ANDROID_CONTROLLER_ANDROID_H_
+#define FIREBASE_STORAGE_SRC_ANDROID_CONTROLLER_ANDROID_H_
 
 #include <jni.h>
 
@@ -136,4 +136,4 @@ class ControllerInternal {
 }  // namespace storage
 }  // namespace firebase
 
-#endif  // FIREBASE_STORAGE_CLIENT_CPP_SRC_ANDROID_CONTROLLER_ANDROID_H_
+#endif  // FIREBASE_STORAGE_SRC_ANDROID_CONTROLLER_ANDROID_H_
diff --git a/storage/src/android/metadata_android.h b/storage/src/android/metadata_android.h
index fb29f36d22..5b7811bb19 100644
--- a/storage/src/android/metadata_android.h
+++ b/storage/src/android/metadata_android.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_STORAGE_CLIENT_CPP_SRC_ANDROID_METADATA_ANDROID_H_
-#define FIREBASE_STORAGE_CLIENT_CPP_SRC_ANDROID_METADATA_ANDROID_H_
+#ifndef FIREBASE_STORAGE_SRC_ANDROID_METADATA_ANDROID_H_
+#define FIREBASE_STORAGE_SRC_ANDROID_METADATA_ANDROID_H_
 
 #include <jni.h>
 
@@ -277,4 +277,4 @@ class MetadataInternal {
 }  // namespace storage
 }  // namespace firebase
 
-#endif  // FIREBASE_STORAGE_CLIENT_CPP_SRC_ANDROID_METADATA_ANDROID_H_
+#endif  // FIREBASE_STORAGE_SRC_ANDROID_METADATA_ANDROID_H_
diff --git a/storage/src/android/storage_android.h b/storage/src/android/storage_android.h
index e417a5200b..77fefac94f 100644
--- a/storage/src/android/storage_android.h
+++ b/storage/src/android/storage_android.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_STORAGE_CLIENT_CPP_SRC_ANDROID_STORAGE_ANDROID_H_
-#define FIREBASE_STORAGE_CLIENT_CPP_SRC_ANDROID_STORAGE_ANDROID_H_
+#ifndef FIREBASE_STORAGE_SRC_ANDROID_STORAGE_ANDROID_H_
+#define FIREBASE_STORAGE_SRC_ANDROID_STORAGE_ANDROID_H_
 
 #include <jni.h>
 
@@ -141,4 +141,4 @@ class StorageInternal {
 }  // namespace storage
 }  // namespace firebase
 
-#endif  // FIREBASE_STORAGE_CLIENT_CPP_SRC_ANDROID_STORAGE_ANDROID_H_
+#endif  // FIREBASE_STORAGE_SRC_ANDROID_STORAGE_ANDROID_H_
diff --git a/storage/src/android/storage_reference_android.h b/storage/src/android/storage_reference_android.h
index 062164e11f..6643a4d8bd 100644
--- a/storage/src/android/storage_reference_android.h
+++ b/storage/src/android/storage_reference_android.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_STORAGE_CLIENT_CPP_SRC_ANDROID_STORAGE_REFERENCE_ANDROID_H_
-#define FIREBASE_STORAGE_CLIENT_CPP_SRC_ANDROID_STORAGE_REFERENCE_ANDROID_H_
+#ifndef FIREBASE_STORAGE_SRC_ANDROID_STORAGE_REFERENCE_ANDROID_H_
+#define FIREBASE_STORAGE_SRC_ANDROID_STORAGE_REFERENCE_ANDROID_H_
 
 #include <jni.h>
 
@@ -172,4 +172,4 @@ class StorageReferenceInternal {
 }  // namespace storage
 }  // namespace firebase
 
-#endif  // FIREBASE_STORAGE_CLIENT_CPP_SRC_ANDROID_STORAGE_REFERENCE_ANDROID_H_
+#endif  // FIREBASE_STORAGE_SRC_ANDROID_STORAGE_REFERENCE_ANDROID_H_
diff --git a/storage/src/common/common_internal.h b/storage/src/common/common_internal.h
index 0ef15bec6d..c36cde13d4 100644
--- a/storage/src/common/common_internal.h
+++ b/storage/src/common/common_internal.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_STORAGE_CLIENT_CPP_SRC_COMMON_COMMON_INTERNAL_H_
-#define FIREBASE_STORAGE_CLIENT_CPP_SRC_COMMON_COMMON_INTERNAL_H_
+#ifndef FIREBASE_STORAGE_SRC_COMMON_COMMON_INTERNAL_H_
+#define FIREBASE_STORAGE_SRC_COMMON_COMMON_INTERNAL_H_
 
 #include "storage/src/include/firebase/storage/metadata.h"
 
@@ -28,4 +28,4 @@ void MetadataSetDefaults(Metadata* metadata);
 }  // namespace storage
 }  // namespace firebase
 
-#endif  // FIREBASE_STORAGE_CLIENT_CPP_SRC_COMMON_COMMON_INTERNAL_H_
+#endif  // FIREBASE_STORAGE_SRC_COMMON_COMMON_INTERNAL_H_
diff --git a/storage/src/common/storage_uri_parser.h b/storage/src/common/storage_uri_parser.h
index 916791b53c..5c8b9e6745 100644
--- a/storage/src/common/storage_uri_parser.h
+++ b/storage/src/common/storage_uri_parser.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_STORAGE_CLIENT_CPP_SRC_COMMON_STORAGE_URI_PARSER_H_
-#define FIREBASE_STORAGE_CLIENT_CPP_SRC_COMMON_STORAGE_URI_PARSER_H_
+#ifndef FIREBASE_STORAGE_SRC_COMMON_STORAGE_URI_PARSER_H_
+#define FIREBASE_STORAGE_SRC_COMMON_STORAGE_URI_PARSER_H_
 
 #include <string>
 
@@ -31,4 +31,4 @@ bool UriToComponents(const std::string& url, const char* object_type,
 }  // namespace storage
 }  // namespace firebase
 
-#endif  // FIREBASE_STORAGE_CLIENT_CPP_SRC_COMMON_STORAGE_URI_PARSER_H_
+#endif  // FIREBASE_STORAGE_SRC_COMMON_STORAGE_URI_PARSER_H_
diff --git a/storage/src/desktop/controller_desktop.h b/storage/src/desktop/controller_desktop.h
index 0d8d245fb2..453d0bd101 100644
--- a/storage/src/desktop/controller_desktop.h
+++ b/storage/src/desktop/controller_desktop.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_STORAGE_CLIENT_CPP_SRC_DESKTOP_CONTROLLER_DESKTOP_H_
-#define FIREBASE_STORAGE_CLIENT_CPP_SRC_DESKTOP_CONTROLLER_DESKTOP_H_
+#ifndef FIREBASE_STORAGE_SRC_DESKTOP_CONTROLLER_DESKTOP_H_
+#define FIREBASE_STORAGE_SRC_DESKTOP_CONTROLLER_DESKTOP_H_
 
 #include <stdint.h>
 
@@ -95,4 +95,4 @@ class ControllerInternal {
 }  // namespace storage
 }  // namespace firebase
 
-#endif  // FIREBASE_STORAGE_CLIENT_CPP_SRC_DESKTOP_CONTROLLER_DESKTOP_H_
+#endif  // FIREBASE_STORAGE_SRC_DESKTOP_CONTROLLER_DESKTOP_H_
diff --git a/storage/src/desktop/curl_requests.h b/storage/src/desktop/curl_requests.h
index 1e7713076c..ce899645b0 100644
--- a/storage/src/desktop/curl_requests.h
+++ b/storage/src/desktop/curl_requests.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_STORAGE_CLIENT_CPP_SRC_DESKTOP_CURL_REQUESTS_H_
-#define FIREBASE_STORAGE_CLIENT_CPP_SRC_DESKTOP_CURL_REQUESTS_H_
+#ifndef FIREBASE_STORAGE_SRC_DESKTOP_CURL_REQUESTS_H_
+#define FIREBASE_STORAGE_SRC_DESKTOP_CURL_REQUESTS_H_
 
 #include <fstream>
 
@@ -279,4 +279,4 @@ class StorageNetworkError : rest::util::JsonData {
 }  // namespace storage
 }  // namespace firebase
 
-#endif  // FIREBASE_STORAGE_CLIENT_CPP_SRC_DESKTOP_CURL_REQUESTS_H_
+#endif  // FIREBASE_STORAGE_SRC_DESKTOP_CURL_REQUESTS_H_
diff --git a/storage/src/desktop/listener_desktop.h b/storage/src/desktop/listener_desktop.h
index 47b8c1c9b7..5696b84ce5 100644
--- a/storage/src/desktop/listener_desktop.h
+++ b/storage/src/desktop/listener_desktop.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_STORAGE_CLIENT_CPP_SRC_DESKTOP_LISTENER_DESKTOP_H_
-#define FIREBASE_STORAGE_CLIENT_CPP_SRC_DESKTOP_LISTENER_DESKTOP_H_
+#ifndef FIREBASE_STORAGE_SRC_DESKTOP_LISTENER_DESKTOP_H_
+#define FIREBASE_STORAGE_SRC_DESKTOP_LISTENER_DESKTOP_H_
 
 #include <stdint.h>
 
@@ -54,4 +54,4 @@ class ListenerInternal {
 }  // namespace storage
 }  // namespace firebase
 
-#endif  // FIREBASE_STORAGE_CLIENT_CPP_SRC_DESKTOP_LISTENER_DESKTOP_H_
+#endif  // FIREBASE_STORAGE_SRC_DESKTOP_LISTENER_DESKTOP_H_
diff --git a/storage/src/desktop/metadata_desktop.h b/storage/src/desktop/metadata_desktop.h
index 4709765292..847d1f2e7e 100644
--- a/storage/src/desktop/metadata_desktop.h
+++ b/storage/src/desktop/metadata_desktop.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_STORAGE_CLIENT_CPP_SRC_DESKTOP_METADATA_DESKTOP_H_
-#define FIREBASE_STORAGE_CLIENT_CPP_SRC_DESKTOP_METADATA_DESKTOP_H_
+#ifndef FIREBASE_STORAGE_SRC_DESKTOP_METADATA_DESKTOP_H_
+#define FIREBASE_STORAGE_SRC_DESKTOP_METADATA_DESKTOP_H_
 
 #include <list>
 #include <map>
@@ -211,4 +211,4 @@ class MetadataInternal {
 }  // namespace storage
 }  // namespace firebase
 
-#endif  // FIREBASE_STORAGE_CLIENT_CPP_SRC_DESKTOP_METADATA_DESKTOP_H_
+#endif  // FIREBASE_STORAGE_SRC_DESKTOP_METADATA_DESKTOP_H_
diff --git a/storage/src/desktop/rest_operation.h b/storage/src/desktop/rest_operation.h
index 4571e6152a..a1808283f7 100644
--- a/storage/src/desktop/rest_operation.h
+++ b/storage/src/desktop/rest_operation.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_STORAGE_CLIENT_CPP_SRC_DESKTOP_REST_OPERATION_H_
-#define FIREBASE_STORAGE_CLIENT_CPP_SRC_DESKTOP_REST_OPERATION_H_
+#ifndef FIREBASE_STORAGE_SRC_DESKTOP_REST_OPERATION_H_
+#define FIREBASE_STORAGE_SRC_DESKTOP_REST_OPERATION_H_
 
 #include <memory>
 
@@ -119,4 +119,4 @@ class RestOperation {
 }  // namespace storage
 }  // namespace firebase
 
-#endif  // FIREBASE_STORAGE_CLIENT_CPP_SRC_DESKTOP_REST_OPERATION_H_
+#endif  // FIREBASE_STORAGE_SRC_DESKTOP_REST_OPERATION_H_
diff --git a/storage/src/desktop/storage_desktop.h b/storage/src/desktop/storage_desktop.h
index 1f2811a3bf..ecdc013d4e 100644
--- a/storage/src/desktop/storage_desktop.h
+++ b/storage/src/desktop/storage_desktop.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_STORAGE_CLIENT_CPP_SRC_DESKTOP_STORAGE_DESKTOP_H_
-#define FIREBASE_STORAGE_CLIENT_CPP_SRC_DESKTOP_STORAGE_DESKTOP_H_
+#ifndef FIREBASE_STORAGE_SRC_DESKTOP_STORAGE_DESKTOP_H_
+#define FIREBASE_STORAGE_SRC_DESKTOP_STORAGE_DESKTOP_H_
 
 #include <string>
 #include <vector>
@@ -125,4 +125,4 @@ class StorageInternal {
 }  // namespace storage
 }  // namespace firebase
 
-#endif  // FIREBASE_STORAGE_CLIENT_CPP_SRC_DESKTOP_STORAGE_DESKTOP_H_
+#endif  // FIREBASE_STORAGE_SRC_DESKTOP_STORAGE_DESKTOP_H_
diff --git a/storage/src/desktop/storage_path.h b/storage/src/desktop/storage_path.h
index d0228efe86..4f7bc6ac19 100644
--- a/storage/src/desktop/storage_path.h
+++ b/storage/src/desktop/storage_path.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_STORAGE_CLIENT_CPP_SRC_DESKTOP_STORAGE_PATH_H_
-#define FIREBASE_STORAGE_CLIENT_CPP_SRC_DESKTOP_STORAGE_PATH_H_
+#ifndef FIREBASE_STORAGE_SRC_DESKTOP_STORAGE_PATH_H_
+#define FIREBASE_STORAGE_SRC_DESKTOP_STORAGE_PATH_H_
 
 #include <string>
 
@@ -96,4 +96,4 @@ class StoragePath {
 }  // namespace storage
 }  // namespace firebase
 
-#endif  // FIREBASE_STORAGE_CLIENT_CPP_SRC_DESKTOP_STORAGE_PATH_H_
+#endif  // FIREBASE_STORAGE_SRC_DESKTOP_STORAGE_PATH_H_
diff --git a/storage/src/desktop/storage_reference_desktop.h b/storage/src/desktop/storage_reference_desktop.h
index b90cc8988b..d75a3e7db6 100644
--- a/storage/src/desktop/storage_reference_desktop.h
+++ b/storage/src/desktop/storage_reference_desktop.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_STORAGE_CLIENT_CPP_SRC_DESKTOP_STORAGE_REFERENCE_DESKTOP_H_
-#define FIREBASE_STORAGE_CLIENT_CPP_SRC_DESKTOP_STORAGE_REFERENCE_DESKTOP_H_
+#ifndef FIREBASE_STORAGE_SRC_DESKTOP_STORAGE_REFERENCE_DESKTOP_H_
+#define FIREBASE_STORAGE_SRC_DESKTOP_STORAGE_REFERENCE_DESKTOP_H_
 
 #include <string>
 
@@ -166,4 +166,4 @@ class StorageReferenceInternal {
 }  // namespace storage
 }  // namespace firebase
 
-#endif  // FIREBASE_STORAGE_CLIENT_CPP_SRC_DESKTOP_STORAGE_REFERENCE_DESKTOP_H_
+#endif  // FIREBASE_STORAGE_SRC_DESKTOP_STORAGE_REFERENCE_DESKTOP_H_
diff --git a/storage/src/include/firebase/storage.h b/storage/src/include/firebase/storage.h
index 173d26993a..8d081e4c0e 100644
--- a/storage/src/include/firebase/storage.h
+++ b/storage/src/include/firebase/storage.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_STORAGE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_STORAGE_H_
-#define FIREBASE_STORAGE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_STORAGE_H_
+#ifndef FIREBASE_STORAGE_SRC_INCLUDE_FIREBASE_STORAGE_H_
+#define FIREBASE_STORAGE_SRC_INCLUDE_FIREBASE_STORAGE_H_
 
 #include <string>
 
@@ -158,4 +158,4 @@ class Storage {
 }  // namespace storage
 }  // namespace firebase
 
-#endif  // FIREBASE_STORAGE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_STORAGE_H_
+#endif  // FIREBASE_STORAGE_SRC_INCLUDE_FIREBASE_STORAGE_H_
diff --git a/storage/src/include/firebase/storage/common.h b/storage/src/include/firebase/storage/common.h
index ceb878da2b..567ed71492 100644
--- a/storage/src/include/firebase/storage/common.h
+++ b/storage/src/include/firebase/storage/common.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_STORAGE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_STORAGE_COMMON_H_
-#define FIREBASE_STORAGE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_STORAGE_COMMON_H_
+#ifndef FIREBASE_STORAGE_SRC_INCLUDE_FIREBASE_STORAGE_COMMON_H_
+#define FIREBASE_STORAGE_SRC_INCLUDE_FIREBASE_STORAGE_COMMON_H_
 
 namespace firebase {
 namespace storage {
@@ -59,4 +59,4 @@ const char* GetErrorMessage(Error error);
 }  // namespace storage
 }  // namespace firebase
 
-#endif  // FIREBASE_STORAGE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_STORAGE_COMMON_H_
+#endif  // FIREBASE_STORAGE_SRC_INCLUDE_FIREBASE_STORAGE_COMMON_H_
diff --git a/storage/src/include/firebase/storage/controller.h b/storage/src/include/firebase/storage/controller.h
index 8dbbceee72..42f29aa0c7 100644
--- a/storage/src/include/firebase/storage/controller.h
+++ b/storage/src/include/firebase/storage/controller.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_STORAGE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_STORAGE_CONTROLLER_H_
-#define FIREBASE_STORAGE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_STORAGE_CONTROLLER_H_
+#ifndef FIREBASE_STORAGE_SRC_INCLUDE_FIREBASE_STORAGE_CONTROLLER_H_
+#define FIREBASE_STORAGE_SRC_INCLUDE_FIREBASE_STORAGE_CONTROLLER_H_
 
 #include "firebase/storage/storage_reference.h"
 
@@ -143,4 +143,4 @@ class Controller {
 }  // namespace storage
 }  // namespace firebase
 
-#endif  // FIREBASE_STORAGE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_STORAGE_CONTROLLER_H_
+#endif  // FIREBASE_STORAGE_SRC_INCLUDE_FIREBASE_STORAGE_CONTROLLER_H_
diff --git a/storage/src/include/firebase/storage/listener.h b/storage/src/include/firebase/storage/listener.h
index 50b4f7769e..8bd624f615 100644
--- a/storage/src/include/firebase/storage/listener.h
+++ b/storage/src/include/firebase/storage/listener.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_STORAGE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_STORAGE_LISTENER_H_
-#define FIREBASE_STORAGE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_STORAGE_LISTENER_H_
+#ifndef FIREBASE_STORAGE_SRC_INCLUDE_FIREBASE_STORAGE_LISTENER_H_
+#define FIREBASE_STORAGE_SRC_INCLUDE_FIREBASE_STORAGE_LISTENER_H_
 
 #include "firebase/storage/controller.h"
 
@@ -71,4 +71,4 @@ class Listener {
 }  // namespace storage
 }  // namespace firebase
 
-#endif  // FIREBASE_STORAGE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_STORAGE_LISTENER_H_
+#endif  // FIREBASE_STORAGE_SRC_INCLUDE_FIREBASE_STORAGE_LISTENER_H_
diff --git a/storage/src/include/firebase/storage/metadata.h b/storage/src/include/firebase/storage/metadata.h
index 92b1166a0f..8d697c1072 100644
--- a/storage/src/include/firebase/storage/metadata.h
+++ b/storage/src/include/firebase/storage/metadata.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_STORAGE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_STORAGE_METADATA_H_
-#define FIREBASE_STORAGE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_STORAGE_METADATA_H_
+#ifndef FIREBASE_STORAGE_SRC_INCLUDE_FIREBASE_STORAGE_METADATA_H_
+#define FIREBASE_STORAGE_SRC_INCLUDE_FIREBASE_STORAGE_METADATA_H_
 
 #include <cassert>
 #include <map>
@@ -273,4 +273,4 @@ class Metadata {
 }  // namespace storage
 }  // namespace firebase
 
-#endif  // FIREBASE_STORAGE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_STORAGE_METADATA_H_
+#endif  // FIREBASE_STORAGE_SRC_INCLUDE_FIREBASE_STORAGE_METADATA_H_
diff --git a/storage/src/include/firebase/storage/storage_reference.h b/storage/src/include/firebase/storage/storage_reference.h
index 54af87ca9b..e5c7c2f85a 100644
--- a/storage/src/include/firebase/storage/storage_reference.h
+++ b/storage/src/include/firebase/storage/storage_reference.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_STORAGE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_STORAGE_STORAGE_REFERENCE_H_
-#define FIREBASE_STORAGE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_STORAGE_STORAGE_REFERENCE_H_
+#ifndef FIREBASE_STORAGE_SRC_INCLUDE_FIREBASE_STORAGE_STORAGE_REFERENCE_H_
+#define FIREBASE_STORAGE_SRC_INCLUDE_FIREBASE_STORAGE_STORAGE_REFERENCE_H_
 
 #include <string>
 #include <vector>
@@ -358,4 +358,4 @@ class StorageReference {
 }  // namespace storage
 }  // namespace firebase
 
-#endif  // FIREBASE_STORAGE_CLIENT_CPP_SRC_INCLUDE_FIREBASE_STORAGE_STORAGE_REFERENCE_H_
+#endif  // FIREBASE_STORAGE_SRC_INCLUDE_FIREBASE_STORAGE_STORAGE_REFERENCE_H_
diff --git a/storage/src/ios/controller_ios.h b/storage/src/ios/controller_ios.h
index 131a159367..de420d6e6c 100644
--- a/storage/src/ios/controller_ios.h
+++ b/storage/src/ios/controller_ios.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_STORAGE_CLIENT_CPP_SRC_IOS_CONTROLLER_IOS_H_
-#define FIREBASE_STORAGE_CLIENT_CPP_SRC_IOS_CONTROLLER_IOS_H_
+#ifndef FIREBASE_STORAGE_SRC_IOS_CONTROLLER_IOS_H_
+#define FIREBASE_STORAGE_SRC_IOS_CONTROLLER_IOS_H_
 
 #include <cstdint>
 
@@ -100,4 +100,4 @@ class ControllerInternal {
 }  // namespace storage
 }  // namespace firebase
 
-#endif  // FIREBASE_STORAGE_CLIENT_CPP_SRC_IOS_CONTROLLER_IOS_H_
+#endif  // FIREBASE_STORAGE_SRC_IOS_CONTROLLER_IOS_H_
diff --git a/storage/src/ios/listener_ios.h b/storage/src/ios/listener_ios.h
index 2c45b2f3be..697bb47ae4 100644
--- a/storage/src/ios/listener_ios.h
+++ b/storage/src/ios/listener_ios.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_STORAGE_CLIENT_CPP_SRC_IOS_LISTENER_IOS_H_
-#define FIREBASE_STORAGE_CLIENT_CPP_SRC_IOS_LISTENER_IOS_H_
+#ifndef FIREBASE_STORAGE_SRC_IOS_LISTENER_IOS_H_
+#define FIREBASE_STORAGE_SRC_IOS_LISTENER_IOS_H_
 
 #include "app/memory/unique_ptr.h"
 #include "app/src/util_ios.h"
@@ -109,4 +109,4 @@ class ListenerInternal {
 }  // namespace storage
 }  // namespace firebase
 
-#endif  // FIREBASE_STORAGE_CLIENT_CPP_SRC_IOS_LISTENER_IOS_H_
+#endif  // FIREBASE_STORAGE_SRC_IOS_LISTENER_IOS_H_
diff --git a/storage/src/ios/metadata_ios.h b/storage/src/ios/metadata_ios.h
index b28bd9a04b..db36b7f20b 100644
--- a/storage/src/ios/metadata_ios.h
+++ b/storage/src/ios/metadata_ios.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_STORAGE_CLIENT_CPP_SRC_IOS_METADATA_IOS_H_
-#define FIREBASE_STORAGE_CLIENT_CPP_SRC_IOS_METADATA_IOS_H_
+#ifndef FIREBASE_STORAGE_SRC_IOS_METADATA_IOS_H_
+#define FIREBASE_STORAGE_SRC_IOS_METADATA_IOS_H_
 
 #include <map>
 #include <string>
@@ -167,4 +167,4 @@ class MetadataInternal {
 }  // namespace storage
 }  // namespace firebase
 
-#endif  // FIREBASE_STORAGE_CLIENT_CPP_SRC_IOS_METADATA_IOS_H_
+#endif  // FIREBASE_STORAGE_SRC_IOS_METADATA_IOS_H_
diff --git a/storage/src/ios/storage_ios.h b/storage/src/ios/storage_ios.h
index 0b6ed10aa4..3144b0cd42 100644
--- a/storage/src/ios/storage_ios.h
+++ b/storage/src/ios/storage_ios.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_STORAGE_CLIENT_CPP_SRC_IOS_STORAGE_IOS_H_
-#define FIREBASE_STORAGE_CLIENT_CPP_SRC_IOS_STORAGE_IOS_H_
+#ifndef FIREBASE_STORAGE_SRC_IOS_STORAGE_IOS_H_
+#define FIREBASE_STORAGE_SRC_IOS_STORAGE_IOS_H_
 
 #include <map>
 #include <set>
@@ -155,4 +155,4 @@ class StorageInternal {
 }  // namespace storage
 }  // namespace firebase
 
-#endif  // FIREBASE_STORAGE_CLIENT_CPP_SRC_IOS_STORAGE_IOS_H_
+#endif  // FIREBASE_STORAGE_SRC_IOS_STORAGE_IOS_H_
diff --git a/storage/src/ios/storage_reference_ios.h b/storage/src/ios/storage_reference_ios.h
index b4aa88426d..31dc010e85 100644
--- a/storage/src/ios/storage_reference_ios.h
+++ b/storage/src/ios/storage_reference_ios.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_STORAGE_CLIENT_CPP_SRC_IOS_STORAGE_REFERENCE_IOS_H_
-#define FIREBASE_STORAGE_CLIENT_CPP_SRC_IOS_STORAGE_REFERENCE_IOS_H_
+#ifndef FIREBASE_STORAGE_SRC_IOS_STORAGE_REFERENCE_IOS_H_
+#define FIREBASE_STORAGE_SRC_IOS_STORAGE_REFERENCE_IOS_H_
 
 #include "app/memory/unique_ptr.h"
 #include "app/src/include/firebase/future.h"
@@ -193,4 +193,4 @@ class StorageReferenceInternal {
 }  // namespace storage
 }  // namespace firebase
 
-#endif  // FIREBASE_STORAGE_CLIENT_CPP_SRC_IOS_STORAGE_REFERENCE_IOS_H_
+#endif  // FIREBASE_STORAGE_SRC_IOS_STORAGE_REFERENCE_IOS_H_
diff --git a/storage/src/ios/util_ios.h b/storage/src/ios/util_ios.h
index 2e5aabd916..aebc1e06a9 100644
--- a/storage/src/ios/util_ios.h
+++ b/storage/src/ios/util_ios.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_STORAGE_CLIENT_CPP_SRC_IOS_UTIL_IOS_H_
-#define FIREBASE_STORAGE_CLIENT_CPP_SRC_IOS_UTIL_IOS_H_
+#ifndef FIREBASE_STORAGE_SRC_IOS_UTIL_IOS_H_
+#define FIREBASE_STORAGE_SRC_IOS_UTIL_IOS_H_
 
 #import <Foundation/Foundation.h>
 
@@ -29,4 +29,4 @@ Error NSErrorToErrorCode(NSError* error);
 }  // namespace storage
 }  // namespace firebase
 
-#endif  // FIREBASE_STORAGE_CLIENT_CPP_SRC_IOS_UTIL_IOS_H_
+#endif  // FIREBASE_STORAGE_SRC_IOS_UTIL_IOS_H_
diff --git a/storage/src/stub/listener_stub.h b/storage/src/stub/listener_stub.h
index f1d532468d..0bab158cd3 100644
--- a/storage/src/stub/listener_stub.h
+++ b/storage/src/stub/listener_stub.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_STORAGE_CLIENT_CPP_SRC_STUB_LISTENER_STUB_H_
-#define FIREBASE_STORAGE_CLIENT_CPP_SRC_STUB_LISTENER_STUB_H_
+#ifndef FIREBASE_STORAGE_SRC_STUB_LISTENER_STUB_H_
+#define FIREBASE_STORAGE_SRC_STUB_LISTENER_STUB_H_
 
 #include "firebase/storage/listener.h"
 
@@ -34,4 +34,4 @@ class ListenerInternal {
 }  // namespace storage
 }  // namespace firebase
 
-#endif  // FIREBASE_STORAGE_CLIENT_CPP_SRC_STUB_LISTENER_STUB_H_
+#endif  // FIREBASE_STORAGE_SRC_STUB_LISTENER_STUB_H_
diff --git a/testlab/src/android/util.h b/testlab/src/android/util.h
index 5f632fb022..5d7175d8a3 100644
--- a/testlab/src/android/util.h
+++ b/testlab/src/android/util.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_TESTLAB_CLIENT_CPP_SRC_ANDROID_UTIL_H_
-#define FIREBASE_TESTLAB_CLIENT_CPP_SRC_ANDROID_UTIL_H_
+#ifndef FIREBASE_TESTLAB_SRC_ANDROID_UTIL_H_
+#define FIREBASE_TESTLAB_SRC_ANDROID_UTIL_H_
 
 #include <jni.h>
 
@@ -45,4 +45,4 @@ void CallFinish();
 }  // namespace test_lab
 }  // namespace firebase
 
-#endif  // FIREBASE_TESTLAB_CLIENT_CPP_SRC_ANDROID_UTIL_H_
+#endif  // FIREBASE_TESTLAB_SRC_ANDROID_UTIL_H_
diff --git a/testlab/src/common/common.h b/testlab/src/common/common.h
index b6efeb062e..fecdb32981 100644
--- a/testlab/src/common/common.h
+++ b/testlab/src/common/common.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_TESTLAB_CLIENT_CPP_SRC_COMMON_COMMON_H_
-#define FIREBASE_TESTLAB_CLIENT_CPP_SRC_COMMON_COMMON_H_
+#ifndef FIREBASE_TESTLAB_SRC_COMMON_COMMON_H_
+#define FIREBASE_TESTLAB_SRC_COMMON_COMMON_H_
 
 #include <stdarg.h>
 
@@ -63,4 +63,4 @@ FILE* OpenCustomResultsFile(int scenario);
 }  //  namespace test_lab
 }  // namespace firebase
 
-#endif  // FIREBASE_TESTLAB_CLIENT_CPP_SRC_COMMON_COMMON_H_
+#endif  // FIREBASE_TESTLAB_SRC_COMMON_COMMON_H_
diff --git a/testlab/src/desktop/testlab_macos.h b/testlab/src/desktop/testlab_macos.h
index c2f199acc4..4b4a4b6b44 100644
--- a/testlab/src/desktop/testlab_macos.h
+++ b/testlab/src/desktop/testlab_macos.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_TESTLAB_CLIENT_CPP_SRC_DESKTOP_TESTLAB_MACOS_H_
-#define FIREBASE_TESTLAB_CLIENT_CPP_SRC_DESKTOP_TESTLAB_MACOS_H_
+#ifndef FIREBASE_TESTLAB_SRC_DESKTOP_TESTLAB_MACOS_H_
+#define FIREBASE_TESTLAB_SRC_DESKTOP_TESTLAB_MACOS_H_
 
 #include <string>
 
@@ -30,4 +30,4 @@ std::vector<std::string> GetArguments();
 }  // namespace test_lab
 }  // namespace firebase
 
-#endif  //  FIREBASE_TESTLAB_CLIENT_CPP_SRC_DESKTOP_TESTLAB_MACOS_H_
+#endif  //  FIREBASE_TESTLAB_SRC_DESKTOP_TESTLAB_MACOS_H_
diff --git a/testlab/src/include/firebase/testlab.h b/testlab/src/include/firebase/testlab.h
index 91cbdac7e4..6dfdd95732 100644
--- a/testlab/src/include/firebase/testlab.h
+++ b/testlab/src/include/firebase/testlab.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_TESTLAB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_TESTLAB_H_
-#define FIREBASE_TESTLAB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_TESTLAB_H_
+#ifndef FIREBASE_TESTLAB_SRC_INCLUDE_FIREBASE_TESTLAB_H_
+#define FIREBASE_TESTLAB_SRC_INCLUDE_FIREBASE_TESTLAB_H_
 
 #include <string>
 
@@ -106,4 +106,4 @@ std::string GetResultsDirectory();
 }  // namespace test_lab
 }  // namespace firebase
 
-#endif  // FIREBASE_TESTLAB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_TESTLAB_H_
+#endif  // FIREBASE_TESTLAB_SRC_INCLUDE_FIREBASE_TESTLAB_H_
diff --git a/testlab/src/ios/custom_results.h b/testlab/src/ios/custom_results.h
index e1b8e4e6ea..b0bebd8b40 100644
--- a/testlab/src/ios/custom_results.h
+++ b/testlab/src/ios/custom_results.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_TESTLAB_CLIENT_CPP_SRC_IOS_CUSTOM_RESULTS_H_
-#define FIREBASE_TESTLAB_CLIENT_CPP_SRC_IOS_CUSTOM_RESULTS_H_
+#ifndef FIREBASE_TESTLAB_SRC_IOS_CUSTOM_RESULTS_H_
+#define FIREBASE_TESTLAB_SRC_IOS_CUSTOM_RESULTS_H_
 
 #include <stdio.h>
 
@@ -35,4 +35,4 @@ FILE* CreateLogFile();
 }  // namespace test_lab
 }  // namespace firebase
 
-#endif  // FIREBASE_TESTLAB_CLIENT_CPP_SRC_IOS_CUSTOM_RESULTS_H_
+#endif  // FIREBASE_TESTLAB_SRC_IOS_CUSTOM_RESULTS_H_