diff --git a/include/hardware/audio_hal.h b/include/hardware/audio.h
similarity index 100%
rename from include/hardware/audio_hal.h
rename to include/hardware/audio.h
diff --git a/include/hardware/audio_policy_hal.h b/include/hardware/audio_policy.h
similarity index 100%
rename from include/hardware/audio_policy_hal.h
rename to include/hardware/audio_policy.h
diff --git a/modules/audio/audio_hw.c b/modules/audio/audio_hw.c
index b3ab1e2..223e661 100644
--- a/modules/audio/audio_hw.c
+++ b/modules/audio/audio_hw.c
@@ -26,7 +26,7 @@
 
 #include <hardware/hardware.h>
 #include <system/audio.h>
-#include <hardware/audio_hal.h>
+#include <hardware/audio.h>
 
 struct stub_audio_device {
     struct audio_hw_device device;
diff --git a/modules/audio/audio_policy.c b/modules/audio/audio_policy.c
index 1b64693..58dae3e 100644
--- a/modules/audio/audio_policy.c
+++ b/modules/audio/audio_policy.c
@@ -25,7 +25,7 @@
 #include <hardware/hardware.h>
 #include <system/audio.h>
 #include <system/audio_policy.h>
-#include <hardware/audio_policy_hal.h>
+#include <hardware/audio_policy.h>
 
 struct default_ap_module {
     struct audio_policy_module module;