diff --git a/api/IPAddress.cpp b/api/IPAddress.cpp
index 1d775906..4053be61 100644
--- a/api/IPAddress.cpp
+++ b/api/IPAddress.cpp
@@ -96,13 +96,18 @@ IPAddress::IPAddress(const char *address)
 
 String IPAddress::toString4() const
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     char szRet[16];
     sprintf(szRet,"%u.%u.%u.%u", _address.bytes[IPADDRESS_V4_BYTES_INDEX], _address.bytes[IPADDRESS_V4_BYTES_INDEX + 1], _address.bytes[IPADDRESS_V4_BYTES_INDEX + 2], _address.bytes[IPADDRESS_V4_BYTES_INDEX + 3]);
     return String(szRet);
+#pragma GCC diagnostic pop
 }
 
 String IPAddress::toString6() const
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     char szRet[40];
     sprintf(szRet,"%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x",
             _address.bytes[0], _address.bytes[1], _address.bytes[2], _address.bytes[3],
@@ -110,6 +115,7 @@ String IPAddress::toString6() const
             _address.bytes[8], _address.bytes[9], _address.bytes[10], _address.bytes[11],
             _address.bytes[12], _address.bytes[13], _address.bytes[14], _address.bytes[15]);
     return String(szRet);
+#pragma GCC diagnostic pop
 }
 
 String IPAddress::toString() const
diff --git a/api/deprecated-avr-comp/avr/dtostrf.c.impl b/api/deprecated-avr-comp/avr/dtostrf.c.impl
index 96987a8f..f410886c 100644
--- a/api/deprecated-avr-comp/avr/dtostrf.c.impl
+++ b/api/deprecated-avr-comp/avr/dtostrf.c.impl
@@ -29,9 +29,12 @@
 char *dtostrf (double val, signed char width, unsigned char prec, char *sout) {
   asm(".global _printf_float");
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
   char fmt[20];
   sprintf(fmt, "%%%d.%df", width, prec);
   sprintf(sout, fmt, val);
   return sout;
+#pragma GCC diagnostic pop
 }
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index a564faa4..f6bcc123 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -8,7 +8,7 @@ project(test-ArduinoCore-API)
 
 ##########################################################################
 
-include_directories(../api)
+include_directories(..)
 include_directories(include)
 include_directories(external/catch/v2.13.9/include)
 
diff --git a/test/include/MillisFake.h b/test/include/MillisFake.h
index da21049b..be078bd0 100644
--- a/test/include/MillisFake.h
+++ b/test/include/MillisFake.h
@@ -9,7 +9,7 @@
  * INCLUDE
  **************************************************************************************/
 
-#include <Common.h>
+#include <api/Common.h>
 
 /**************************************************************************************
  * FUNCTION DECLARATION
diff --git a/test/include/PrintMock.h b/test/include/PrintMock.h
index 87c83313..d41e78fa 100644
--- a/test/include/PrintMock.h
+++ b/test/include/PrintMock.h
@@ -11,7 +11,7 @@
 
 #include <string>
 
-#include <Print.h>
+#include <api/Print.h>
 
 /**************************************************************************************
  * CLASS DECLARATION
diff --git a/test/include/PrintableMock.h b/test/include/PrintableMock.h
index cfc00555..39121928 100644
--- a/test/include/PrintableMock.h
+++ b/test/include/PrintableMock.h
@@ -11,7 +11,7 @@
 
 #include <string>
 
-#include <Printable.h>
+#include <api/Printable.h>
 
 /**************************************************************************************
  * CLASS DECLARATION
diff --git a/test/include/StreamMock.h b/test/include/StreamMock.h
index 91eb3c26..a7d9da1a 100644
--- a/test/include/StreamMock.h
+++ b/test/include/StreamMock.h
@@ -11,7 +11,7 @@
 
 #include <deque>
 
-#include <Stream.h>
+#include <api/Stream.h>
 
 /**************************************************************************************
  * CLASS DECLARATION
diff --git a/test/src/CanMsg/test_CanExtendedId.cpp b/test/src/CanMsg/test_CanExtendedId.cpp
index 72f8ece5..a812f08b 100644
--- a/test/src/CanMsg/test_CanExtendedId.cpp
+++ b/test/src/CanMsg/test_CanExtendedId.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <CanMsg.h>
+#include <api/CanMsg.h>
 
 /**************************************************************************************
  * NAMESPACE
diff --git a/test/src/CanMsg/test_CanMsg.cpp b/test/src/CanMsg/test_CanMsg.cpp
index 14b8a76a..03704623 100644
--- a/test/src/CanMsg/test_CanMsg.cpp
+++ b/test/src/CanMsg/test_CanMsg.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <CanMsg.h>
+#include <api/CanMsg.h>
 
 /**************************************************************************************
  * NAMESPACE
diff --git a/test/src/CanMsg/test_CanMsg_CopyCtor.cpp b/test/src/CanMsg/test_CanMsg_CopyCtor.cpp
index b303369a..ccf62931 100644
--- a/test/src/CanMsg/test_CanMsg_CopyCtor.cpp
+++ b/test/src/CanMsg/test_CanMsg_CopyCtor.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <CanMsg.h>
+#include <api/CanMsg.h>
 
 /**************************************************************************************
  * NAMESPACE
diff --git a/test/src/CanMsg/test_CanStandardId.cpp b/test/src/CanMsg/test_CanStandardId.cpp
index 02496241..81d2301d 100644
--- a/test/src/CanMsg/test_CanStandardId.cpp
+++ b/test/src/CanMsg/test_CanStandardId.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <CanMsg.h>
+#include <api/CanMsg.h>
 
 /**************************************************************************************
  * NAMESPACE
diff --git a/test/src/CanMsg/test_isExtendedId.cpp b/test/src/CanMsg/test_isExtendedId.cpp
index 3a12ab8f..242866e9 100644
--- a/test/src/CanMsg/test_isExtendedId.cpp
+++ b/test/src/CanMsg/test_isExtendedId.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <CanMsg.h>
+#include <api/CanMsg.h>
 
 /**************************************************************************************
  * NAMESPACE
diff --git a/test/src/CanMsg/test_isStandardId.cpp b/test/src/CanMsg/test_isStandardId.cpp
index 718d2535..a73bf7c1 100644
--- a/test/src/CanMsg/test_isStandardId.cpp
+++ b/test/src/CanMsg/test_isStandardId.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <CanMsg.h>
+#include <api/CanMsg.h>
 
 /**************************************************************************************
  * NAMESPACE
diff --git a/test/src/CanMsg/test_operator_assignment.cpp b/test/src/CanMsg/test_operator_assignment.cpp
index ae2d2ecb..0dd35543 100644
--- a/test/src/CanMsg/test_operator_assignment.cpp
+++ b/test/src/CanMsg/test_operator_assignment.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <CanMsg.h>
+#include <api/CanMsg.h>
 
 /**************************************************************************************
  * NAMESPACE
diff --git a/test/src/CanMsg/test_printTo.cpp b/test/src/CanMsg/test_printTo.cpp
index dd1fb4b8..bf532c81 100644
--- a/test/src/CanMsg/test_printTo.cpp
+++ b/test/src/CanMsg/test_printTo.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <CanMsg.h>
+#include <api/CanMsg.h>
 #include <PrintMock.h>
 
 /**************************************************************************************
diff --git a/test/src/CanMsgRingbuffer/test_available.cpp b/test/src/CanMsgRingbuffer/test_available.cpp
index ba857c4b..684eaeec 100644
--- a/test/src/CanMsgRingbuffer/test_available.cpp
+++ b/test/src/CanMsgRingbuffer/test_available.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <CanMsgRingbuffer.h>
+#include <api/CanMsgRingbuffer.h>
 
 /**************************************************************************************
  * TEST CODE
diff --git a/test/src/Common/test_makeWord.cpp b/test/src/Common/test_makeWord.cpp
index 2e0a29dc..dcb3ea33 100644
--- a/test/src/Common/test_makeWord.cpp
+++ b/test/src/Common/test_makeWord.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <Common.h>
+#include <api/Common.h>
 
 /**************************************************************************************
  * TEST CODE
diff --git a/test/src/Common/test_map.cpp b/test/src/Common/test_map.cpp
index aef3e72a..59441cac 100644
--- a/test/src/Common/test_map.cpp
+++ b/test/src/Common/test_map.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <Common.h>
+#include <api/Common.h>
 
 /**************************************************************************************
  * TEST CODE
diff --git a/test/src/Common/test_max.cpp b/test/src/Common/test_max.cpp
index 6612cc95..ccb5e5e1 100644
--- a/test/src/Common/test_max.cpp
+++ b/test/src/Common/test_max.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <Common.h>
+#include <api/Common.h>
 
 /**************************************************************************************
  * TEST CODE
@@ -53,7 +53,7 @@ TEST_CASE ("Calling 'max(a,b)' with type(a) != type(b)", "[max-04]")
   {
     uint32_t const a = 32;
     uint64_t const b = 10;
-    REQUIRE(typeid(max(a,b)) == typeid(unsigned long));
+    REQUIRE(typeid(max(a,b)) == typeid(uint64_t));
   }
   WHEN("type(A) = int8_t, type(b) = int16_t")
   {
@@ -71,6 +71,6 @@ TEST_CASE ("Calling 'max(a,b)' with type(a) != type(b)", "[max-04]")
   {
     int32_t const a = -32;
     int64_t const b = -10;
-    REQUIRE(typeid(max(a,b)) == typeid(long));
+    REQUIRE(typeid(max(a,b)) == typeid(int64_t));
   }
 }
diff --git a/test/src/Common/test_min.cpp b/test/src/Common/test_min.cpp
index 2298dc6c..750f41ae 100644
--- a/test/src/Common/test_min.cpp
+++ b/test/src/Common/test_min.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <Common.h>
+#include <api/Common.h>
 
 /**************************************************************************************
  * TEST CODE
@@ -53,7 +53,7 @@ TEST_CASE ("Calling 'min(a,b)' with type(a) != type(b)", "[min-04]")
   {
     uint32_t const a = 32;
     uint64_t const b = 10;
-    REQUIRE(typeid(min(a,b)) == typeid(unsigned long));
+    REQUIRE(typeid(min(a,b)) == typeid(uint64_t));
   }
   WHEN("type(A) = int8_t, type(b) = int16_t")
   {
@@ -71,6 +71,6 @@ TEST_CASE ("Calling 'min(a,b)' with type(a) != type(b)", "[min-04]")
   {
     int32_t const a = -32;
     int64_t const b = -10;
-    REQUIRE(typeid(min(a,b)) == typeid(long));
+    REQUIRE(typeid(min(a,b)) == typeid(int64_t));
   }
 }
diff --git a/test/src/IPAddress/test_IPAddress.cpp b/test/src/IPAddress/test_IPAddress.cpp
index d12db0f3..6b66e118 100644
--- a/test/src/IPAddress/test_IPAddress.cpp
+++ b/test/src/IPAddress/test_IPAddress.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <IPAddress.h>
+#include <api/IPAddress.h>
 
 /**************************************************************************************
  * TEST CODE
diff --git a/test/src/IPAddress/test_IPAddress6.cpp b/test/src/IPAddress/test_IPAddress6.cpp
index a6941b71..3a8a5315 100644
--- a/test/src/IPAddress/test_IPAddress6.cpp
+++ b/test/src/IPAddress/test_IPAddress6.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <IPAddress.h>
+#include <api/IPAddress.h>
 
 /**************************************************************************************
  * TEST CODE
diff --git a/test/src/IPAddress/test_fromString.cpp b/test/src/IPAddress/test_fromString.cpp
index 2c918052..d058b529 100644
--- a/test/src/IPAddress/test_fromString.cpp
+++ b/test/src/IPAddress/test_fromString.cpp
@@ -8,8 +8,8 @@
 
 #include <catch.hpp>
 
-#include <String.h>
-#include <IPAddress.h>
+#include <api/String.h>
+#include <api/IPAddress.h>
 
 /**************************************************************************************
  * TEST CODE
diff --git a/test/src/IPAddress/test_fromString6.cpp b/test/src/IPAddress/test_fromString6.cpp
index a0f09c73..deb54458 100644
--- a/test/src/IPAddress/test_fromString6.cpp
+++ b/test/src/IPAddress/test_fromString6.cpp
@@ -8,8 +8,8 @@
 
 #include <catch.hpp>
 
-#include <String.h>
-#include <IPAddress.h>
+#include <api/String.h>
+#include <api/IPAddress.h>
 
 /**************************************************************************************
  * TEST CODE
diff --git a/test/src/IPAddress/test_operator_assignment.cpp b/test/src/IPAddress/test_operator_assignment.cpp
index e9fc8691..fdf641d4 100644
--- a/test/src/IPAddress/test_operator_assignment.cpp
+++ b/test/src/IPAddress/test_operator_assignment.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <IPAddress.h>
+#include <api/IPAddress.h>
 
 /**************************************************************************************
  * TEST CODE
diff --git a/test/src/IPAddress/test_operator_comparison.cpp b/test/src/IPAddress/test_operator_comparison.cpp
index c3283b71..3978c8e2 100644
--- a/test/src/IPAddress/test_operator_comparison.cpp
+++ b/test/src/IPAddress/test_operator_comparison.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <IPAddress.h>
+#include <api/IPAddress.h>
 
 /**************************************************************************************
  * TEST CODE
diff --git a/test/src/IPAddress/test_operator_comparison6.cpp b/test/src/IPAddress/test_operator_comparison6.cpp
index a5e1b87c..da03a0b3 100644
--- a/test/src/IPAddress/test_operator_comparison6.cpp
+++ b/test/src/IPAddress/test_operator_comparison6.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <IPAddress.h>
+#include <api/IPAddress.h>
 
 /**************************************************************************************
  * TEST CODE
diff --git a/test/src/IPAddress/test_operator_parentheses.cpp b/test/src/IPAddress/test_operator_parentheses.cpp
index 27fce3a5..c1c2e375 100644
--- a/test/src/IPAddress/test_operator_parentheses.cpp
+++ b/test/src/IPAddress/test_operator_parentheses.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <IPAddress.h>
+#include <api/IPAddress.h>
 
 /**************************************************************************************
  * TEST CODE
diff --git a/test/src/IPAddress/test_operator_parentheses6.cpp b/test/src/IPAddress/test_operator_parentheses6.cpp
index 5b4740c8..b4575f4e 100644
--- a/test/src/IPAddress/test_operator_parentheses6.cpp
+++ b/test/src/IPAddress/test_operator_parentheses6.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <IPAddress.h>
+#include <api/IPAddress.h>
 
 /**************************************************************************************
  * TEST CODE
diff --git a/test/src/IPAddress/test_printTo.cpp b/test/src/IPAddress/test_printTo.cpp
index 05e43fa5..a0ed7c16 100644
--- a/test/src/IPAddress/test_printTo.cpp
+++ b/test/src/IPAddress/test_printTo.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <IPAddress.h>
+#include <api/IPAddress.h>
 #include <PrintMock.h>
 
 /**************************************************************************************
diff --git a/test/src/IPAddress/test_printTo6.cpp b/test/src/IPAddress/test_printTo6.cpp
index 621008af..7d924b63 100644
--- a/test/src/IPAddress/test_printTo6.cpp
+++ b/test/src/IPAddress/test_printTo6.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <IPAddress.h>
+#include <api/IPAddress.h>
 #include <PrintMock.h>
 
 /**************************************************************************************
diff --git a/test/src/IPAddress/test_toString.cpp b/test/src/IPAddress/test_toString.cpp
index a5a5f004..f36ae549 100644
--- a/test/src/IPAddress/test_toString.cpp
+++ b/test/src/IPAddress/test_toString.cpp
@@ -8,8 +8,8 @@
 
 #include <catch.hpp>
 
-#include <String.h>
-#include <IPAddress.h>
+#include <api/String.h>
+#include <api/IPAddress.h>
 
 /**************************************************************************************
  * TEST CODE
diff --git a/test/src/Print/test_availableForWrite.cpp b/test/src/Print/test_availableForWrite.cpp
index 47f599cf..c5dfbcda 100644
--- a/test/src/Print/test_availableForWrite.cpp
+++ b/test/src/Print/test_availableForWrite.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <Print.h>
+#include <api/Print.h>
 
 #include <PrintMock.h>
 
diff --git a/test/src/Print/test_clearWriteError.cpp b/test/src/Print/test_clearWriteError.cpp
index 295f4984..720a1210 100644
--- a/test/src/Print/test_clearWriteError.cpp
+++ b/test/src/Print/test_clearWriteError.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <Print.h>
+#include <api/Print.h>
 
 #include <PrintMock.h>
 
diff --git a/test/src/Print/test_getWriteError.cpp b/test/src/Print/test_getWriteError.cpp
index ef2b1435..3b616411 100644
--- a/test/src/Print/test_getWriteError.cpp
+++ b/test/src/Print/test_getWriteError.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <Print.h>
+#include <api/Print.h>
 
 #include <PrintMock.h>
 
diff --git a/test/src/Print/test_print.cpp b/test/src/Print/test_print.cpp
index ac731a89..2598b7f7 100644
--- a/test/src/Print/test_print.cpp
+++ b/test/src/Print/test_print.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <Print.h>
+#include <api/Print.h>
 
 #include <PrintMock.h>
 #include <PrintableMock.h>
diff --git a/test/src/Print/test_println.cpp b/test/src/Print/test_println.cpp
index 977ed532..2d2d7306 100644
--- a/test/src/Print/test_println.cpp
+++ b/test/src/Print/test_println.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <Print.h>
+#include <api/Print.h>
 
 #include <PrintMock.h>
 #include <PrintableMock.h>
diff --git a/test/src/Ringbuffer/test_available.cpp b/test/src/Ringbuffer/test_available.cpp
index 3a79e5bc..75b86a7f 100644
--- a/test/src/Ringbuffer/test_available.cpp
+++ b/test/src/Ringbuffer/test_available.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <RingBuffer.h>
+#include <api/RingBuffer.h>
 
 /**************************************************************************************
  * TEST CODE
diff --git a/test/src/Ringbuffer/test_availableForStore.cpp b/test/src/Ringbuffer/test_availableForStore.cpp
index 7d73d8da..5b8415f6 100644
--- a/test/src/Ringbuffer/test_availableForStore.cpp
+++ b/test/src/Ringbuffer/test_availableForStore.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <RingBuffer.h>
+#include <api/RingBuffer.h>
 
 /**************************************************************************************
  * TEST CODE
diff --git a/test/src/Ringbuffer/test_clear.cpp b/test/src/Ringbuffer/test_clear.cpp
index 165a5bbb..93da03a2 100644
--- a/test/src/Ringbuffer/test_clear.cpp
+++ b/test/src/Ringbuffer/test_clear.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <RingBuffer.h>
+#include <api/RingBuffer.h>
 
 /**************************************************************************************
  * TEST CODE
diff --git a/test/src/Ringbuffer/test_isFull.cpp b/test/src/Ringbuffer/test_isFull.cpp
index 8d9c4aaa..c575981e 100644
--- a/test/src/Ringbuffer/test_isFull.cpp
+++ b/test/src/Ringbuffer/test_isFull.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <RingBuffer.h>
+#include <api/RingBuffer.h>
 
 /**************************************************************************************
  * TEST CODE
diff --git a/test/src/Ringbuffer/test_peek.cpp b/test/src/Ringbuffer/test_peek.cpp
index 3811dd39..9efe28ea 100644
--- a/test/src/Ringbuffer/test_peek.cpp
+++ b/test/src/Ringbuffer/test_peek.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <RingBuffer.h>
+#include <api/RingBuffer.h>
 
 /**************************************************************************************
  * TEST CODE
diff --git a/test/src/Ringbuffer/test_read_char.cpp b/test/src/Ringbuffer/test_read_char.cpp
index de754275..babc27df 100644
--- a/test/src/Ringbuffer/test_read_char.cpp
+++ b/test/src/Ringbuffer/test_read_char.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <RingBuffer.h>
+#include <api/RingBuffer.h>
 
 /**************************************************************************************
  * TEST CODE
diff --git a/test/src/Ringbuffer/test_store_char.cpp b/test/src/Ringbuffer/test_store_char.cpp
index 6e127b28..0becdc0f 100644
--- a/test/src/Ringbuffer/test_store_char.cpp
+++ b/test/src/Ringbuffer/test_store_char.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <RingBuffer.h>
+#include <api/RingBuffer.h>
 
 /**************************************************************************************
  * TEST CODE
diff --git a/test/src/String/StringPrinter.h b/test/src/String/StringPrinter.h
index f338a902..1ddee147 100644
--- a/test/src/String/StringPrinter.h
+++ b/test/src/String/StringPrinter.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <catch.hpp>
-#include <String.h>
+#include <api/String.h>
 
 namespace Catch {
   /**
diff --git a/test/src/String/test_String.cpp b/test/src/String/test_String.cpp
index 461f2d08..6d1b8152 100644
--- a/test/src/String/test_String.cpp
+++ b/test/src/String/test_String.cpp
@@ -10,7 +10,7 @@
 
 #include <catch.hpp>
 
-#include <String.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/test/src/String/test_characterAccessFunc.cpp b/test/src/String/test_characterAccessFunc.cpp
index d0f02383..49d257af 100644
--- a/test/src/String/test_characterAccessFunc.cpp
+++ b/test/src/String/test_characterAccessFunc.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <String.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/test/src/String/test_compareTo.cpp b/test/src/String/test_compareTo.cpp
index 714d169a..74a3da7b 100644
--- a/test/src/String/test_compareTo.cpp
+++ b/test/src/String/test_compareTo.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <String.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/test/src/String/test_comparisonFunc.cpp b/test/src/String/test_comparisonFunc.cpp
index 89a7f3be..3b49bacc 100644
--- a/test/src/String/test_comparisonFunc.cpp
+++ b/test/src/String/test_comparisonFunc.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <String.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/test/src/String/test_concat.cpp b/test/src/String/test_concat.cpp
index b7390b64..ef6c6fa1 100644
--- a/test/src/String/test_concat.cpp
+++ b/test/src/String/test_concat.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <String.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/test/src/String/test_indexOf.cpp b/test/src/String/test_indexOf.cpp
index bcaf65ef..9f32a07e 100644
--- a/test/src/String/test_indexOf.cpp
+++ b/test/src/String/test_indexOf.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <String.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/test/src/String/test_lastIndexOf.cpp b/test/src/String/test_lastIndexOf.cpp
index 2ae95f54..7f776fa6 100644
--- a/test/src/String/test_lastIndexOf.cpp
+++ b/test/src/String/test_lastIndexOf.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <String.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/test/src/String/test_length.cpp b/test/src/String/test_length.cpp
index 3b47faed..fae358fa 100644
--- a/test/src/String/test_length.cpp
+++ b/test/src/String/test_length.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <String.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/test/src/String/test_move.cpp b/test/src/String/test_move.cpp
index d37630c4..a2529b50 100644
--- a/test/src/String/test_move.cpp
+++ b/test/src/String/test_move.cpp
@@ -1,6 +1,6 @@
 #include <catch.hpp>
 
-#include <String.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
@@ -31,7 +31,14 @@ TEST_CASE("Testing String move assignment", "[String-move-02]")
 
 TEST_CASE("Testing String move self assignment", "[String-move-03]")
 {
+#if (defined(GCC_VERSION) && GCC_VERSION >= 13) || (defined(__clang_major__) && __clang_major__ >= 14)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wself-move"
+#endif
     arduino::String a("src");
     a = std::move(a);
     REQUIRE(a == "src");
+#if defined(GCC_VERSION) && GCC_VERSION >= 13
+#pragma GCC diagnostic pop
+#endif
 }
diff --git a/test/src/String/test_operators.cpp b/test/src/String/test_operators.cpp
index 67cb39be..5a3b677c 100644
--- a/test/src/String/test_operators.cpp
+++ b/test/src/String/test_operators.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <String.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/test/src/String/test_remove.cpp b/test/src/String/test_remove.cpp
index e8c19536..17b8dabb 100644
--- a/test/src/String/test_remove.cpp
+++ b/test/src/String/test_remove.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <String.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/test/src/String/test_replace.cpp b/test/src/String/test_replace.cpp
index d4f28bf5..cfcaead0 100644
--- a/test/src/String/test_replace.cpp
+++ b/test/src/String/test_replace.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <String.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/test/src/String/test_substring.cpp b/test/src/String/test_substring.cpp
index 8fa43086..bb05d439 100644
--- a/test/src/String/test_substring.cpp
+++ b/test/src/String/test_substring.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <String.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/test/src/String/test_toDouble.cpp b/test/src/String/test_toDouble.cpp
index 246f25d4..af6960e9 100644
--- a/test/src/String/test_toDouble.cpp
+++ b/test/src/String/test_toDouble.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <String.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/test/src/String/test_toFloat.cpp b/test/src/String/test_toFloat.cpp
index afef02c5..75cf94b2 100644
--- a/test/src/String/test_toFloat.cpp
+++ b/test/src/String/test_toFloat.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <String.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/test/src/String/test_toInt.cpp b/test/src/String/test_toInt.cpp
index 43397b76..060fdd27 100644
--- a/test/src/String/test_toInt.cpp
+++ b/test/src/String/test_toInt.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <String.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/test/src/String/test_toLowerCase.cpp b/test/src/String/test_toLowerCase.cpp
index 1ff81e91..9f6f7c9d 100644
--- a/test/src/String/test_toLowerCase.cpp
+++ b/test/src/String/test_toLowerCase.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <String.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/test/src/String/test_toUpperCase.cpp b/test/src/String/test_toUpperCase.cpp
index b8ae6aaf..1bcf93fb 100644
--- a/test/src/String/test_toUpperCase.cpp
+++ b/test/src/String/test_toUpperCase.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <String.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/test/src/String/test_trim.cpp b/test/src/String/test_trim.cpp
index 539d6568..c5168ecd 100644
--- a/test/src/String/test_trim.cpp
+++ b/test/src/String/test_trim.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <String.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/test/src/WCharacter/test_isAscii.cpp b/test/src/WCharacter/test_isAscii.cpp
index 8c2763c4..c6792719 100644
--- a/test/src/WCharacter/test_isAscii.cpp
+++ b/test/src/WCharacter/test_isAscii.cpp
@@ -10,7 +10,7 @@
 
 #include <vector>
 
-#include <WCharacter.h>
+#include <api/WCharacter.h>
 
 /**************************************************************************************
  * CONSTANTS
diff --git a/test/src/WCharacter/test_isControl.cpp b/test/src/WCharacter/test_isControl.cpp
index 157c8bc8..adb41ccf 100644
--- a/test/src/WCharacter/test_isControl.cpp
+++ b/test/src/WCharacter/test_isControl.cpp
@@ -10,7 +10,7 @@
 
 #include <vector>
 
-#include <WCharacter.h>
+#include <api/WCharacter.h>
 
 /**************************************************************************************
  * CONSTANTS
diff --git a/test/src/WCharacter/test_isDigit.cpp b/test/src/WCharacter/test_isDigit.cpp
index 58b1808a..146a863b 100644
--- a/test/src/WCharacter/test_isDigit.cpp
+++ b/test/src/WCharacter/test_isDigit.cpp
@@ -10,7 +10,7 @@
 
 #include <vector>
 
-#include <WCharacter.h>
+#include <api/WCharacter.h>
 
 /**************************************************************************************
  * CONSTANTS
diff --git a/test/src/WCharacter/test_isHexadecimalDigit.cpp b/test/src/WCharacter/test_isHexadecimalDigit.cpp
index 0eba5846..486a3e44 100644
--- a/test/src/WCharacter/test_isHexadecimalDigit.cpp
+++ b/test/src/WCharacter/test_isHexadecimalDigit.cpp
@@ -10,7 +10,7 @@
 
 #include <vector>
 
-#include <WCharacter.h>
+#include <api/WCharacter.h>
 
 /**************************************************************************************
  * CONSTANTS
diff --git a/test/src/WCharacter/test_isLowerCase.cpp b/test/src/WCharacter/test_isLowerCase.cpp
index 79e1dbc4..9b05b458 100644
--- a/test/src/WCharacter/test_isLowerCase.cpp
+++ b/test/src/WCharacter/test_isLowerCase.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <WCharacter.h>
+#include <api/WCharacter.h>
 
 /**************************************************************************************
  * TEST CODE
diff --git a/test/src/WCharacter/test_isPunct.cpp b/test/src/WCharacter/test_isPunct.cpp
index 5f6875d1..7e6b49dc 100644
--- a/test/src/WCharacter/test_isPunct.cpp
+++ b/test/src/WCharacter/test_isPunct.cpp
@@ -10,7 +10,7 @@
 
 #include <vector>
 
-#include <WCharacter.h>
+#include <api/WCharacter.h>
 
 /**************************************************************************************
  * CONSTANTS
diff --git a/test/src/WCharacter/test_isSpace.cpp b/test/src/WCharacter/test_isSpace.cpp
index c96557d6..29ed8107 100644
--- a/test/src/WCharacter/test_isSpace.cpp
+++ b/test/src/WCharacter/test_isSpace.cpp
@@ -10,7 +10,7 @@
 
 #include <vector>
 
-#include <WCharacter.h>
+#include <api/WCharacter.h>
 
 /**************************************************************************************
  * CONSTANTS
diff --git a/test/src/WCharacter/test_isUpperCase.cpp b/test/src/WCharacter/test_isUpperCase.cpp
index e21e33db..598bb55b 100644
--- a/test/src/WCharacter/test_isUpperCase.cpp
+++ b/test/src/WCharacter/test_isUpperCase.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <WCharacter.h>
+#include <api/WCharacter.h>
 
 /**************************************************************************************
  * TEST CODE
diff --git a/test/src/WCharacter/test_isWhitespace.cpp b/test/src/WCharacter/test_isWhitespace.cpp
index 6eb3f7a6..483c6477 100644
--- a/test/src/WCharacter/test_isWhitespace.cpp
+++ b/test/src/WCharacter/test_isWhitespace.cpp
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <WCharacter.h>
+#include <api/WCharacter.h>
 
 /**************************************************************************************
  * TEST CODE
diff --git a/test/src/WCharacter/test_toAscii.cpp b/test/src/WCharacter/test_toAscii.cpp
index 10b54625..96a2cfb9 100644
--- a/test/src/WCharacter/test_toAscii.cpp
+++ b/test/src/WCharacter/test_toAscii.cpp
@@ -10,7 +10,7 @@
 
 #include <vector>
 
-#include <WCharacter.h>
+#include <api/WCharacter.h>
 
 /**************************************************************************************
  * CONSTANTS
diff --git a/test/src/dtostrf.cpp b/test/src/dtostrf.cpp
index 0635b492..0700debb 100644
--- a/test/src/dtostrf.cpp
+++ b/test/src/dtostrf.cpp
@@ -6,7 +6,7 @@
  * INCLUDE
  **************************************************************************************/
 
-#include <deprecated-avr-comp/avr/dtostrf.h>
+#include <api/deprecated-avr-comp/avr/dtostrf.h>
 
 #include <stdlib.h>
 
@@ -18,7 +18,7 @@
 extern "C" {
 #endif
 
-#include <deprecated-avr-comp/avr/dtostrf.c.impl>
+#include <api/deprecated-avr-comp/avr/dtostrf.c.impl>
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/test/src/itoa.cpp b/test/src/itoa.cpp
index 84d640c3..292d0ef0 100644
--- a/test/src/itoa.cpp
+++ b/test/src/itoa.cpp
@@ -6,7 +6,7 @@
  * INCLUDE
  **************************************************************************************/
 
-#include <itoa.h>
+#include <api/itoa.h>
 
 #include <string>
 #include <stdexcept>
@@ -27,24 +27,36 @@ std::string radixToFmtString(int const radix)
 
 char * itoa(int value, char * str, int radix)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
   sprintf(str, radixToFmtString(radix).c_str(), value);
+#pragma GCC diagnostic pop
   return str;
 }
 
 char * ltoa(long value, char * str, int radix)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
   sprintf(str, radixToFmtString(radix).c_str(), value);
+#pragma GCC diagnostic pop
   return str;
 }
 
 char * utoa(unsigned value, char *str, int radix)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
   sprintf(str, radixToFmtString(radix).c_str(), value);
+#pragma GCC diagnostic pop
   return str;
 }
 
 char * ultoa(unsigned long value, char * str, int radix)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
   sprintf(str, radixToFmtString(radix).c_str(), value);
+#pragma GCC diagnostic pop
   return str;
 }