diff --git a/os/meson.build b/os/meson.build
index 2f210c933b..8ad4c6447d 100644
--- a/os/meson.build
+++ b/os/meson.build
@@ -16,11 +16,11 @@ srcs_os = [
     'ossock.c',
     'serverlock.c',
     'string.c',
+    'transport.c',
     'utils.c',
     'xdmauth.c',
     'xhostname.c',
     'xsha1.c',
-    'xstrans.c',
     'xprintf.c',
     'log.c',
 ]
diff --git a/os/transport.c b/os/transport.c
index b62fc7b641..79fbbefa5c 100644
--- a/os/transport.c
+++ b/os/transport.c
@@ -46,8 +46,10 @@ from The Open Group.
  * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include <dix-config.h>
 
 #include <stdlib.h>
+#include <X11/Xfuncproto.h>
 
 #define XTRANS_TRANSPORT_C  /* used to flag Xtransint.h that it's being used
 			       here, not just #included in another file */
diff --git a/os/xstrans.c b/os/xstrans.c
deleted file mode 100644
index 889dec3299..0000000000
--- a/os/xstrans.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <dix-config.h>
-
-#include <X11/Xfuncproto.h>
-
-#include "os/transport.c"