Bug 1609996 - Fix some things that the automated replacement didn't catch. r=froydnj

This makes Gecko build again. I'll squash this into the previous commit anyhow.

Differential Revision: https://phabricator.services.mozilla.com/D60324

--HG--
extra : moz-landing-system : lando

dom/media/webm/WebMDemuxer.h

@@ -3,17 +3,17 @@
 /* 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/. */
-#if !defined(WebMDemuxer_h_)
-#  define WebMDemuxer_h_
+#ifndef WebMDemuxer_h_
+#define WebMDemuxer_h_
 
-#  include "nsTArray.h"
-#  include "MediaDataDemuxer.h"
-#  include "MediaResource.h"
-#  include "NesteggPacketHolder.h"
-#  include "mozilla/Move.h"
+#include "nsTArray.h"
+#include "MediaDataDemuxer.h"
+#include "MediaResource.h"
+#include "NesteggPacketHolder.h"
 
-#  include <deque>
-#  include <stdint.h>
+#include <deque>
+#include <stdint.h>
+#include <utility>
 
 typedef struct nestegg nestegg;
 

mozglue/baseprofiler/lul/LulMain.cpp

@@ -17,13 +17,13 @@
 
 #  include <algorithm>  // std::sort
 #  include <string>
+#  include <utility>
 
 #  include "mozilla/Assertions.h"
 #  include "mozilla/ArrayUtils.h"
 #  include "mozilla/CheckedInt.h"
 #  include "mozilla/DebugOnly.h"
 #  include "mozilla/MemoryChecking.h"
-#  include "mozilla/Move.h"
 #  include "mozilla/Sprintf.h"
 #  include "mozilla/UniquePtr.h"
 #  include "mozilla/Unused.h"

toolkit/xre/CmdLineAndEnvUtils.h

@@ -18,7 +18,6 @@
 #endif
 
 #if defined(XP_WIN)
-#  include "mozilla/Move.h"
 #  include "mozilla/UniquePtr.h"
 #  include "mozilla/Vector.h"
 #  include "mozilla/WinHeaderOnlyUtils.h"