diff --git a/cores/esp8266/Esp.cpp b/cores/esp8266/Esp.cpp
index 37c301458b..a21dc4bc0f 100644
--- a/cores/esp8266/Esp.cpp
+++ b/cores/esp8266/Esp.cpp
@@ -200,7 +200,7 @@ void EspClass::restart(void)
 
 uint16_t EspClass::getVcc(void)
 {
-    InterruptLock lock;
+    esp8266::InterruptLock lock;
     (void)lock;
     return system_get_vdd33();
 }
diff --git a/cores/esp8266/Schedule.cpp b/cores/esp8266/Schedule.cpp
index 495caafd27..b4f85db6c6 100644
--- a/cores/esp8266/Schedule.cpp
+++ b/cores/esp8266/Schedule.cpp
@@ -56,7 +56,7 @@ bool schedule_function_us(std::function<bool(void)>&& fn, uint32_t repeat_us, sc
 {
     assert(repeat_us < decltype(scheduled_fn_t::callNow)::neverExpires); //~26800000us (26.8s)
 
-    InterruptLock lockAllInterruptsInThisScope;
+    esp8266::InterruptLock lockAllInterruptsInThisScope;
 
     scheduled_fn_t* item = get_fn_unsafe();
     if (!item)
@@ -104,7 +104,7 @@ void run_scheduled_functions(schedule_e policy)
 
     static bool fence = false;
     {
-        InterruptLock lockAllInterruptsInThisScope;
+        esp8266::InterruptLock lockAllInterruptsInThisScope;
         if (fence)
             // prevent recursive calls from yield()
             return;
@@ -136,7 +136,7 @@ void run_scheduled_functions(schedule_e policy)
             else
             {
                 // function removed from list
-                InterruptLock lockAllInterruptsInThisScope;
+                esp8266::InterruptLock lockAllInterruptsInThisScope;
 
                 if (sFirst == toCall)
                     sFirst = sFirst->mNext;
diff --git a/cores/esp8266/Updater.cpp b/cores/esp8266/Updater.cpp
index 42c308f181..44d43f5721 100644
--- a/cores/esp8266/Updater.cpp
+++ b/cores/esp8266/Updater.cpp
@@ -1,7 +1,6 @@
 #include "Updater.h"
 #include "Arduino.h"
 #include "eboot_command.h"
-#include <interrupts.h>
 #include <esp8266_peri.h>
 
 //#define DEBUG_UPDATER Serial
diff --git a/cores/esp8266/interrupts.h b/cores/esp8266/interrupts.h
index 1c7507f97a..0afcb161b7 100644
--- a/cores/esp8266/interrupts.h
+++ b/cores/esp8266/interrupts.h
@@ -16,6 +16,9 @@
 //}
 //
 
+namespace esp8266
+{
+
 class InterruptLock {
 public:
     InterruptLock() {
@@ -54,4 +57,6 @@ private: \
     }; \
 _AutoDisableIntr _autoDisableIntr 
 
+} // esp8266
+
 #endif //INTERRUPTS_H
diff --git a/libraries/SoftwareSerial b/libraries/SoftwareSerial
index 8e45d18d5a..c06b923bfe 160000
--- a/libraries/SoftwareSerial
+++ b/libraries/SoftwareSerial
@@ -1 +1 @@
-Subproject commit 8e45d18d5a1c9d9f6a9a6a9b4923690117117d45
+Subproject commit c06b923bfea3641b537c1131f2b5612e48ffe1be