--- a/gfx/thebes/gfxHarfBuzzShaper.h
+++ b/gfx/thebes/gfxHarfBuzzShaper.h
@@ -109,21 +109,21 @@ protected:
                               nsTArray<nsPoint>& aPositions,
                               uint32_t aAppUnitsPerDevUnit);
 
     bool InitializeVertical();
     bool LoadHmtxTable();
 
     struct Glyf { // we only need the bounding-box at the beginning
                   // of the glyph record, not the actual outline data
-        AutoSwap_PRInt16 numberOfContours;
-        AutoSwap_PRInt16 xMin;
-        AutoSwap_PRInt16 yMin;
-        AutoSwap_PRInt16 xMax;
-        AutoSwap_PRInt16 yMax;
+        mozilla::AutoSwap_PRInt16 numberOfContours;
+        mozilla::AutoSwap_PRInt16 xMin;
+        mozilla::AutoSwap_PRInt16 yMin;
+        mozilla::AutoSwap_PRInt16 xMax;
+        mozilla::AutoSwap_PRInt16 yMax;
     };
 
     const Glyf *FindGlyf(hb_codepoint_t aGlyph, bool *aEmptyGlyf) const;
 
     // harfbuzz face object: we acquire a reference from the font entry
     // on shaper creation, and release it in our destructor
     hb_face_t         *mHBFace;
 

--- a/gfx/thebes/gfxScriptItemizer.cpp
+++ b/gfx/thebes/gfxScriptItemizer.cpp
@@ -47,16 +47,18 @@
  * of their respective owners. 
  */
 
 #include "gfxScriptItemizer.h"
 #include "nsUnicodeProperties.h"
 #include "nsCharTraits.h"
 #include "harfbuzz/hb.h"
 
+using namespace mozilla::unicode;
+
 #define MOD(sp) ((sp) % PAREN_STACK_DEPTH)
 #define LIMIT_INC(sp) (((sp) < PAREN_STACK_DEPTH)? (sp) + 1 : PAREN_STACK_DEPTH)
 #define INC(sp,count) (MOD((sp) + (count)))
 #define INC1(sp) (INC(sp, 1))
 #define DEC(sp,count) (MOD((sp) + PAREN_STACK_DEPTH - (count)))
 #define DEC1(sp) (DEC(sp, 1))
 #define STACK_IS_EMPTY() (pushCount <= 0)
 #define STACK_IS_NOT_EMPTY() (! STACK_IS_EMPTY())

--- a/gfx/thebes/gfxUtils.cpp
+++ b/gfx/thebes/gfxUtils.cpp
@@ -7,16 +7,17 @@
 
 #include "cairo.h"
 #include "gfxContext.h"
 #include "gfxEnv.h"
 #include "gfxImageSurface.h"
 #include "gfxPlatform.h"
 #include "gfxDrawable.h"
 #include "imgIEncoder.h"
+#include "mozilla/unused.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Base64.h"
 #include "mozilla/dom/ImageEncoder.h"
 #include "mozilla/dom/WorkerPrivate.h"
 #include "mozilla/dom/WorkerRunnable.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/gfx/DataSurfaceHelpers.h"
 #include "mozilla/gfx/Logging.h"

--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -1,14 +1,17 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* vim: set ts=8 sts=4 et sw=4 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+// only show C4509 "nonstandard extension used: 'gfxWindowsPlatform::InitD3D11Devices' uses SEH and 'adapter' has destructor" once
+#pragma warning(once: 4509)
+
 #include "gfxWindowsPlatform.h"
 
 #include "cairo.h"
 #include "mozilla/ArrayUtils.h"
 
 #include "gfxImageSurface.h"
 #include "gfxWindowsSurface.h"