diff --git a/Makefile.am b/Makefile.am
index 3503a30..0c7769c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,7 +76,6 @@ pkginclude_HEADERS = \
 	include/hardware_caps.h \
 	include/init_td.h \
 	include/mmi.h \
-	include/playback.h \
 	include/playback_hal.h \
 	include/pwrmngr.h \
 	include/record_hal.h \
diff --git a/azbox/playback.cpp b/azbox/playback.cpp
index 1e656f3..c387c6f 100644
--- a/azbox/playback.cpp
+++ b/azbox/playback.cpp
@@ -50,7 +50,7 @@
 #define IN_FILE  "/tmp/rmfp.in2"
 #define OUT_FILE "/tmp/rmfp.out2"
 
-#include "playback.h"
+#include "playback_lib.h"
 
 extern "C"{
 #include "e2mruainclude.h"
diff --git a/azbox/playback.h b/azbox/playback_lib.h
similarity index 95%
rename from azbox/playback.h
rename to azbox/playback_lib.h
index c56c69e..6997acb 100644
--- a/azbox/playback.h
+++ b/azbox/playback_lib.h
@@ -1,5 +1,5 @@
-#ifndef __PLAYBACK_H
-#define __PLAYBACK_H
+#ifndef __PLAYBACK_LIB_H_
+#define __PLAYBACK_LIB_H_
 
 #include <string>
 #include <stdint.h>
@@ -59,4 +59,4 @@ class cPlayback
 		void DMNotify(int Event, void *pTsBuf, void *Tag);
 #endif
 };
-#endif
+#endif // __PLAYBACK_LIB_H_
diff --git a/common/ca.cpp b/common/ca.cpp
index f6ebea2..17f37aa 100644
--- a/common/ca.cpp
+++ b/common/ca.cpp
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-#include "ca.h"
+#include "ca_hal.h"
 #include "lt_debug.h"
 #define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_CA, this, args)
 
diff --git a/generic-pc/playback.cpp b/generic-pc/playback.cpp
index 5e9c4ac..fe5a7e7 100644
--- a/generic-pc/playback.cpp
+++ b/generic-pc/playback.cpp
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-#include "playback.h"
+#include "playback_lib.h"
 
 static const char * FILENAME = "playback-dummy";
 
diff --git a/generic-pc/playback.h b/generic-pc/playback_lib.h
similarity index 100%
rename from generic-pc/playback.h
rename to generic-pc/playback_lib.h
diff --git a/include/playback.h b/include/playback.h
deleted file mode 100644
index c62544b..0000000
--- a/include/playback.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <config.h>
-#include "playback_hal.h"
diff --git a/include/playback_hal.h b/include/playback_hal.h
index 5891fd2..690f4ab 100644
--- a/include/playback_hal.h
+++ b/include/playback_hal.h
@@ -12,15 +12,15 @@
 #include "../libarmbox/playback_libeplayer3.h"
 #endif
 #elif HAVE_AZBOX_HARDWARE
-#include "../azbox/playback.h"
+#include "../azbox/playback_lib.h"
 #elif HAVE_GENERIC_HARDWARE
 #if BOXMODEL_RASPI
-#include "../raspi/playback.h"
+#include "../raspi/playback_lib.h"
 #else
 #if ENABLE_GSTREAMER
 #include "../generic-pc/playback_gst.h"
 #else
-#include "../generic-pc/playback.h"
+#include "../generic-pc/playback_lib.h"
 #endif
 #endif
 #else
diff --git a/raspi/playback.h b/raspi/playback.h
deleted file mode 120000
index 1363d92..0000000
--- a/raspi/playback.h
+++ /dev/null
@@ -1 +0,0 @@
-../generic-pc/playback.h
\ No newline at end of file
diff --git a/raspi/playback_lib.h b/raspi/playback_lib.h
new file mode 120000
index 0000000..5738cee
--- /dev/null
+++ b/raspi/playback_lib.h
@@ -0,0 +1 @@
+../generic-pc/playback_lib.h
\ No newline at end of file