diff --git a/jafar-correl/Makefile b/jafar-correl/Makefile
index 1a42ba39f7c9863ed98a4cdb3f32731fa271f6f6..54cab90f898f1b58aae5f6a47dba0562449ab1f6 100644
--- a/jafar-correl/Makefile
+++ b/jafar-correl/Makefile
@@ -17,9 +17,9 @@ CXXFLAGS += -pthread
 CMAKE_ARGS+=		-DBOOST_INCLUDEDIR=${PREFIX.boost-headers}/include
 CMAKE_ARGS+=		-DBOOST_LIBDIR=${PREFIX.boost-libs}/include
 
-include ../../wip/jafar-kernel/depend.mk
-include ../../wip/jafar-image/depend.mk
-include ../../wip/jafar-jmath/depend.mk
+include ../../devel/jafar-kernel/depend.mk
+include ../../image/jafar-image/depend.mk
+include ../../math/jafar-jmath/depend.mk
 include ../../image/opencv/depend.mk
 
 include ../../pkgtools/libtool/depend.mk
diff --git a/jafar-gdhe/Makefile b/jafar-gdhe/Makefile
index 7209122a40b30cb2318e2701c400467b49d54088..288cfdd4e2654273511681ad9019a6acbc96e5b5 100644
--- a/jafar-gdhe/Makefile
+++ b/jafar-gdhe/Makefile
@@ -22,8 +22,8 @@ CXXFLAGS += -pthread
 CMAKE_ARGS+=		-DBOOST_INCLUDEDIR=${PREFIX.boost-headers}/include
 CMAKE_ARGS+=		-DBOOST_LIBDIR=${PREFIX.boost-libs}/include
 
-include ../../wip/jafar-kernel/depend.mk
-include ../../wip/jafar-jmath/depend.mk
+include ../../devel/jafar-kernel/depend.mk
+include ../../math/jafar-jmath/depend.mk
 include ../../graphics/gdhe/depend.mk
 include ../../math/boost-numeric-bindings/depend.mk
 include ../../devel/boost-headers/depend.mk
diff --git a/jafar-lgl/Makefile b/jafar-lgl/Makefile
index 02a79f8572897be4af79cf340d1daadc34b2eb26..45d757b5e38428cf6283d083bdafa177dc7ba140 100644
--- a/jafar-lgl/Makefile
+++ b/jafar-lgl/Makefile
@@ -30,7 +30,7 @@ define PKG_OPTION_UNSET.qdisplay
 endef
 
 
-include ../../wip/jafar-kernel/depend.mk
+include ../../devel/jafar-kernel/depend.mk
 
 include ../../devel/boost-headers/depend.mk
 include ../../pkgtools/pkg-config/depend.mk
diff --git a/jafar-qdisplay/Makefile b/jafar-qdisplay/Makefile
index fe0c282628e30e3590f4f3eee3fa8ac5afa85ba1..b414970e4c5f797d5dc8dd9610cf6af41411ee43 100644
--- a/jafar-qdisplay/Makefile
+++ b/jafar-qdisplay/Makefile
@@ -26,9 +26,9 @@ CMAKE_ARGS+=		-DBOOST_INCLUDEDIR=${PREFIX.boost-headers}/include
 CMAKE_ARGS+=		-DBOOST_LIBDIR=${PREFIX.boost-libs}/include
 CMAKE_ARGS+=		-DQT_QMAKE_EXECUTABLE=${QMAKE}
 
-include ../../wip/jafar-kernel/depend.mk
-include ../../wip/jafar-image/depend.mk
-include ../../wip/jafar-jmath/depend.mk
+include ../../devel/jafar-kernel/depend.mk
+include ../../image/jafar-image/depend.mk
+include ../../math/jafar-jmath/depend.mk
 include ../../devel/boost-headers/depend.mk
 include ../../devel/boost-libs/depend.mk
 include ../../math/boost-numeric-bindings/depend.mk
diff --git a/jafar-rednav/Makefile b/jafar-rednav/Makefile
index 1f3780d23911b61e07a4a3bb31f98d3ea8e2839a..69fcf08d4996f1418f08275d82fb05f46b350848 100644
--- a/jafar-rednav/Makefile
+++ b/jafar-rednav/Makefile
@@ -19,7 +19,7 @@ USE_PKGLOCALEDIR=	yes
 CMAKE_ARGS+=		-DBOOST_INCLUDEDIR=${PREFIX.boost-headers}/include
 
 
-include ../../wip/jafar-kernel/depend.mk
+include ../../devel/jafar-kernel/depend.mk
 include ../../wip/jafar-lgl/depend.mk
 
 include ../../devel/boost-headers/depend.mk
diff --git a/jafar-rtslam/Makefile b/jafar-rtslam/Makefile
index b206a34d9c021343da91b2327b042dca55eaf2c4..a3c0f9a08df9d758e3be3d9c14e3ea6cf0ecd556 100644
--- a/jafar-rtslam/Makefile
+++ b/jafar-rtslam/Makefile
@@ -60,9 +60,9 @@ DEPEND_ABI.MTI=			MTI>=0.5
 
 include ../../wip/jafar-correl/depend.mk
 include ../../wip/jafar-gdhe/depend.mk
-include ../../wip/jafar-image/depend.mk
-include ../../wip/jafar-jmath/depend.mk
-include ../../wip/jafar-kernel/depend.mk
+include ../../image/jafar-image/depend.mk
+include ../../math/jafar-jmath/depend.mk
+include ../../devel/jafar-kernel/depend.mk
 include ../../wip/jafar-qdisplay/depend.mk
 
 include ../../devel/boost-headers/depend.mk