diff --git a/util/test/posix/close_multiple.cc b/util/posix/close_multiple.cc
similarity index 99%
rename from util/test/posix/close_multiple.cc
rename to util/posix/close_multiple.cc
index 4b5b7f21..a61ee1cd 100644
--- a/util/test/posix/close_multiple.cc
+++ b/util/posix/close_multiple.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "util/test/posix/close_multiple.h"
+#include "util/posix/close_multiple.h"
 
 #include <dirent.h>
 #include <errno.h>
diff --git a/util/test/posix/close_multiple.h b/util/posix/close_multiple.h
similarity index 92%
rename from util/test/posix/close_multiple.h
rename to util/posix/close_multiple.h
index c2206bd0..2a66f28a 100644
--- a/util/test/posix/close_multiple.h
+++ b/util/posix/close_multiple.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef CRASHPAD_UTIL_TEST_POSIX_CLOSE_MULTIPLE_H_
-#define CRASHPAD_UTIL_TEST_POSIX_CLOSE_MULTIPLE_H_
+#ifndef CRASHPAD_UTIL_POSIX_CLOSE_MULTIPLE_H_
+#define CRASHPAD_UTIL_POSIX_CLOSE_MULTIPLE_H_
 
 namespace crashpad {
 
@@ -41,4 +41,4 @@ void CloseMultipleNowOrOnExec(int fd, int preserve_fd);
 
 }  // namespace crashpad
 
-#endif  // CRASHPAD_UTIL_TEST_POSIX_CLOSE_MULTIPLE_H_
+#endif  // CRASHPAD_UTIL_POSIX_CLOSE_MULTIPLE_H_
diff --git a/util/test/multiprocess_exec.cc b/util/test/multiprocess_exec.cc
index 5848d8ec..2e725dc9 100644
--- a/util/test/multiprocess_exec.cc
+++ b/util/test/multiprocess_exec.cc
@@ -21,8 +21,8 @@
 #include "base/posix/eintr_wrapper.h"
 #include "gtest/gtest.h"
 #include "util/misc/scoped_forbid_return.h"
+#include "util/posix/close_multiple.h"
 #include "util/test/errors.h"
-#include "util/test/posix/close_multiple.h"
 
 namespace crashpad {
 namespace test {
diff --git a/util/util.gyp b/util/util.gyp
index b950c5db..9ceec2be 100644
--- a/util/util.gyp
+++ b/util/util.gyp
@@ -99,6 +99,8 @@
         'numeric/in_range_cast.h',
         'numeric/int128.h',
         'numeric/safe_assignment.h',
+        'posix/close_multiple.cc',
+        'posix/close_multiple.h',
         'posix/close_stdio.cc',
         'posix/close_stdio.h',
         'posix/drop_privileges.cc',
@@ -210,8 +212,6 @@
         'test/multiprocess.h',
         'test/multiprocess_exec.cc',
         'test/multiprocess_exec.h',
-        'test/posix/close_multiple.cc',
-        'test/posix/close_multiple.h',
       ],
       'conditions': [
         ['OS=="mac"', {