diff -r 000000000000 -r 6474c204b198 xpcom/build/Services.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xpcom/build/Services.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,64 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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/. */
+
+#include "mozilla/Services.h"
+#include "nsComponentManager.h"
+#include "nsIIOService.h"
+#include "nsIDirectoryService.h"
+#ifdef ACCESSIBILITY
+#include "nsIAccessibilityService.h"
+#endif
+#include "nsIChromeRegistry.h"
+#include "nsIObserverService.h"
+#include "nsNetCID.h"
+#include "nsObserverService.h"
+#include "nsXPCOMPrivate.h"
+#include "nsIStringBundle.h"
+#include "nsIToolkitChromeRegistry.h"
+#include "nsIXULOverlayProvider.h"
+#include "IHistory.h"
+#include "nsIXPConnect.h"
+#include "inIDOMUtils.h"
+
+using namespace mozilla;
+using namespace mozilla::services;
+
+/*
+ * Define a global variable and a getter for every service in ServiceList.
+ * eg. gIOService and GetIOService()
+ */
+#define MOZ_SERVICE(NAME, TYPE, CONTRACT_ID)                            \
+  static TYPE* g##NAME = nullptr;                                       \
+                                                                        \
+  already_AddRefed<TYPE>                                                \
+  mozilla::services::Get##NAME()                                        \
+  {                                                                     \
+    if (!g##NAME) {                                                     \
+      nsCOMPtr<TYPE> os = do_GetService(CONTRACT_ID);                   \
+      g##NAME = os.forget().take();                            \
+    }                                                                   \
+    nsRefPtr<TYPE> ret = g##NAME;                                       \
+    return ret.forget();                                                \
+  }                                                                     \
+  NS_EXPORT_(already_AddRefed<TYPE>)                                    \
+  mozilla::services::_external_Get##NAME()                              \
+  {                                                                     \
+    return Get##NAME();                                                 \
+  }
+
+#include "ServiceList.h"
+#undef MOZ_SERVICE
+
+/**
+ * Clears service cache, sets gXPCOMShuttingDown
+ */
+void 
+mozilla::services::Shutdown()
+{
+  gXPCOMShuttingDown = true;
+#define MOZ_SERVICE(NAME, TYPE, CONTRACT_ID) NS_IF_RELEASE(g##NAME);
+#include "ServiceList.h"
+#undef MOZ_SERVICE
+}