diff -r 000000000000 -r 6474c204b198 xpcom/build/Services.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xpcom/build/Services.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,44 @@
+/* -*- 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/. */
+
+#ifndef mozilla_Services_h
+#define mozilla_Services_h
+
+#include "nscore.h"
+#include "nsCOMPtr.h"
+
+#define MOZ_USE_NAMESPACE
+#define MOZ_SERVICE(NAME, TYPE, SERVICE_CID) class TYPE;
+
+#include "ServiceList.h"
+#undef MOZ_SERVICE
+#undef MOZ_USE_NAMESPACE
+
+namespace mozilla {
+namespace services {
+
+#ifdef MOZILLA_INTERNAL_API
+#define MOZ_SERVICE(NAME, TYPE, SERVICE_CID)                        \
+    already_AddRefed<TYPE> Get##NAME();                             \
+    NS_EXPORT_(already_AddRefed<TYPE>) _external_Get##NAME();
+
+#include "ServiceList.h"
+#undef MOZ_SERVICE
+#else
+#define MOZ_SERVICE(NAME, TYPE, SERVICE_CID)                        \
+    NS_IMPORT_(already_AddRefed<TYPE>) _external_Get##NAME();       \
+    inline already_AddRefed<TYPE> Get##NAME()                       \
+    {                                                               \
+        return _external_Get##NAME();                               \
+    }
+
+#include "ServiceList.h"
+#undef MOZ_SERVICE
+#endif
+
+} // namespace services
+} // namespace mozilla
+
+#endif