diff --git a/panda/src/audio/audio.h b/panda/src/audio/audio.h
index c498834502..ca1f5bfd94 100644
--- a/panda/src/audio/audio.h
+++ b/panda/src/audio/audio.h
@@ -11,12 +11,12 @@
  * @date 2000-07-06
  */
 
-#ifndef __AUDIO_H__
-#define __AUDIO_H__
+#ifndef AUDIO_H
+#define AUDIO_H
 
 #include "filterProperties.h"
 #include "audioLoadRequest.h"
 #include "audioSound.h"
 #include "audioManager.h"
 
-#endif /* __AUDIO_H__ */
+#endif /* AUDIO_H */
diff --git a/panda/src/audio/audioManager.h b/panda/src/audio/audioManager.h
index 62d9a5d090..aef3932246 100644
--- a/panda/src/audio/audioManager.h
+++ b/panda/src/audio/audioManager.h
@@ -12,8 +12,8 @@
  * Prior system by: cary
  */
 
-#ifndef __AUDIO_MANAGER_H__
-#define __AUDIO_MANAGER_H__
+#ifndef AUDIOMANAGER_H
+#define AUDIOMANAGER_H
 
 #include "config_audio.h"
 #include "audioSound.h"
@@ -222,4 +222,4 @@ operator << (std::ostream &out, const AudioManager &mgr) {
 
 #include "audioManager.I"
 
-#endif /* __AUDIO_MANAGER_H__ */
+#endif /* AUDIOMANAGER_H */
diff --git a/panda/src/audio/audioSound.h b/panda/src/audio/audioSound.h
index e348ad4daf..ecfda1ef50 100644
--- a/panda/src/audio/audioSound.h
+++ b/panda/src/audio/audioSound.h
@@ -12,8 +12,8 @@
  * Prior system by: cary
  */
 
-#ifndef __AUDIOSOUND_H__
-#define __AUDIOSOUND_H__
+#ifndef AUDIOSOUND_H
+#define AUDIOSOUND_H
 
 #include "config_audio.h"
 #include "typedReferenceCount.h"
@@ -160,4 +160,4 @@ operator << (std::ostream &out, const AudioSound &sound) {
 EXPCL_PANDA_AUDIO std::ostream &
 operator << (std::ostream &out, AudioSound::SoundStatus status);
 
-#endif /* __AUDIOSOUND_H__ */
+#endif /* AUDIOSOUND_H */
diff --git a/panda/src/audio/nullAudioManager.h b/panda/src/audio/nullAudioManager.h
index a4e2c47511..61db5a6e6d 100644
--- a/panda/src/audio/nullAudioManager.h
+++ b/panda/src/audio/nullAudioManager.h
@@ -12,8 +12,8 @@
  * Prior system by: cary
  */
 
-#ifndef __NULL_AUDIO_MANAGER_H__
-#define __NULL_AUDIO_MANAGER_H__
+#ifndef NULLAUDIOMANAGER_H
+#define NULLAUDIOMANAGER_H
 
 #include "audioManager.h"
 #include "nullAudioSound.h"
@@ -89,4 +89,4 @@ private:
   static TypeHandle _type_handle;
 };
 
-#endif /* __NULL_AUDIO_MANAGER_H__ */
+#endif /* NULLAUDIOMANAGER_H */
diff --git a/panda/src/audio/nullAudioSound.h b/panda/src/audio/nullAudioSound.h
index d388493132..0c90c6ef5b 100644
--- a/panda/src/audio/nullAudioSound.h
+++ b/panda/src/audio/nullAudioSound.h
@@ -12,8 +12,8 @@
  * Prior system by: cary
  */
 
-#ifndef __NULL_AUDIO_SOUND_H__
-#define __NULL_AUDIO_SOUND_H__
+#ifndef NULLAUDIOSOUND_H
+#define NULLAUDIOSOUND_H
 
 #include "audioSound.h"
 
@@ -91,4 +91,4 @@ private:
   friend class NullAudioManager;
 };
 
-#endif /* __NULL_AUDIO_SOUND_H__ */
+#endif /* NULLAUDIOSOUND_H */