diff --git a/configure.ac b/configure.ac
index 6af70b4..bb9dd73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,11 +49,9 @@ AC_CONFIG_FILES([ \
         linux/Makefile \
         linux/kvh2xml.pc \
         linux/reference/Makefile \
-        linux/reference/config.pc \
         nxp/Makefile \
         nxp/kvh2xml.pc \
-        nxp/reference/Makefile \
-        nxp/reference/config.pc
+        nxp/reference/Makefile 
         ])
 
 
diff --git a/linux/Makefile.am b/linux/Makefile.am
index 299426c..f456138 100644
--- a/linux/Makefile.am
+++ b/linux/Makefile.am
@@ -1,6 +1,6 @@
 kvh2xml_headers = kvh2xml.h
 
-kvh2xml_includedir = $(includedir)
+kvh2xml_includedir = $(includedir)/audioreach
 kvh2xml_include_HEADERS = $(kvh2xml_headers)
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/linux/kvh2xml.pc.in b/linux/kvh2xml.pc.in
index 2f33f70..04cbed0 100644
--- a/linux/kvh2xml.pc.in
+++ b/linux/kvh2xml.pc.in
@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: k2h2xml
+Name: kvh2xml
 Description: kvh2xml for AudioReach
 Version: @VERSION@
 Libs: -L${libdir}
-Cflags: -I${includedir}
+Cflags: -I${includedir}/audioreach
diff --git a/linux/reference/Makefile.am b/linux/reference/Makefile.am
index 25e514c..c44040d 100644
--- a/linux/reference/Makefile.am
+++ b/linux/reference/Makefile.am
@@ -1,7 +1,3 @@
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = config.pc
-EXTRA_DIST = $(pkgconfig_DATA)
-
 AM_CFLAGS = -Wall -Werror
 
 config_acdbdata = acdbdata/acdb_cal.acdb\
diff --git a/linux/reference/config.pc.in b/linux/reference/config.pc.in
deleted file mode 100644
index 4798e33..0000000
--- a/linux/reference/config.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: config
-Description: config library
-Version: @VERSION@
-Libs: -L${libdir}
-Cflags: -I${includedir}/acdbdata
diff --git a/nxp/Makefile.am b/nxp/Makefile.am
index 299426c..f456138 100644
--- a/nxp/Makefile.am
+++ b/nxp/Makefile.am
@@ -1,6 +1,6 @@
 kvh2xml_headers = kvh2xml.h
 
-kvh2xml_includedir = $(includedir)
+kvh2xml_includedir = $(includedir)/audioreach
 kvh2xml_include_HEADERS = $(kvh2xml_headers)
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/nxp/kvh2xml.pc.in b/nxp/kvh2xml.pc.in
index 2f33f70..04cbed0 100644
--- a/nxp/kvh2xml.pc.in
+++ b/nxp/kvh2xml.pc.in
@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: k2h2xml
+Name: kvh2xml
 Description: kvh2xml for AudioReach
 Version: @VERSION@
 Libs: -L${libdir}
-Cflags: -I${includedir}
+Cflags: -I${includedir}/audioreach
diff --git a/nxp/reference/Makefile.am b/nxp/reference/Makefile.am
index 827eb97..3a79c3f 100644
--- a/nxp/reference/Makefile.am
+++ b/nxp/reference/Makefile.am
@@ -1,7 +1,3 @@
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = config.pc
-EXTRA_DIST = $(pkgconfig_DATA)
-
 AM_CFLAGS = -Wall -Werror
 
 config_acdbdata = acdbdata/acdb_cal.acdb\
diff --git a/nxp/reference/config.pc.in b/nxp/reference/config.pc.in
deleted file mode 100644
index 4798e33..0000000
--- a/nxp/reference/config.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: config
-Description: config library
-Version: @VERSION@
-Libs: -L${libdir}
-Cflags: -I${includedir}/acdbdata
diff --git a/qcom/Makefile.am b/qcom/Makefile.am
index 3ce8f90..092100f 100644
--- a/qcom/Makefile.am
+++ b/qcom/Makefile.am
@@ -1,6 +1,6 @@
 kvh2xml_headers = kvh2xml.h
 
-kvh2xml_includedir = $(includedir)
+kvh2xml_includedir = $(includedir)/audioreach
 kvh2xml_include_HEADERS = $(kvh2xml_headers)
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/qcom/kvh2xml.pc.in b/qcom/kvh2xml.pc.in
index 2f33f70..04cbed0 100644
--- a/qcom/kvh2xml.pc.in
+++ b/qcom/kvh2xml.pc.in
@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: k2h2xml
+Name: kvh2xml
 Description: kvh2xml for AudioReach
 Version: @VERSION@
 Libs: -L${libdir}
-Cflags: -I${includedir}
+Cflags: -I${includedir}/audioreach
diff --git a/qcom/qli/GLYMUR/Makefile.am b/qcom/qli/GLYMUR/Makefile.am
index 57f70cd..933b3d3 100644
--- a/qcom/qli/GLYMUR/Makefile.am
+++ b/qcom/qli/GLYMUR/Makefile.am
@@ -1,7 +1,3 @@
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = config.pc
-EXTRA_DIST = $(pkgconfig_DATA)
-
 AM_CFLAGS = -Wall -Werror
 
 config_acdbdata = acdbdata/acdb_cal.acdb\
diff --git a/qcom/qli/GLYMUR/config.pc.in b/qcom/qli/GLYMUR/config.pc.in
deleted file mode 100644
index 4798e33..0000000
--- a/qcom/qli/GLYMUR/config.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: config
-Description: config library
-Version: @VERSION@
-Libs: -L${libdir}
-Cflags: -I${includedir}/acdbdata
diff --git a/qcom/qli/Kaanapali/Makefile.am b/qcom/qli/Kaanapali/Makefile.am
index e58f452..049b909 100644
--- a/qcom/qli/Kaanapali/Makefile.am
+++ b/qcom/qli/Kaanapali/Makefile.am
@@ -1,7 +1,3 @@
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = config.pc
-EXTRA_DIST = $(pkgconfig_DATA)
-
 AM_CFLAGS = -Wall -Werror
 
 config_acdbdata = acdbdata/acdb_cal.acdb\
diff --git a/qcom/qli/Kaanapali/config.pc.in b/qcom/qli/Kaanapali/config.pc.in
deleted file mode 100644
index 4798e33..0000000
--- a/qcom/qli/Kaanapali/config.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: config
-Description: config library
-Version: @VERSION@
-Libs: -L${libdir}
-Cflags: -I${includedir}/acdbdata
diff --git a/qcom/qli/MAHUA/Makefile.am b/qcom/qli/MAHUA/Makefile.am
index 596127f..c625d00 100644
--- a/qcom/qli/MAHUA/Makefile.am
+++ b/qcom/qli/MAHUA/Makefile.am
@@ -1,7 +1,3 @@
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = config.pc
-EXTRA_DIST = $(pkgconfig_DATA)
-
 AM_CFLAGS = -Wall -Werror
 
 config_acdbdata = acdbdata/acdb_cal.acdb\
diff --git a/qcom/qli/MAHUA/config.pc.in b/qcom/qli/MAHUA/config.pc.in
deleted file mode 100644
index 4798e33..0000000
--- a/qcom/qli/MAHUA/config.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: config
-Description: config library
-Version: @VERSION@
-Libs: -L${libdir}
-Cflags: -I${includedir}/acdbdata
diff --git a/qcom/qli/X1E80100/Makefile.am b/qcom/qli/X1E80100/Makefile.am
index 79fe460..d83f6c3 100644
--- a/qcom/qli/X1E80100/Makefile.am
+++ b/qcom/qli/X1E80100/Makefile.am
@@ -1,7 +1,3 @@
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = config.pc
-EXTRA_DIST = $(pkgconfig_DATA)
-
 AM_CFLAGS = -Wall -Werror
 
 config_acdbdata = acdbdata/acdb_cal.acdb\
diff --git a/qcom/qli/X1E80100/config.pc.in b/qcom/qli/X1E80100/config.pc.in
deleted file mode 100644
index 4798e33..0000000
--- a/qcom/qli/X1E80100/config.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: config
-Description: config library
-Version: @VERSION@
-Libs: -L${libdir}
-Cflags: -I${includedir}/acdbdata
diff --git a/qcom/qli/configure.ac b/qcom/qli/configure.ac
index 70a709d..4b7a5ba 100644
--- a/qcom/qli/configure.ac
+++ b/qcom/qli/configure.ac
@@ -33,19 +33,19 @@ AC_SUBST([LT_VERSION], LT_MAJOR.LT_MINOR.LT_PATCH)
 AC_SUBST([LT_VERSION_NUMBER], LT_MAJOR:LT_MINOR:LT_PATCH)
 
 AC_CONFIG_FILES([ \
-    qcm6490/Makefile qcm6490/config.pc \
-    qcs615/Makefile  qcs615/config.pc  \
-    qcs8275/Makefile qcs8275/config.pc \
-    qcs8300/Makefile qcs8300/config.pc \
-    qcs9100/Makefile qcs9100/config.pc \
-    qcs9075/Makefile qcs9075/config.pc \
-    sm8750/Makefile  sm8750/config.pc \
-    GLYMUR/Makefile  GLYMUR/config.pc \
-    MAHUA/Makefile   MAHUA/config.pc \
-    Kaanapali/Makefile Kaanapali/config.pc \
-    X1E80100/Makefile X1E80100/config.pc \
-    shikra_cqs/Makefile shikra_cqs/config.pc \
-    shikra_iqs/Makefile shikra_iqs/config.pc
+    qcm6490/Makefile \
+    qcs615/Makefile  \
+    qcs8275/Makefile \
+    qcs8300/Makefile \
+    qcs9100/Makefile \
+    qcs9075/Makefile \
+    sm8750/Makefile \
+    GLYMUR/Makefile \
+    MAHUA/Makefile \
+    Kaanapali/Makefile \
+    X1E80100/Makefile \
+    shikra_cqs/Makefile \
+    shikra_iqs/Makefile
     ])
 
 AC_OUTPUT
diff --git a/qcom/qli/qcm6490/Makefile.am b/qcom/qli/qcm6490/Makefile.am
index e0ebc31..7f4f8bf 100644
--- a/qcom/qli/qcm6490/Makefile.am
+++ b/qcom/qli/qcm6490/Makefile.am
@@ -1,7 +1,3 @@
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = config.pc
-EXTRA_DIST = $(pkgconfig_DATA)
-
 AM_CFLAGS = -Wall -Werror
 
 config_acdbdata = acdbdata/acdb_cal.acdb\
diff --git a/qcom/qli/qcm6490/config.pc.in b/qcom/qli/qcm6490/config.pc.in
deleted file mode 100644
index 2cfa52e..0000000
--- a/qcom/qli/qcm6490/config.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: config
-Description: config library
-Version: @LT_VERSION@
-Libs: -L${libdir}
-Cflags: -I${includedir}/acdbdata
diff --git a/qcom/qli/qcs615/Makefile.am b/qcom/qli/qcs615/Makefile.am
index 4d73ad6..0085fab 100644
--- a/qcom/qli/qcs615/Makefile.am
+++ b/qcom/qli/qcs615/Makefile.am
@@ -1,7 +1,3 @@
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = config.pc
-EXTRA_DIST = $(pkgconfig_DATA)
-
 AM_CFLAGS = -Wall -Werror
 
 config_acdbdata = acdbdata/acdb_cal.acdb\
diff --git a/qcom/qli/qcs615/config.pc.in b/qcom/qli/qcs615/config.pc.in
deleted file mode 100644
index 2cfa52e..0000000
--- a/qcom/qli/qcs615/config.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: config
-Description: config library
-Version: @LT_VERSION@
-Libs: -L${libdir}
-Cflags: -I${includedir}/acdbdata
diff --git a/qcom/qli/qcs8275/Makefile.am b/qcom/qli/qcs8275/Makefile.am
index 87e7f22..155d212 100644
--- a/qcom/qli/qcs8275/Makefile.am
+++ b/qcom/qli/qcs8275/Makefile.am
@@ -1,7 +1,3 @@
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = config.pc
-EXTRA_DIST = $(pkgconfig_DATA)
-
 AM_CFLAGS = -Wall -Werror
 
 config_acdbdata = acdbdata/acdb_cal.acdb\
diff --git a/qcom/qli/qcs8275/config.pc.in b/qcom/qli/qcs8275/config.pc.in
deleted file mode 100644
index 2cfa52e..0000000
--- a/qcom/qli/qcs8275/config.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: config
-Description: config library
-Version: @LT_VERSION@
-Libs: -L${libdir}
-Cflags: -I${includedir}/acdbdata
diff --git a/qcom/qli/qcs8300/Makefile.am b/qcom/qli/qcs8300/Makefile.am
index 70db981..256728c 100644
--- a/qcom/qli/qcs8300/Makefile.am
+++ b/qcom/qli/qcs8300/Makefile.am
@@ -1,7 +1,3 @@
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = config.pc
-EXTRA_DIST = $(pkgconfig_DATA)
-
 AM_CFLAGS = -Wall -Werror
 
 config_acdbdata = acdbdata/acdb_cal.acdb\
diff --git a/qcom/qli/qcs8300/config.pc.in b/qcom/qli/qcs8300/config.pc.in
deleted file mode 100644
index 2cfa52e..0000000
--- a/qcom/qli/qcs8300/config.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: config
-Description: config library
-Version: @LT_VERSION@
-Libs: -L${libdir}
-Cflags: -I${includedir}/acdbdata
diff --git a/qcom/qli/qcs9075/Makefile.am b/qcom/qli/qcs9075/Makefile.am
index 735ee05..394a5da 100644
--- a/qcom/qli/qcs9075/Makefile.am
+++ b/qcom/qli/qcs9075/Makefile.am
@@ -1,7 +1,3 @@
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = config.pc
-EXTRA_DIST = $(pkgconfig_DATA)
-
 AM_CFLAGS = -Wall -Werror
 
 config_acdbdata = acdbdata/acdb_cal.acdb\
diff --git a/qcom/qli/qcs9075/config.pc.in b/qcom/qli/qcs9075/config.pc.in
deleted file mode 100644
index 2cfa52e..0000000
--- a/qcom/qli/qcs9075/config.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: config
-Description: config library
-Version: @LT_VERSION@
-Libs: -L${libdir}
-Cflags: -I${includedir}/acdbdata
diff --git a/qcom/qli/qcs9100/Makefile.am b/qcom/qli/qcs9100/Makefile.am
index fa35744..6267a1e 100644
--- a/qcom/qli/qcs9100/Makefile.am
+++ b/qcom/qli/qcs9100/Makefile.am
@@ -1,7 +1,3 @@
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = config.pc
-EXTRA_DIST = $(pkgconfig_DATA)
-
 AM_CFLAGS = -Wall -Werror
 
 config_acdbdata = acdbdata/acdb_cal.acdb\
diff --git a/qcom/qli/qcs9100/config.pc.in b/qcom/qli/qcs9100/config.pc.in
deleted file mode 100644
index 2cfa52e..0000000
--- a/qcom/qli/qcs9100/config.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: config
-Description: config library
-Version: @LT_VERSION@
-Libs: -L${libdir}
-Cflags: -I${includedir}/acdbdata
diff --git a/qcom/qli/shikra_cqs/Makefile.am b/qcom/qli/shikra_cqs/Makefile.am
index c3513d1..f78abf0 100644
--- a/qcom/qli/shikra_cqs/Makefile.am
+++ b/qcom/qli/shikra_cqs/Makefile.am
@@ -1,7 +1,3 @@
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = config.pc
-EXTRA_DIST = $(pkgconfig_DATA)
-
 AM_CFLAGS = -Wall -Werror
 
 config_acdbdata = acdbdata/acdb_cal.acdb\
diff --git a/qcom/qli/shikra_cqs/config.pc.in b/qcom/qli/shikra_cqs/config.pc.in
deleted file mode 100644
index 2cfa52e..0000000
--- a/qcom/qli/shikra_cqs/config.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: config
-Description: config library
-Version: @LT_VERSION@
-Libs: -L${libdir}
-Cflags: -I${includedir}/acdbdata
diff --git a/qcom/qli/shikra_iqs/Makefile.am b/qcom/qli/shikra_iqs/Makefile.am
index 0bf013c..99c6baa 100644
--- a/qcom/qli/shikra_iqs/Makefile.am
+++ b/qcom/qli/shikra_iqs/Makefile.am
@@ -1,7 +1,3 @@
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = config.pc
-EXTRA_DIST = $(pkgconfig_DATA)
-
 AM_CFLAGS = -Wall -Werror
 
 config_acdbdata = acdbdata/acdb_cal.acdb\
diff --git a/qcom/qli/shikra_iqs/config.pc.in b/qcom/qli/shikra_iqs/config.pc.in
deleted file mode 100644
index 2cfa52e..0000000
--- a/qcom/qli/shikra_iqs/config.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: config
-Description: config library
-Version: @LT_VERSION@
-Libs: -L${libdir}
-Cflags: -I${includedir}/acdbdata
diff --git a/qcom/qli/sm8750/Makefile.am b/qcom/qli/sm8750/Makefile.am
index e7e4542..bdedda1 100644
--- a/qcom/qli/sm8750/Makefile.am
+++ b/qcom/qli/sm8750/Makefile.am
@@ -1,7 +1,3 @@
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = config.pc
-EXTRA_DIST = $(pkgconfig_DATA)
-
 AM_CFLAGS = -Wall -Werror
 
 config_acdbdata = acdbdata/acdb_cal.acdb\
diff --git a/qcom/qli/sm8750/config.pc.in b/qcom/qli/sm8750/config.pc.in
deleted file mode 100644
index 4798e33..0000000
--- a/qcom/qli/sm8750/config.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: config
-Description: config library
-Version: @VERSION@
-Libs: -L${libdir}
-Cflags: -I${includedir}/acdbdata