diff --git a/examples/Threadsafe_SPI/Threadsafe_SPI.ino b/examples/Threadsafe_SPI/Threadsafe_SPI.ino
index ddd7b8c..30fd6e3 100644
--- a/examples/Threadsafe_SPI/Threadsafe_SPI.ino
+++ b/examples/Threadsafe_SPI/Threadsafe_SPI.ino
@@ -2,7 +2,7 @@
  * INCLUDE
  **************************************************************************************/
 
-#include <Arduino_ThreadsafeIO.h>
+#include <Arduino_Threads.h>
 
 /**************************************************************************************
  * CONSTANTS
diff --git a/examples/Threadsafe_SPI_BusIO/Threadsafe_SPI_BusIO.ino b/examples/Threadsafe_SPI_BusIO/Threadsafe_SPI_BusIO.ino
index 6d5f0c5..e1614d7 100644
--- a/examples/Threadsafe_SPI_BusIO/Threadsafe_SPI_BusIO.ino
+++ b/examples/Threadsafe_SPI_BusIO/Threadsafe_SPI_BusIO.ino
@@ -2,7 +2,7 @@
  * INCLUDE
  **************************************************************************************/
 
-#include <Arduino_ThreadsafeIO.h>
+#include <Arduino_Threads.h>
 
 /**************************************************************************************
  * CONSTANTS
diff --git a/examples/Threadsafe_Serial_GlobalPrefixSuffix/Threadsafe_Serial_GlobalPrefixSuffix.ino b/examples/Threadsafe_Serial_GlobalPrefixSuffix/Threadsafe_Serial_GlobalPrefixSuffix.ino
index a22fe04..94ac3bd 100644
--- a/examples/Threadsafe_Serial_GlobalPrefixSuffix/Threadsafe_Serial_GlobalPrefixSuffix.ino
+++ b/examples/Threadsafe_Serial_GlobalPrefixSuffix/Threadsafe_Serial_GlobalPrefixSuffix.ino
@@ -2,7 +2,7 @@
  * INCLUDE
  **************************************************************************************/
 
-#include <Arduino_ThreadsafeIO.h>
+#include <Arduino_Threads.h>
 
 /**************************************************************************************
  * CONSTANTS
diff --git a/examples/Threadsafe_Serial_ProtocolWrapping/Threadsafe_Serial_ProtocolWrapping.ino b/examples/Threadsafe_Serial_ProtocolWrapping/Threadsafe_Serial_ProtocolWrapping.ino
index e6d7549..af200e8 100644
--- a/examples/Threadsafe_Serial_ProtocolWrapping/Threadsafe_Serial_ProtocolWrapping.ino
+++ b/examples/Threadsafe_Serial_ProtocolWrapping/Threadsafe_Serial_ProtocolWrapping.ino
@@ -2,7 +2,7 @@
  * INCLUDE
  **************************************************************************************/
 
-#include <Arduino_ThreadsafeIO.h>
+#include <Arduino_Threads.h>
 
 /**************************************************************************************
  * CONSTANTS
diff --git a/examples/Threadsafe_Serial_Reader/Threadsafe_Serial_Reader.ino b/examples/Threadsafe_Serial_Reader/Threadsafe_Serial_Reader.ino
index 643675f..5fbf546 100644
--- a/examples/Threadsafe_Serial_Reader/Threadsafe_Serial_Reader.ino
+++ b/examples/Threadsafe_Serial_Reader/Threadsafe_Serial_Reader.ino
@@ -2,7 +2,7 @@
  * INCLUDE
  **************************************************************************************/
 
-#include <Arduino_ThreadsafeIO.h>
+#include <Arduino_Threads.h>
 
 /**************************************************************************************
  * CONSTANTS
diff --git a/examples/Threadsafe_Serial_Writer/Threadsafe_Serial_Writer.ino b/examples/Threadsafe_Serial_Writer/Threadsafe_Serial_Writer.ino
index 42ae35d..f5b47c2 100644
--- a/examples/Threadsafe_Serial_Writer/Threadsafe_Serial_Writer.ino
+++ b/examples/Threadsafe_Serial_Writer/Threadsafe_Serial_Writer.ino
@@ -2,7 +2,7 @@
  * INCLUDE
  **************************************************************************************/
 
-#include <Arduino_ThreadsafeIO.h>
+#include <Arduino_Threads.h>
 
 /**************************************************************************************
  * CONSTANTS
diff --git a/examples/Threadsafe_Wire/Threadsafe_Wire.ino b/examples/Threadsafe_Wire/Threadsafe_Wire.ino
index 0ebba48..6372534 100644
--- a/examples/Threadsafe_Wire/Threadsafe_Wire.ino
+++ b/examples/Threadsafe_Wire/Threadsafe_Wire.ino
@@ -2,7 +2,7 @@
  * INCLUDE
  **************************************************************************************/
 
-#include <Arduino_ThreadsafeIO.h>
+#include <Arduino_Threads.h>
 
 /**************************************************************************************
  * CONSTANTS
diff --git a/examples/Threadsafe_Wire_BusIO/Threadsafe_Wire_BusIO.ino b/examples/Threadsafe_Wire_BusIO/Threadsafe_Wire_BusIO.ino
index ae934a4..5fe3718 100644
--- a/examples/Threadsafe_Wire_BusIO/Threadsafe_Wire_BusIO.ino
+++ b/examples/Threadsafe_Wire_BusIO/Threadsafe_Wire_BusIO.ino
@@ -2,7 +2,7 @@
  * INCLUDE
  **************************************************************************************/
 
-#include <Arduino_ThreadsafeIO.h>
+#include <Arduino_Threads.h>
 
 /**************************************************************************************
  * CONSTANTS
diff --git a/src/Arduino_Threads.h b/src/Arduino_Threads.h
index ca9250f..cb522c5 100644
--- a/src/Arduino_Threads.h
+++ b/src/Arduino_Threads.h
@@ -30,6 +30,11 @@
 #include "Source.hpp"
 #include "Shared.hpp"
 
+#include "BusDevice.h"
+#include "spi/SpiBusDevice.h"
+#include "wire/WireBusDevice.h"
+#include "serial/SerialDispatcher.h"
+
 /**************************************************************************************
  * DEFINE
  **************************************************************************************/
diff --git a/src/Arduino_ThreadsafeIO.h b/src/Arduino_ThreadsafeIO.h
deleted file mode 100644
index 46bbb72..0000000
--- a/src/Arduino_ThreadsafeIO.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the Arduino_ThreadsafeIO library.
- * Copyright (c) 2021 Arduino SA.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef ARDUINO_THREADSAFE_IO_H_
-#define ARDUINO_THREADSAFE_IO_H_
-
-/**************************************************************************************
- * INCLUDE
- **************************************************************************************/
-
-#include "BusDevice.h"
-#include "spi/SpiBusDevice.h"
-#include "wire/WireBusDevice.h"
-#include "serial/SerialDispatcher.h"
-
-#endif /* ARDUINO_THREADSAFE_IO_H_ */