Index: /trunk/src/VBox/Runtime/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Runtime/Makefile.kmk	(revision 59056)
+++ /trunk/src/VBox/Runtime/Makefile.kmk	(revision 59057)
@@ -162,5 +162,4 @@
 	win/amd64/ASMAtomicBitToggle.asm \
 	win/amd64/ASMAtomicReadU64.asm \
-	win/amd64/ASMAtomicXchgU16.asm \
 	win/amd64/ASMAtomicXchgU8.asm \
 	win/amd64/ASMGetCS.asm \
@@ -204,4 +203,6 @@
 RuntimeWin32ASM_SOURCES = \
 	common/asm/ASMAtomicCmpXchgU8.asm \
+	common/asm/ASMAtomicCmpXchgU16.asm \
+	common/asm/ASMAtomicXchgU16.asm \
 	common/asm/ASMMultU32ByU32DivByU32.asm \
 	common/asm/ASMMultU64ByU32DivByU32.asm \
Index: unk/src/VBox/Runtime/win/amd64/ASMAtomicXchgU16.asm
===================================================================
--- /trunk/src/VBox/Runtime/win/amd64/ASMAtomicXchgU16.asm	(revision 59056)
+++ 	(revision )
@@ -1,43 +1,0 @@
-;; @file
-; IPRT - ASMAtomicXchgU16().
-;
-
-;
-; Copyright (C) 2006-2015 Oracle Corporation
-;
-; This file is part of VirtualBox Open Source Edition (OSE), as
-; available from http://www.virtualbox.org. This file is free software;
-; you can redistribute it and/or modify it under the terms of the GNU
-; General Public License (GPL) as published by the Free Software
-; Foundation, in version 2 as it comes in the "COPYING" file of the
-; VirtualBox OSE distribution. VirtualBox OSE is distributed in the
-; hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-;
-; The contents of this file may alternatively be used under the terms
-; of the Common Development and Distribution License Version 1.0
-; (CDDL) only, as it comes in the "COPYING.CDDL" file of the
-; VirtualBox OSE distribution, in which case the provisions of the
-; CDDL are applicable instead of those of the GPL.
-;
-; You may elect to license modified versions of this file under the
-; terms and conditions of either the GPL or the CDDL or both.
-;
-
-
-;*******************************************************************************
-;* Header Files                                                                *
-;*******************************************************************************
-%include "iprt/asmdefs.mac"
-
-BEGINCODE
-
-;;
-; @returns rax  Current *pu16 value
-; @param   rcx  pu16    Pointer to the 16-bit variable to update.
-; @param   rdx  u16     The 16-bit value to assign to *pu16.
-BEGINPROC_EXPORTED ASMAtomicXchgU16
-        xchg    [rcx], dx
-        movzx   eax, dx
-        ret
-ENDPROC ASMAtomicXchgU16
-