diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt
index a4347c63..566ec56b 100644
--- a/src/lib/openjp2/CMakeLists.txt
+++ b/src/lib/openjp2/CMakeLists.txt
@@ -28,12 +28,7 @@ set(OPENJPEG_SRCS
   ${CMAKE_CURRENT_SOURCE_DIR}/t2.c
   ${CMAKE_CURRENT_SOURCE_DIR}/tcd.c
   ${CMAKE_CURRENT_SOURCE_DIR}/tgt.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/cidx_manager.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/phix_manager.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/ppix_manager.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/thix_manager.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/tpix_manager.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/function_list.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/function_list.c
 )
 
 # Build the library
diff --git a/src/lib/openjp2/opj_includes.h b/src/lib/openjp2/opj_includes.h
index b5876341..a6a84688 100644
--- a/src/lib/openjp2/opj_includes.h
+++ b/src/lib/openjp2/opj_includes.h
@@ -169,8 +169,10 @@ static INLINE long lrintf(float f){
 #include "mct.h"
 #include "opj_intmath.h"
 
+#ifdef USE_JPIP
 #include "cidx_manager.h"
 #include "indexbox_manager.h"
+#endif
 
 /* JPWL>> */
 #ifdef USE_JPWL
diff --git a/src/lib/openjpip/CMakeLists.txt b/src/lib/openjpip/CMakeLists.txt
index 53187574..47eb24ac 100644
--- a/src/lib/openjpip/CMakeLists.txt
+++ b/src/lib/openjpip/CMakeLists.txt
@@ -1,6 +1,9 @@
 include_regular_expression("^.*$")
 
+add_definitions(-DUSE_JPIP)
+
 include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
   ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
   ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
   ${FCGI_INCLUDE_DIRS}
@@ -33,6 +36,11 @@ set(OPENJPIP_SRCS
   ${CMAKE_CURRENT_SOURCE_DIR}/session_manager.c
   ${CMAKE_CURRENT_SOURCE_DIR}/jpip_parser.c
   ${CMAKE_CURRENT_SOURCE_DIR}/sock_manager.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/cidx_manager.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/phix_manager.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/ppix_manager.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/thix_manager.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/tpix_manager.c
   )
 
 set(SERVER_SRCS
diff --git a/src/lib/openjp2/cidx_manager.c b/src/lib/openjpip/cidx_manager.c
similarity index 100%
rename from src/lib/openjp2/cidx_manager.c
rename to src/lib/openjpip/cidx_manager.c
diff --git a/src/lib/openjp2/cidx_manager.h b/src/lib/openjpip/cidx_manager.h
similarity index 100%
rename from src/lib/openjp2/cidx_manager.h
rename to src/lib/openjpip/cidx_manager.h
diff --git a/src/lib/openjp2/indexbox_manager.h b/src/lib/openjpip/indexbox_manager.h
similarity index 100%
rename from src/lib/openjp2/indexbox_manager.h
rename to src/lib/openjpip/indexbox_manager.h
diff --git a/src/lib/openjp2/phix_manager.c b/src/lib/openjpip/phix_manager.c
similarity index 100%
rename from src/lib/openjp2/phix_manager.c
rename to src/lib/openjpip/phix_manager.c
diff --git a/src/lib/openjp2/ppix_manager.c b/src/lib/openjpip/ppix_manager.c
similarity index 100%
rename from src/lib/openjp2/ppix_manager.c
rename to src/lib/openjpip/ppix_manager.c
diff --git a/src/lib/openjp2/thix_manager.c b/src/lib/openjpip/thix_manager.c
similarity index 100%
rename from src/lib/openjp2/thix_manager.c
rename to src/lib/openjpip/thix_manager.c
diff --git a/src/lib/openjp2/tpix_manager.c b/src/lib/openjpip/tpix_manager.c
similarity index 100%
rename from src/lib/openjp2/tpix_manager.c
rename to src/lib/openjpip/tpix_manager.c
diff --git a/src/lib/openjpwl/CMakeLists.txt b/src/lib/openjpwl/CMakeLists.txt
index e5f02d48..86b31d12 100644
--- a/src/lib/openjpwl/CMakeLists.txt
+++ b/src/lib/openjpwl/CMakeLists.txt
@@ -21,12 +21,7 @@ set(OPENJPEG_SRCS
   ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/t2.c
   ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/tcd.c
   ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/tgt.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/cidx_manager.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/phix_manager.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/ppix_manager.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/thix_manager.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/tpix_manager.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/function_list.c
+ ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/function_list.c
 )
 
 set(JPWL_SRCS crc.c jpwl.c jpwl_lib.c rs.c)