diff --git a/rtc_base/bit_buffer.h b/rtc_base/bit_buffer.h
index ba96a12..b03677c 100644
--- a/rtc_base/bit_buffer.h
+++ b/rtc_base/bit_buffer.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_BITBUFFER_H_
-#define RTC_BASE_BITBUFFER_H_
+#ifndef RTC_BASE_BIT_BUFFER_H_
+#define RTC_BASE_BIT_BUFFER_H_
 
 #include <stddef.h>  // For size_t.
 #include <stdint.h>  // For integer types.
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace rtc {
 
@@ -123,4 +123,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_BITBUFFER_H_
+#endif  // RTC_BASE_BIT_BUFFER_H_