From 4f0e8086f28920180a94470d86c84f2576aac632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Mon, 20 Jan 2020 16:18:28 +0000
Subject: [PATCH] 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         | 18 +++++++++---------
 mozglue/baseprofiler/lul/LulMain.cpp |  2 +-
 toolkit/xre/CmdLineAndEnvUtils.h     |  1 -
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/dom/media/webm/WebMDemuxer.h b/dom/media/webm/WebMDemuxer.h
index f568d1ef0f59..836d7be7368f 100644
--- a/dom/media/webm/WebMDemuxer.h
+++ b/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;
 
diff --git a/mozglue/baseprofiler/lul/LulMain.cpp b/mozglue/baseprofiler/lul/LulMain.cpp
index 348fdb890c66..db8900087d43 100644
--- a/mozglue/baseprofiler/lul/LulMain.cpp
+++ b/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"
diff --git a/toolkit/xre/CmdLineAndEnvUtils.h b/toolkit/xre/CmdLineAndEnvUtils.h
index 98ff001cc98a..a370039e5345 100644
--- a/toolkit/xre/CmdLineAndEnvUtils.h
+++ b/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"