--- firefox-56.0/xpcom/base/nsISupportsImpl.h-orig	2017-09-14 23:16:02.000000000 +0300
+++ firefox-56.0/xpcom/base/nsISupportsImpl.h	2017-09-28 18:55:43.115085596 +0300
@@ -14,7 +14,7 @@
 #include "nsISupportsUtils.h"
 
 #if !defined(XPCOM_GLUE_AVOID_NSPR)
-#  include "prthread.h" /* needed for cargo-culting headers */
+#  include "nspr4/prthread.h" /* needed for cargo-culting headers */
 #endif
 
 #include "nsDebug.h"
@@ -50,7 +50,7 @@
 
 #ifdef MOZ_THREAD_SAFETY_OWNERSHIP_CHECKS_SUPPORTED
 
-#  include "prthread.h" /* needed for thread-safety checks */
+#  include "nspr4/prthread.h" /* needed for thread-safety checks */
 
 class nsAutoOwningThread {
  public:
--- firefox-56.0/xpcom/ds/nsCRT.h-orig	2017-09-28 20:02:28.000000000 +0300
+++ firefox-56.0/xpcom/ds/nsCRT.h	2017-09-28 20:03:25.099126089 +0300
@@ -8,7 +8,7 @@
 
 #include <stdlib.h>
 #include <ctype.h>
-#include "plstr.h"
+#include "nspr4/plstr.h"
 #include "nscore.h"
 #include "nsCRTGlue.h"
 
--- firefox-61.0/layout/base/nsPresContext.h.orig	2018-06-26 23:51:02.000000000 +0300
+++ firefox-61.0/layout/base/nsPresContext.h	2018-06-27 00:03:52.872210766 +0300
@@ -39,11 +39,11 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/AppUnits.h"
-#include "prclist.h"
+#include "nspr4/prclist.h"
 #include "nsThreadUtils.h"
 #include "nsIMessageManager.h"
 #include "Units.h"
-#include "prenv.h"
+#include "nspr4/prenv.h"
 #include "mozilla/StaticPresData.h"
 
 class nsBidi;
--- firefox-56.0/xpcom/threads/nsThreadUtils.h-orig	2017-09-14 23:16:02.000000000 +0300
+++ firefox-56.0/xpcom/threads/nsThreadUtils.h	2017-09-28 21:57:22.344002369 +0300
@@ -7,8 +7,8 @@
 #ifndef nsThreadUtils_h__
 #define nsThreadUtils_h__
 
-#include "prthread.h"
-#include "prinrval.h"
+#include "nspr4/prthread.h"
+#include "nspr4/prinrval.h"
 #include "MainThreadUtils.h"
 #include "nsICancelableRunnable.h"
 #include "nsIIdlePeriod.h"
--- firefox-56.0/dom/base/nsJSEnvironment.h-orig	2017-09-14 23:15:55.000000000 +0300
+++ firefox-56.0/dom/base/nsJSEnvironment.h	2017-09-28 22:43:02.748864043 +0300
@@ -10,7 +10,7 @@
 #include "nsIScriptGlobalObject.h"
 #include "nsCOMPtr.h"
 #include "nsIObserver.h"
-#include "prtime.h"
+#include "nspr4/prtime.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsIXPConnect.h"
 #include "nsIArray.h"
--- firefox-56.0/xpcom/threads/BlockingResourceBase.h-orig	2017-09-29 01:07:49.000000000 +0300
+++ firefox-56.0/xpcom/threads/BlockingResourceBase.h	2017-09-29 01:08:35.088579199 +0300
@@ -20,7 +20,7 @@
 // NB: Comment this out to enable callstack tracking.
 #  define MOZ_CALLSTACK_DISABLED
 
-#  include "prinit.h"
+#  include "nspr4/prinit.h"
 
 #  include "nsString.h"