diff --git a/winsup/utils/mingw/Makefile.am b/winsup/utils/mingw/Makefile.am
index a14725902..73abc4264 100644
--- a/winsup/utils/mingw/Makefile.am
+++ b/winsup/utils/mingw/Makefile.am
@@ -25,26 +25,29 @@ bin_PROGRAMS = \
 	strace
 
 cygcheck_SOURCES = \
-	../bloda.cc \
-	../cygcheck.cc \
-	../dump_setup.cc \
-	../path.cc
+	bloda.cc \
+	cygcheck.cc \
+	dump_setup.cc \
+	path.cc
+cygcheck_CPPFLAGS=-I$(srcdir)/..
 cygcheck_LDADD = -lz -lwininet -lpsapi -lntdll
 
-cygwin_console_helper_SOURCES = ../cygwin-console-helper.cc
+cygwin_console_helper_SOURCES = cygwin-console-helper.cc
 
-ldh_SOURCES = ../ldh.cc
+ldh_SOURCES = ldh.cc
 
 strace_SOURCES = \
-	../path.cc \
-	../strace.cc
+	path.cc \
+	strace.cc
+strace_CPPFLAGS=-I$(srcdir)/..
 strace_LDADD = -lntdll
 
 noinst_PROGRAMS = path-testsuite
 
 path_testsuite_SOURCES = \
-	../path.cc \
-	../testsuite.cc
+	path.cc \
+	testsuite.cc
+path_testsuite_CPPFLAGS=-I$(srcdir)/..
 path_testsuite_CXXFLAGS = -DTESTSUITE
 
 TESTS = path-testsuite
diff --git a/winsup/utils/bloda.cc b/winsup/utils/mingw/bloda.cc
similarity index 100%
rename from winsup/utils/bloda.cc
rename to winsup/utils/mingw/bloda.cc
diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/mingw/cygcheck.cc
similarity index 100%
rename from winsup/utils/cygcheck.cc
rename to winsup/utils/mingw/cygcheck.cc
diff --git a/winsup/utils/cygwin-console-helper.cc b/winsup/utils/mingw/cygwin-console-helper.cc
similarity index 100%
rename from winsup/utils/cygwin-console-helper.cc
rename to winsup/utils/mingw/cygwin-console-helper.cc
diff --git a/winsup/utils/dump_setup.cc b/winsup/utils/mingw/dump_setup.cc
similarity index 100%
rename from winsup/utils/dump_setup.cc
rename to winsup/utils/mingw/dump_setup.cc
diff --git a/winsup/utils/ldh.cc b/winsup/utils/mingw/ldh.cc
similarity index 100%
rename from winsup/utils/ldh.cc
rename to winsup/utils/mingw/ldh.cc
diff --git a/winsup/utils/mingw/path.cc b/winsup/utils/mingw/path.cc
new file mode 100644
index 000000000..dd275b61d
--- /dev/null
+++ b/winsup/utils/mingw/path.cc
@@ -0,0 +1 @@
+#include "../path.cc"
diff --git a/winsup/utils/strace.cc b/winsup/utils/mingw/strace.cc
similarity index 99%
rename from winsup/utils/strace.cc
rename to winsup/utils/mingw/strace.cc
index b96ad40c1..a7797600c 100644
--- a/winsup/utils/strace.cc
+++ b/winsup/utils/mingw/strace.cc
@@ -21,11 +21,11 @@ details. */
 #include <time.h>
 #include <signal.h>
 #include <errno.h>
-#include "../cygwin/include/sys/strace.h"
-#include "../cygwin/include/sys/cygwin.h"
-#include "../cygwin/include/cygwin/version.h"
-#include "../cygwin/cygtls_padsize.h"
-#include "../cygwin/gcc_seh.h"
+#include "../../cygwin/include/sys/strace.h"
+#include "../../cygwin/include/sys/cygwin.h"
+#include "../../cygwin/include/cygwin/version.h"
+#include "../../cygwin/cygtls_padsize.h"
+#include "../../cygwin/gcc_seh.h"
 #include "path.h"
 #undef cygwin_internal
 #include "loadlib.h"
diff --git a/winsup/utils/testsuite.cc b/winsup/utils/mingw/testsuite.cc
similarity index 100%
rename from winsup/utils/testsuite.cc
rename to winsup/utils/mingw/testsuite.cc
diff --git a/winsup/utils/testsuite.h b/winsup/utils/mingw/testsuite.h
similarity index 100%
rename from winsup/utils/testsuite.h
rename to winsup/utils/mingw/testsuite.h