diff --git a/libs/codec/g7xx/Makefile.am b/libs/codec/g7xx/Makefile.am
index d31361b4e7..8b4ff71bab 100644
--- a/libs/codec/g7xx/Makefile.am
+++ b/libs/codec/g7xx/Makefile.am
@@ -9,6 +9,6 @@ libg7xx_la_CFLAGS	= $(AM_CFLAGS)
 libg7xx_la_LDFLAGS	= 
 
 library_includedir      = $(prefix)/include/g7xx
-library_include_HEADERS = src/include/g722.h src/include/g711.h src/include/g726.h
+library_include_HEADERS = src/include/g7xx/g722.h src/include/g7xx/g711.h src/include/g7xx/g726.h
 
 
diff --git a/libs/codec/g7xx/Makefile.in b/libs/codec/g7xx/Makefile.in
index cedea1e2a8..97843bc91a 100644
--- a/libs/codec/g7xx/Makefile.in
+++ b/libs/codec/g7xx/Makefile.in
@@ -200,7 +200,7 @@ libg7xx_la_SOURCES = src/g711.c src/g722_decode.c src/g722_encode.c src/g726.c
 libg7xx_la_CFLAGS = $(AM_CFLAGS)
 libg7xx_la_LDFLAGS = 
 library_includedir = $(prefix)/include/g7xx
-library_include_HEADERS = src/include/g722.h src/include/g711.h src/include/g726.h
+library_include_HEADERS = src/include/g7xx/g722.h src/include/g7xx/g711.h src/include/g7xx/g726.h
 all: all-am
 
 .SUFFIXES:
@@ -406,7 +406,7 @@ distclean-tags:
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/src/include
+	$(mkdir_p) $(distdir)/src/include/g7xx
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/libs/codec/g7xx/src/include/g711.h b/libs/codec/g7xx/src/include/g7xx/g711.h
similarity index 100%
rename from libs/codec/g7xx/src/include/g711.h
rename to libs/codec/g7xx/src/include/g7xx/g711.h
diff --git a/libs/codec/g7xx/src/include/g722.h b/libs/codec/g7xx/src/include/g7xx/g722.h
similarity index 100%
rename from libs/codec/g7xx/src/include/g722.h
rename to libs/codec/g7xx/src/include/g7xx/g722.h
diff --git a/libs/codec/g7xx/src/include/g726.h b/libs/codec/g7xx/src/include/g7xx/g726.h
similarity index 100%
rename from libs/codec/g7xx/src/include/g726.h
rename to libs/codec/g7xx/src/include/g7xx/g726.h