diff --git a/DllJp3dVM.dsp b/DllJp3dVM.dsp
index 6408c639..39c8b68a 100755
--- a/DllJp3dVM.dsp
+++ b/DllJp3dVM.dsp
@@ -57,7 +57,7 @@ LINK32=link.exe
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"Release/OpenJPEG.dll"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=if not exist dist mkdir dist	copy libopenjpeg\openjpeg.h dist	copy Release\OpenJPEG.dll dist	copy Release\OpenJPEG.lib dist
+PostBuild_Cmds=if not exist dist mkdir dist	copy libopenjpeg\openjpeg3d.h dist	copy Release\OpenJPEG.dll dist	copy Release\OpenJPEG.lib dist
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "DllOpenJPEG - Win32 Debug"
@@ -88,7 +88,7 @@ LINK32=link.exe
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"Debug/OpenJPEGd.dll" /pdbtype:sept
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=if not exist dist mkdir dist	copy libopenjpeg\openjpeg.h dist	copy Debug\OpenJPEGd.dll dist	copy Debug\OpenJPEGd.lib dist
+PostBuild_Cmds=if not exist dist mkdir dist	copy libopenjpeg\openjpeg3d.h dist	copy Debug\OpenJPEGd.dll dist	copy Debug\OpenJPEGd.lib dist
 # End Special Build Tool
 
 !ENDIF 
@@ -230,7 +230,7 @@ SOURCE=.\libopenjpeg\mqc.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\libopenjpeg\openjpeg.h
+SOURCE=.\libopenjpeg\openjpeg3d.h
 # End Source File
 # Begin Source File
 
diff --git a/DllJp3dVM.vcproj b/DllJp3dVM.vcproj
index 27c2108c..f8ca5e1c 100755
--- a/DllJp3dVM.vcproj
+++ b/DllJp3dVM.vcproj
@@ -54,7 +54,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				CommandLine="if not exist bin mkdir bin
-copy libjp3dvm\openjpeg.h bin
+copy libjp3dvm\openjpeg3d.h bin
 copy Release\OpenJP3D.dll bin
 copy Release\OpenJP3D.lib bin
 "/>
@@ -120,7 +120,7 @@ copy Release\OpenJP3D.lib bin
 			<Tool
 				Name="VCPostBuildEventTool"
 				CommandLine="if not exist bin mkdir bin
-copy libjp3dvm\openjpeg.h bin
+copy libjp3dvm\openjpeg3d.h bin
 copy Debug\OpenJP3D.dll bin
 "/>
 			<Tool
@@ -238,7 +238,7 @@ copy Debug\OpenJP3D.dll bin
 				RelativePath=".\libjp3dvm\mqc.h">
 			</File>
 			<File
-				RelativePath=".\libjp3dvm\openjpeg.h">
+				RelativePath=".\libjp3dvm\openjpeg3d.h">
 			</File>
 			<File
 				RelativePath=".\libjp3dvm\opj_includes.h">
diff --git a/LibJp3dVM.vcproj b/LibJp3dVM.vcproj
index 37953075..d3b04656 100755
--- a/LibJp3dVM.vcproj
+++ b/LibJp3dVM.vcproj
@@ -46,7 +46,7 @@
 				Name="VCPostBuildEventTool"
 				CommandLine="if not exist bin mkdir bin
 copy Release\LibJp3dVM.lib bin
-copy libjp3dvm\openjpeg.h bin
+copy libjp3dvm\openjpeg3d.h bin
 "/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
@@ -98,7 +98,7 @@ copy libjp3dvm\openjpeg.h bin
 				Name="VCPostBuildEventTool"
 				CommandLine="if not exist bin mkdir bin
 copy Debug\LibJp3dVM.lib bin
-copy libjp3dvm\openjpeg.h bin
+copy libjp3dvm\openjpeg3d.h bin
 "/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
@@ -213,7 +213,7 @@ copy libjp3dvm\openjpeg.h bin
 				RelativePath=".\libjp3dvm\mqc.h">
 			</File>
 			<File
-				RelativePath=".\libjp3dvm\openjpeg.h">
+				RelativePath=".\libjp3dvm\openjpeg3d.h">
 			</File>
 			<File
 				RelativePath=".\libjp3dvm\opj_includes.h">
diff --git a/Makefile.nix b/Makefile.nix
index 4ca053e5..d9861192 100644
--- a/Makefile.nix
+++ b/Makefile.nix
@@ -15,7 +15,7 @@ INCLS = ./libjp3dvm/t1_3d.h ./libjp3dvm/bio.h ./libjp3dvm/cio.h \
   ./libjp3dvm/dwt.h ./libjp3dvm/event.h ./libjp3dvm/fix.h \
   ./libjp3dvm/int.h ./libjp3dvm/jp3d.h ./libjp3dvm/jp3d_lib.h \
   ./libjp3dvm/volume.h ./libjp3dvm/mct.h ./libjp3dvm/mqc.h \
-  ./libjp3dvm/openjpeg.h ./libjp3dvm/pi.h ./libjp3dvm/raw.h \
+  ./libjp3dvm/openjpeg3d.h ./libjp3dvm/pi.h ./libjp3dvm/raw.h \
   ./libjp3dvm/t1.h  ./libjp3dvm/t2.h ./libjp3dvm/tcd.h \
   ./libjp3dvm/tgt.h ./libjp3dvm/opj_includes.h
 
@@ -83,8 +83,8 @@ ifeq ($(ENABLE_SHARED),yes)
 endif
 	$(LDCONFIG)
 	install -d $(DESTDIR)$(INSTALL_INCLUDE)
-	rm -f $(DESTDIR)$(INSTALL_INCLUDE)/openjpeg.h
-	install -m 644 -o root -g root libjp3dvm/openjpeg.h \
+	rm -f $(DESTDIR)$(INSTALL_INCLUDE)/openjpeg3d.h
+	install -m 644 -o root -g root libjp3dvm/openjpeg3d.h \
 	$(DESTDIR)$(INSTALL_INCLUDE)/openjpeg3d.h
 	(cd $(DESTDIR)$(prefix)/include && \
 	ln -sf $(headerdir)/openjpeg3d.h openjpeg3d.h)
diff --git a/codec/convert.c b/codec/convert.c
index 99eb7f2e..92a8163a 100755
--- a/codec/convert.c
+++ b/codec/convert.c
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "../libjp3dvm/openjpeg.h"
+#include "../libjp3dvm/openjpeg3d.h"
 #ifdef _WIN32
 #include "windirent.h"
 #else
diff --git a/codec/jp3d_to_volume.c b/codec/jp3d_to_volume.c
index 995faaec..8df9c405 100755
--- a/codec/jp3d_to_volume.c
+++ b/codec/jp3d_to_volume.c
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include "../libjp3dvm/openjpeg.h"
+#include "../libjp3dvm/openjpeg3d.h"
 #include "getopt.h"
 #include "convert.h"
 
diff --git a/codec/volume_to_jp3d.c b/codec/volume_to_jp3d.c
index d448fbe1..d966f2ed 100755
--- a/codec/volume_to_jp3d.c
+++ b/codec/volume_to_jp3d.c
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "../libjp3dvm/openjpeg.h"
+#include "../libjp3dvm/openjpeg3d.h"
 #include "getopt.h"
 #include "convert.h"
 
diff --git a/libjp3dvm/CMakeLists.txt b/libjp3dvm/CMakeLists.txt
index 7ab01fdc..df1ddc6a 100644
--- a/libjp3dvm/CMakeLists.txt
+++ b/libjp3dvm/CMakeLists.txt
@@ -37,8 +37,8 @@ DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
 )
 
 # Install includes files
-INSTALL(FILES openjpeg.h
+INSTALL(FILES openjpeg3d.h
   DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg3d-1.3
-  RENAME openjpeg3d.h)
+)
 INSTALL(CODE
   "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg3d-1.3/openjpeg3d.h \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg3d.h)")
diff --git a/libjp3dvm/Makefile.am b/libjp3dvm/Makefile.am
index 3971193c..2d7663e1 100644
--- a/libjp3dvm/Makefile.am
+++ b/libjp3dvm/Makefile.am
@@ -19,7 +19,7 @@ INCLS = t1_3d.h bio.h cio.h  dwt.h event.h fix.h int.h jp3d.h jp3d_lib.h \
 libopenjp3dvm_la_SOURCES = $(SRCS) $(INCLS)
 
 includedir = ${prefix}/include/openjpeg3d-$(MAJOR).$(MINOR)
-include_HEADERS = openjpeg.h
+include_HEADERS = openjpeg3d.h
 
 # Converts cr/lf to just lf
 DOS2UNIX = dos2unix
@@ -56,7 +56,7 @@ all-local:
 
 install-data-hook:
 	(cd $(DESTDIR)${prefix}/include && rm -f openjpeg3d.h)
-	(cd ${prefix}/include/${headerdir} && mv openjpeg.h openjpeg3d.h) 
+	(cd ${prefix}/include/${headerdir} && mv openjpeg3d.h openjpeg3d.h) 
 	(cd $(DESTDIR)${prefix}/include && \
 	$(LN_S) ${headerdir}/openjpeg3d.h openjpeg3d.h)
 
diff --git a/libjp3dvm/Makefile.in b/libjp3dvm/Makefile.in
index 6433bd5a..68566059 100644
--- a/libjp3dvm/Makefile.in
+++ b/libjp3dvm/Makefile.in
@@ -258,7 +258,7 @@ INCLS = t1_3d.h bio.h cio.h  dwt.h event.h fix.h int.h jp3d.h jp3d_lib.h \
   volume.h mct.h mqc.h pi.h raw.h t1.h  t2.h tcd.h tgt.h opj_includes.h
 
 libopenjp3dvm_la_SOURCES = $(SRCS) $(INCLS)
-include_HEADERS = openjpeg.h
+include_HEADERS = openjpeg3d.h
 
 # Converts cr/lf to just lf
 DOS2UNIX = dos2unix
@@ -634,7 +634,7 @@ all-local:
 
 install-data-hook:
 	(cd $(DESTDIR)${prefix}/include && rm -f openjpeg3d.h)
-	(cd ${prefix}/include/${headerdir} && mv openjpeg.h openjpeg3d.h) 
+	(cd ${prefix}/include/${headerdir} && mv openjpeg3d.h openjpeg3d.h) 
 	(cd $(DESTDIR)${prefix}/include && \
 	$(LN_S) ${headerdir}/openjpeg3d.h openjpeg3d.h)
 
diff --git a/libjp3dvm/cio.h b/libjp3dvm/cio.h
index c6ad109f..6f58aeaa 100755
--- a/libjp3dvm/cio.h
+++ b/libjp3dvm/cio.h
@@ -40,7 +40,7 @@ The functions in CIO.C have for goal to realize a byte input / output process.
 /** @defgroup CIO CIO - byte input-output stream */
 /*@{*/
 
-/** @name Funciones generales (see also openjpeg.h) */
+/** @name Funciones generales (see also openjpeg3d.h) */
 /*@{*/
 /* ----------------------------------------------------------------------- */
 /**
diff --git a/libjp3dvm/event.h b/libjp3dvm/event.h
index acc4fc3e..5a83bd26 100755
--- a/libjp3dvm/event.h
+++ b/libjp3dvm/event.h
@@ -39,7 +39,7 @@ The functions in EVENT.C have for goal to send output messages (errors, warnings
 /** @defgroup EVENT EVENT - Implementation of a event callback system */
 /*@{*/
 
-/** @name Funciones generales (see also openjpeg.h) */
+/** @name Funciones generales (see also openjpeg3d.h) */
 /*@{*/
 /* ----------------------------------------------------------------------- */
 /**
diff --git a/libjp3dvm/int.h b/libjp3dvm/int.h
index 99ab72bb..38932d98 100755
--- a/libjp3dvm/int.h
+++ b/libjp3dvm/int.h
@@ -39,7 +39,7 @@ The functions in INT.H have for goal to realize operations on integers.
 /** @defgroup INT INT - Implementation of operations on integers */
 /*@{*/
 
-/** @name Funciones generales (see also openjpeg.h) */
+/** @name Funciones generales (see also openjpeg3d.h) */
 /*@{*/
 /* ----------------------------------------------------------------------- */
 /**
diff --git a/libjp3dvm/openjpeg.h b/libjp3dvm/openjpeg3d.h
similarity index 100%
rename from libjp3dvm/openjpeg.h
rename to libjp3dvm/openjpeg3d.h
diff --git a/libjp3dvm/opj_includes.h b/libjp3dvm/opj_includes.h
index 620dc1b9..0c70ff10 100755
--- a/libjp3dvm/opj_includes.h
+++ b/libjp3dvm/opj_includes.h
@@ -46,7 +46,7 @@
    OpenJPEG interface
  ==========================================================
  */
-#include "openjpeg.h"
+#include "openjpeg3d.h"
 
 /*
  ==========================================================