diff --git a/user/Makefile b/user/Makefile
index 326ffe4061..57ec5f3f82 100644
--- a/user/Makefile
+++ b/user/Makefile
@@ -1 +1 @@
-include ../install/unix/setup/general/makedirs
+include ../setup/general/makedirs
diff --git a/user/wxConvert/Makefile b/user/wxConvert/Makefile
index 027d82ae19..bccce53f76 100644
--- a/user/wxConvert/Makefile
+++ b/user/wxConvert/Makefile
@@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../setup/general/makeapp
diff --git a/user/wxFile/Makefile b/user/wxFile/Makefile
index 027d82ae19..bccce53f76 100644
--- a/user/wxFile/Makefile
+++ b/user/wxFile/Makefile
@@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../setup/general/makeapp
diff --git a/user/wxLayout/Makefile b/user/wxLayout/Makefile
index 027d82ae19..bccce53f76 100644
--- a/user/wxLayout/Makefile
+++ b/user/wxLayout/Makefile
@@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../setup/general/makeapp
diff --git a/user/wxTest/Makefile b/user/wxTest/Makefile
index 027d82ae19..bccce53f76 100644
--- a/user/wxTest/Makefile
+++ b/user/wxTest/Makefile
@@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../setup/general/makeapp