Bug 1553982 Part 0 - Fix a few unified build issues that crop up when adding files in this directory. r=bytesized

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

Author: Molly Howell

toolkit/xre/nsAppStartupNotifier.cpp

@@ -3,14 +3,18 @@
  * 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/. */
 
+#include "nsAppStartupNotifier.h"
+#include "nsServiceManagerUtils.h"
 #include "nsComponentManagerUtils.h"
 #include "nsCOMPtr.h"
 #include "nsString.h"
 #include "nsICategoryManager.h"
+#include "nsIObserver.h"
 #include "nsXPCOM.h"
-#include "nsAppStartupNotifier.h"
 #include "mozilla/SimpleEnumerator.h"
 
+using namespace mozilla;
+
 /* static */
 nsresult nsAppStartupNotifier::NotifyObservers(const char* aCategory) {
   NS_ENSURE_ARG(aCategory);

toolkit/xre/nsAppStartupNotifier.h

@@ -7,6 +7,7 @@
 #define nsAppStartupNotifier_h___
 
 #include "nsIAppStartupNotifier.h"
+#include "nsError.h"
 
 class nsAppStartupNotifier final {
  public:

toolkit/xre/nsUpdateDriver.cpp

@@ -55,6 +55,10 @@
 using namespace mozilla;
 
 static LazyLogModule sUpdateLog("updatedriver");
+// Some other file in our unified batch might have defined LOG already.
+#ifdef LOG
+#  undef LOG
+#endif
 #define LOG(args) MOZ_LOG(sUpdateLog, mozilla::LogLevel::Debug, args)
 
 #ifdef XP_WIN