diff --git a/examples/24-nbody/nbody.cpp b/examples/24-nbody/nbody.cpp
index ced3e0c8..62186f74 100644
--- a/examples/24-nbody/nbody.cpp
+++ b/examples/24-nbody/nbody.cpp
@@ -246,8 +246,8 @@ int _main_(int /*_argc*/, char** /*_argv*/)
 		bgfx::setUniform(u_params, &u_paramsData, 3);
 		bgfx::dispatch(0, updateInstancesProgram, u_paramsData.dispatchSize, 1, 1);
 
-		bx::swap(currPositionBuffer0, currPositionBuffer1);
-		bx::swap(prevPositionBuffer0, prevPositionBuffer1);
+		bx::xchg(currPositionBuffer0, currPositionBuffer1);
+		bx::xchg(prevPositionBuffer0, prevPositionBuffer1);
 
 		float view[16];
 
diff --git a/src/renderer_d3d11.cpp b/src/renderer_d3d11.cpp
index 7e3d9c05..82a2bafa 100644
--- a/src/renderer_d3d11.cpp
+++ b/src/renderer_d3d11.cpp
@@ -1852,10 +1852,10 @@ namespace bgfx
 					texture.D3D11.pSRView            = m_ovrRT.m_srv;
 					m_ovr.postReset(texture.Texture);
 
-					bx::swap(m_ovrRtv, m_backBufferColor);
+					bx::xchg(m_ovrRtv, m_backBufferColor);
 
 					BX_CHECK(NULL == m_backBufferDepthStencil, "");
-					bx::swap(m_ovrDsv, m_backBufferDepthStencil);
+					bx::xchg(m_ovrDsv, m_backBufferDepthStencil);
 				}
 			}
 #endif // BGFX_CONFIG_USE_OVR
@@ -1867,8 +1867,8 @@ namespace bgfx
 			m_ovr.preReset();
 			if (NULL != m_ovrRtv)
 			{
-				bx::swap(m_ovrRtv, m_backBufferColor);
-				bx::swap(m_ovrDsv, m_backBufferDepthStencil);
+				bx::xchg(m_ovrRtv, m_backBufferColor);
+				bx::xchg(m_ovrDsv, m_backBufferDepthStencil);
 				BX_CHECK(NULL == m_backBufferDepthStencil, "");
 
 				DX_RELEASE(m_ovrRtv, 0);