CMSIS-DSP: Updated tests to use the new headers.
diff --git a/CMSIS/DSP/Testing/CMakeLists.txt b/CMSIS/DSP/Testing/CMakeLists.txt
index 27ccc75..2d85ab7 100644
--- a/CMSIS/DSP/Testing/CMakeLists.txt
+++ b/CMSIS/DSP/Testing/CMakeLists.txt
@@ -110,6 +110,12 @@
 add_library(TestingLib STATIC)
 add_library(FrameworkLib STATIC)
 
+if (DISABLEFLOAT16)
+    target_compile_definitions(TestingLib PRIVATE DISABLEFLOAT16) 
+    target_compile_definitions(FrameworkLib PRIVATE DISABLEFLOAT16) 
+endif()
+
+
 if (BENCHMARK)
 
 set(STANDARDBENCH ON)
diff --git a/CMSIS/DSP/Testing/FrameworkInclude/Error.h b/CMSIS/DSP/Testing/FrameworkInclude/Error.h
index 1e25aec..eddb6e4 100644
--- a/CMSIS/DSP/Testing/FrameworkInclude/Error.h
+++ b/CMSIS/DSP/Testing/FrameworkInclude/Error.h
@@ -27,8 +27,8 @@
  */
 #ifndef _ASSERT_H_
 #define _ASSERT_H_
-#include "arm_math.h"
-#include "arm_math_f16.h"
+#include "arm_math_types.h"
+#include "arm_math_types_f16.h"
 #include <exception>
 #include "Test.h"
 #include "Pattern.h"
diff --git a/CMSIS/DSP/Testing/FrameworkInclude/FPGA.h b/CMSIS/DSP/Testing/FrameworkInclude/FPGA.h
index 9f885d9..1ba68c9 100644
--- a/CMSIS/DSP/Testing/FrameworkInclude/FPGA.h
+++ b/CMSIS/DSP/Testing/FrameworkInclude/FPGA.h
@@ -29,8 +29,8 @@
 #define _FPGA_H_
 #include <string>
 #include <cstdlib>
-#include "arm_math.h"
-#include "arm_math_f16.h"
+#include "arm_math_types.h"
+#include "arm_math_types_f16.h"
 
 namespace Client
 {
diff --git a/CMSIS/DSP/Testing/FrameworkInclude/Pattern.h b/CMSIS/DSP/Testing/FrameworkInclude/Pattern.h
index 5bd076a..d083e3d 100644
--- a/CMSIS/DSP/Testing/FrameworkInclude/Pattern.h
+++ b/CMSIS/DSP/Testing/FrameworkInclude/Pattern.h
@@ -30,8 +30,8 @@
 
 #include "Test.h"
 #include "Pattern.h"
-#include "arm_math.h"
-#include "arm_math_f16.h"
+#include "arm_math_types.h"
+#include "arm_math_types_f16.h"
 
 namespace Client {
 
diff --git a/CMSIS/DSP/Testing/FrameworkInclude/Semihosting.h b/CMSIS/DSP/Testing/FrameworkInclude/Semihosting.h
index c1e4261..91759df 100644
--- a/CMSIS/DSP/Testing/FrameworkInclude/Semihosting.h
+++ b/CMSIS/DSP/Testing/FrameworkInclude/Semihosting.h
@@ -30,8 +30,8 @@
 #include <string>
 #include <memory>
 #include <cstdio>
-#include "arm_math.h"
-#include "arm_math_f16.h"
+#include "arm_math_types.h"
+#include "arm_math_types_f16.h"
 
 
 namespace Client
diff --git a/CMSIS/DSP/Testing/FrameworkInclude/Test.h b/CMSIS/DSP/Testing/FrameworkInclude/Test.h
index 0df8f21..55317a0 100644
--- a/CMSIS/DSP/Testing/FrameworkInclude/Test.h
+++ b/CMSIS/DSP/Testing/FrameworkInclude/Test.h
@@ -31,8 +31,8 @@
 #include <cstdlib>
 #include <vector>
 #include <cstdio>
-#include "arm_math.h"
-#include "arm_math_f16.h"
+#include "arm_math_types.h"
+#include "arm_math_types_f16.h"
 
 
 // This special value means no limit on the number of samples.
diff --git a/CMSIS/DSP/Testing/FrameworkInclude/Timing.h b/CMSIS/DSP/Testing/FrameworkInclude/Timing.h
index 9036934..f8a0c18 100644
--- a/CMSIS/DSP/Testing/FrameworkInclude/Timing.h
+++ b/CMSIS/DSP/Testing/FrameworkInclude/Timing.h
@@ -2,8 +2,8 @@
 #define _TIMING_H_
 
 #include "Test.h"
-#include "arm_math.h"
-#include "arm_math_f16.h"
+#include "arm_math_types.h"
+#include "arm_math_types_f16.h"
 
 void initCycleMeasurement();
 void cycleMeasurementStart();
diff --git a/CMSIS/DSP/Testing/FrameworkSource/Error.cpp b/CMSIS/DSP/Testing/FrameworkSource/Error.cpp
index a97b8b2..bd9a488 100644
--- a/CMSIS/DSP/Testing/FrameworkSource/Error.cpp
+++ b/CMSIS/DSP/Testing/FrameworkSource/Error.cpp
@@ -27,8 +27,8 @@
  */
 #include <cstdlib> 
 #include <cstdio>
-#include "arm_math.h"
-#include "arm_math_f16.h"
+#include "arm_math_types.h"
+#include "arm_math_types_f16.h"
 #include "Error.h"
 
 
diff --git a/CMSIS/DSP/Testing/FrameworkSource/FPGA.cpp b/CMSIS/DSP/Testing/FrameworkSource/FPGA.cpp
index 3c8eecc..22b29f6 100644
--- a/CMSIS/DSP/Testing/FrameworkSource/FPGA.cpp
+++ b/CMSIS/DSP/Testing/FrameworkSource/FPGA.cpp
@@ -37,8 +37,8 @@
 #include <cstdio>
 
 #include "Generators.h"
-#include "arm_math.h"
-#include "arm_math_f16.h"
+#include "arm_math_types.h"
+#include "arm_math_types_f16.h"
 
 using namespace std;
 
diff --git a/CMSIS/DSP/Testing/FrameworkSource/IORunner.cpp b/CMSIS/DSP/Testing/FrameworkSource/IORunner.cpp
index f5c1bbb..010a25e 100644
--- a/CMSIS/DSP/Testing/FrameworkSource/IORunner.cpp
+++ b/CMSIS/DSP/Testing/FrameworkSource/IORunner.cpp
@@ -37,7 +37,7 @@
 #include "IORunner.h"
 #include "Error.h"
 #include "Timing.h"
-#include "arm_math.h"
+#include "arm_math_types.h"
 #include "Calibrate.h"
 
 #ifdef CORTEXA
diff --git a/CMSIS/DSP/Testing/FrameworkSource/Pattern.cpp b/CMSIS/DSP/Testing/FrameworkSource/Pattern.cpp
index b04d1d8..a15052f 100644
--- a/CMSIS/DSP/Testing/FrameworkSource/Pattern.cpp
+++ b/CMSIS/DSP/Testing/FrameworkSource/Pattern.cpp
@@ -30,8 +30,8 @@
  */
 #include "Test.h"
 #include "Pattern.h"
-#include "arm_math.h"
-#include "arm_math_f16.h"
+#include "arm_math_types.h"
+#include "arm_math_types_f16.h"
 
 namespace Client {
 
diff --git a/CMSIS/DSP/Testing/FrameworkSource/PatternMgr.cpp b/CMSIS/DSP/Testing/FrameworkSource/PatternMgr.cpp
index 4fdca91..8157408 100644
--- a/CMSIS/DSP/Testing/FrameworkSource/PatternMgr.cpp
+++ b/CMSIS/DSP/Testing/FrameworkSource/PatternMgr.cpp
@@ -29,8 +29,8 @@
  * limitations under the License.
  */
 #include "Test.h"
-#include "arm_math.h"
-#include "arm_math_f16.h"
+#include "arm_math_types.h"
+#include "arm_math_types_f16.h"
 
 namespace Client
 {
diff --git a/CMSIS/DSP/Testing/FrameworkSource/Semihosting.cpp b/CMSIS/DSP/Testing/FrameworkSource/Semihosting.cpp
index acda167..e46f940 100644
--- a/CMSIS/DSP/Testing/FrameworkSource/Semihosting.cpp
+++ b/CMSIS/DSP/Testing/FrameworkSource/Semihosting.cpp
@@ -37,8 +37,8 @@
 #include <cstdlib>
 #include "Generators.h"
 #include "Semihosting.h"
-#include "arm_math.h"
-#include "arm_math_f16.h"
+#include "arm_math_types.h"
+#include "arm_math_types_f16.h"
 
 
 namespace Client
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/BIQUADF32.h b/CMSIS/DSP/Testing/Include/Benchmarks/BIQUADF32.h
index 8489f74..d6a241b 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/BIQUADF32.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/BIQUADF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/filtering_functions.h"
+
 class BIQUADF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/BIQUADF64.h b/CMSIS/DSP/Testing/Include/Benchmarks/BIQUADF64.h
index 4b044d8..f54b55d 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/BIQUADF64.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/BIQUADF64.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/filtering_functions.h"
+
 class BIQUADF64:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/BasicMathsBenchmarksF32.h b/CMSIS/DSP/Testing/Include/Benchmarks/BasicMathsBenchmarksF32.h
index 1b13041..04164be 100644
--- a/CMSIS/DSP/Testing/Include/Benchmarks/BasicMathsBenchmarksF32.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/BasicMathsBenchmarksF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/basic_math_functions.h"
+
 class BasicMathsBenchmarksF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/BasicMathsBenchmarksQ15.h b/CMSIS/DSP/Testing/Include/Benchmarks/BasicMathsBenchmarksQ15.h
index b054ed8..af33738 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/BasicMathsBenchmarksQ15.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/BasicMathsBenchmarksQ15.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/basic_math_functions.h"
+
 class BasicMathsBenchmarksQ15:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/BasicMathsBenchmarksQ31.h b/CMSIS/DSP/Testing/Include/Benchmarks/BasicMathsBenchmarksQ31.h
index be3eec8..29ac512 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/BasicMathsBenchmarksQ31.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/BasicMathsBenchmarksQ31.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/basic_math_functions.h"
+
 class BasicMathsBenchmarksQ31:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/BasicMathsBenchmarksQ7.h b/CMSIS/DSP/Testing/Include/Benchmarks/BasicMathsBenchmarksQ7.h
index 72207f7..84962a4 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/BasicMathsBenchmarksQ7.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/BasicMathsBenchmarksQ7.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/basic_math_functions.h"
+
 class BasicMathsBenchmarksQ7:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/BinaryF32.h b/CMSIS/DSP/Testing/Include/Benchmarks/BinaryF32.h
index be0b18d..f89b1bf 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/BinaryF32.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/BinaryF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/matrix_functions.h"
+
 class BinaryF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/BinaryQ15.h b/CMSIS/DSP/Testing/Include/Benchmarks/BinaryQ15.h
index a803253..d3a5f01 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/BinaryQ15.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/BinaryQ15.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/matrix_functions.h"
+
 class BinaryQ15:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/BinaryQ31.h b/CMSIS/DSP/Testing/Include/Benchmarks/BinaryQ31.h
index e8fe7c8..64502c2 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/BinaryQ31.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/BinaryQ31.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/matrix_functions.h"
+
 class BinaryQ31:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/BinaryQ7.h b/CMSIS/DSP/Testing/Include/Benchmarks/BinaryQ7.h
index 1ab4633..b52d96e 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/BinaryQ7.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/BinaryQ7.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/matrix_functions.h"
+
 class BinaryQ7:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/ComplexMathsBenchmarksF32.h b/CMSIS/DSP/Testing/Include/Benchmarks/ComplexMathsBenchmarksF32.h
index 433b42a..2a2c2c6 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/ComplexMathsBenchmarksF32.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/ComplexMathsBenchmarksF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/complex_math_functions.h"
+
 class ComplexMathsBenchmarksF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/ComplexMathsBenchmarksQ15.h b/CMSIS/DSP/Testing/Include/Benchmarks/ComplexMathsBenchmarksQ15.h
index 00700d0..a47738b 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/ComplexMathsBenchmarksQ15.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/ComplexMathsBenchmarksQ15.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/complex_math_functions.h"
+
 class ComplexMathsBenchmarksQ15:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/ComplexMathsBenchmarksQ31.h b/CMSIS/DSP/Testing/Include/Benchmarks/ComplexMathsBenchmarksQ31.h
index b44f389..17a0329 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/ComplexMathsBenchmarksQ31.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/ComplexMathsBenchmarksQ31.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/complex_math_functions.h"
+
 class ComplexMathsBenchmarksQ31:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/ControllerF32.h b/CMSIS/DSP/Testing/Include/Benchmarks/ControllerF32.h
index 8adcbd2..50c5974 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/ControllerF32.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/ControllerF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/controller_functions.h"
+
 class ControllerF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/ControllerQ15.h b/CMSIS/DSP/Testing/Include/Benchmarks/ControllerQ15.h
index 6f7537e..086b7eb 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/ControllerQ15.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/ControllerQ15.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/controller_functions.h"
+
 class ControllerQ15:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/ControllerQ31.h b/CMSIS/DSP/Testing/Include/Benchmarks/ControllerQ31.h
index f4a55cb..e20bca1 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/ControllerQ31.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/ControllerQ31.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/controller_functions.h"
+
 class ControllerQ31:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/DECIMF32.h b/CMSIS/DSP/Testing/Include/Benchmarks/DECIMF32.h
index acd0d0b..923bf7c 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/DECIMF32.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/DECIMF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/filtering_functions.h"
+
 class DECIMF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/DECIMQ15.h b/CMSIS/DSP/Testing/Include/Benchmarks/DECIMQ15.h
index c4697ac..2750513 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/DECIMQ15.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/DECIMQ15.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/filtering_functions.h"
+
 class DECIMQ15:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/DECIMQ31.h b/CMSIS/DSP/Testing/Include/Benchmarks/DECIMQ31.h
index f122a30..d32d56d 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/DECIMQ31.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/DECIMQ31.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/filtering_functions.h"
+
 class DECIMQ31:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/FIRF32.h b/CMSIS/DSP/Testing/Include/Benchmarks/FIRF32.h
index 9be0955..2c3cc06 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/FIRF32.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/FIRF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/filtering_functions.h"
+
 class FIRF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/FIRQ15.h b/CMSIS/DSP/Testing/Include/Benchmarks/FIRQ15.h
index f5b0ad5..b82e490 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/FIRQ15.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/FIRQ15.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/filtering_functions.h"
+
 class FIRQ15:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/FIRQ31.h b/CMSIS/DSP/Testing/Include/Benchmarks/FIRQ31.h
index 943c7f5..b698545 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/FIRQ31.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/FIRQ31.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/filtering_functions.h"
+
 class FIRQ31:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/FastMathF32.h b/CMSIS/DSP/Testing/Include/Benchmarks/FastMathF32.h
index d1064fd..15b1ff8 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/FastMathF32.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/FastMathF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/fast_math_functions.h"
+
 class FastMathF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/FastMathQ15.h b/CMSIS/DSP/Testing/Include/Benchmarks/FastMathQ15.h
index 631fba4..2d8c48d 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/FastMathQ15.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/FastMathQ15.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/fast_math_functions.h"
+
 class FastMathQ15:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/FastMathQ31.h b/CMSIS/DSP/Testing/Include/Benchmarks/FastMathQ31.h
index 854ae74..062ab01 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/FastMathQ31.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/FastMathQ31.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/fast_math_functions.h"
+
 class FastMathQ31:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/MISCF32.h b/CMSIS/DSP/Testing/Include/Benchmarks/MISCF32.h
index b2a5b39..e4e999f 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/MISCF32.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/MISCF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/filtering_functions.h"
+
 class MISCF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/MISCQ15.h b/CMSIS/DSP/Testing/Include/Benchmarks/MISCQ15.h
index 0cb92c7..3ea883a 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/MISCQ15.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/MISCQ15.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/filtering_functions.h"
+
 class MISCQ15:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/MISCQ31.h b/CMSIS/DSP/Testing/Include/Benchmarks/MISCQ31.h
index ed595cb..4cfccf2 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/MISCQ31.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/MISCQ31.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/filtering_functions.h"
+
 class MISCQ31:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/MISCQ7.h b/CMSIS/DSP/Testing/Include/Benchmarks/MISCQ7.h
index 3c9060d..2bfef61 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/MISCQ7.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/MISCQ7.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/filtering_functions.h"
+
 class MISCQ7:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/SupportBarF32.h b/CMSIS/DSP/Testing/Include/Benchmarks/SupportBarF32.h
index 370a0df..150cf73 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/SupportBarF32.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/SupportBarF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/support_functions.h"
+
 class SupportBarF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/SupportF32.h b/CMSIS/DSP/Testing/Include/Benchmarks/SupportF32.h
index 14517db..0a4befc 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/SupportF32.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/SupportF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/support_functions.h"
+
 class SupportF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/SupportQ15.h b/CMSIS/DSP/Testing/Include/Benchmarks/SupportQ15.h
index be82fd2..9220092 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/SupportQ15.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/SupportQ15.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/support_functions.h"
+
 class SupportQ15:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/SupportQ31.h b/CMSIS/DSP/Testing/Include/Benchmarks/SupportQ31.h
index b72513a..78e9560 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/SupportQ31.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/SupportQ31.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/support_functions.h"
+
 class SupportQ31:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/SupportQ7.h b/CMSIS/DSP/Testing/Include/Benchmarks/SupportQ7.h
index c0f1156..05681c9 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/SupportQ7.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/SupportQ7.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/support_functions.h"
+
 class SupportQ7:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/TransformF32.h b/CMSIS/DSP/Testing/Include/Benchmarks/TransformF32.h
index 7df040e..0b274d5 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/TransformF32.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/TransformF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/transform_functions.h"
+
 class TransformF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/TransformQ15.h b/CMSIS/DSP/Testing/Include/Benchmarks/TransformQ15.h
index 9736a70..02f430c 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/TransformQ15.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/TransformQ15.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/transform_functions.h"
+
 class TransformQ15:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/TransformQ31.h b/CMSIS/DSP/Testing/Include/Benchmarks/TransformQ31.h
index 2abfc1d..431f90b 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/TransformQ31.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/TransformQ31.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/transform_functions.h"
+
 class TransformQ31:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/UnaryF32.h b/CMSIS/DSP/Testing/Include/Benchmarks/UnaryF32.h
index 8a40758..91d07c4 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/UnaryF32.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/UnaryF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/matrix_functions.h"
+
 class UnaryF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/UnaryF64.h b/CMSIS/DSP/Testing/Include/Benchmarks/UnaryF64.h
index a047a66..f909379 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/UnaryF64.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/UnaryF64.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/matrix_functions.h"
+
 class UnaryF64:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/UnaryQ15.h b/CMSIS/DSP/Testing/Include/Benchmarks/UnaryQ15.h
index 8d08b9f..3eeb5d7 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/UnaryQ15.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/UnaryQ15.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/matrix_functions.h"
+
 class UnaryQ15:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/UnaryQ31.h b/CMSIS/DSP/Testing/Include/Benchmarks/UnaryQ31.h
index 02a2fad..84ff23b 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/UnaryQ31.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/UnaryQ31.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/matrix_functions.h"
+
 class UnaryQ31:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Benchmarks/UnaryQ7.h b/CMSIS/DSP/Testing/Include/Benchmarks/UnaryQ7.h
index 4076ca5..656e25b 100755
--- a/CMSIS/DSP/Testing/Include/Benchmarks/UnaryQ7.h
+++ b/CMSIS/DSP/Testing/Include/Benchmarks/UnaryQ7.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/matrix_functions.h"
+
 class UnaryQ7:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/BIQUADF32.h b/CMSIS/DSP/Testing/Include/Tests/BIQUADF32.h
index ad285da..c17c990 100755
--- a/CMSIS/DSP/Testing/Include/Tests/BIQUADF32.h
+++ b/CMSIS/DSP/Testing/Include/Tests/BIQUADF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/filtering_functions.h"
+
 class BIQUADF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/BIQUADF64.h b/CMSIS/DSP/Testing/Include/Tests/BIQUADF64.h
index 27fddc9..143eb87 100755
--- a/CMSIS/DSP/Testing/Include/Tests/BIQUADF64.h
+++ b/CMSIS/DSP/Testing/Include/Tests/BIQUADF64.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/filtering_functions.h"
+
 class BIQUADF64:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/BIQUADQ15.h b/CMSIS/DSP/Testing/Include/Tests/BIQUADQ15.h
index c5692c5..49e9c86 100755
--- a/CMSIS/DSP/Testing/Include/Tests/BIQUADQ15.h
+++ b/CMSIS/DSP/Testing/Include/Tests/BIQUADQ15.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/filtering_functions.h"
+
 class BIQUADQ15:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/BIQUADQ31.h b/CMSIS/DSP/Testing/Include/Tests/BIQUADQ31.h
index 3e70b0b..b5d8d3a 100755
--- a/CMSIS/DSP/Testing/Include/Tests/BIQUADQ31.h
+++ b/CMSIS/DSP/Testing/Include/Tests/BIQUADQ31.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/filtering_functions.h"
+
 class BIQUADQ31:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/BasicTestsF16.h b/CMSIS/DSP/Testing/Include/Tests/BasicTestsF16.h
index 1390c4f..eda59ba 100755
--- a/CMSIS/DSP/Testing/Include/Tests/BasicTestsF16.h
+++ b/CMSIS/DSP/Testing/Include/Tests/BasicTestsF16.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/basic_math_functions_f16.h"
+
 class BasicTestsF16:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/BasicTestsF32.h b/CMSIS/DSP/Testing/Include/Tests/BasicTestsF32.h
index 944a5c3..f4465d6 100644
--- a/CMSIS/DSP/Testing/Include/Tests/BasicTestsF32.h
+++ b/CMSIS/DSP/Testing/Include/Tests/BasicTestsF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/basic_math_functions.h"
+
 class BasicTestsF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/BasicTestsQ15.h b/CMSIS/DSP/Testing/Include/Tests/BasicTestsQ15.h
index c2cdf41..47ef05a 100755
--- a/CMSIS/DSP/Testing/Include/Tests/BasicTestsQ15.h
+++ b/CMSIS/DSP/Testing/Include/Tests/BasicTestsQ15.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/basic_math_functions.h"
+
 class BasicTestsQ15:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/BasicTestsQ31.h b/CMSIS/DSP/Testing/Include/Tests/BasicTestsQ31.h
index 96ab407..69e118f 100755
--- a/CMSIS/DSP/Testing/Include/Tests/BasicTestsQ31.h
+++ b/CMSIS/DSP/Testing/Include/Tests/BasicTestsQ31.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/basic_math_functions.h"
+
 class BasicTestsQ31:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/BasicTestsQ7.h b/CMSIS/DSP/Testing/Include/Tests/BasicTestsQ7.h
index 3ef6c84..b580a36 100755
--- a/CMSIS/DSP/Testing/Include/Tests/BasicTestsQ7.h
+++ b/CMSIS/DSP/Testing/Include/Tests/BasicTestsQ7.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/basic_math_functions.h"
+
 class BasicTestsQ7:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/BayesF32.h b/CMSIS/DSP/Testing/Include/Tests/BayesF32.h
index 892538f..f839dd9 100755
--- a/CMSIS/DSP/Testing/Include/Tests/BayesF32.h
+++ b/CMSIS/DSP/Testing/Include/Tests/BayesF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/bayes_functions.h"
+
 class BayesF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/BinaryTestsF32.h b/CMSIS/DSP/Testing/Include/Tests/BinaryTestsF32.h
index f9a244e..c0ddd11 100755
--- a/CMSIS/DSP/Testing/Include/Tests/BinaryTestsF32.h
+++ b/CMSIS/DSP/Testing/Include/Tests/BinaryTestsF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/matrix_functions.h"
+
 class BinaryTestsF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/BinaryTestsQ15.h b/CMSIS/DSP/Testing/Include/Tests/BinaryTestsQ15.h
index 457d453..1b52438 100755
--- a/CMSIS/DSP/Testing/Include/Tests/BinaryTestsQ15.h
+++ b/CMSIS/DSP/Testing/Include/Tests/BinaryTestsQ15.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/matrix_functions.h"
+
 class BinaryTestsQ15:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/BinaryTestsQ31.h b/CMSIS/DSP/Testing/Include/Tests/BinaryTestsQ31.h
index 5e75104..41459e4 100755
--- a/CMSIS/DSP/Testing/Include/Tests/BinaryTestsQ31.h
+++ b/CMSIS/DSP/Testing/Include/Tests/BinaryTestsQ31.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/matrix_functions.h"
+
 class BinaryTestsQ31:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/BinaryTestsQ7.h b/CMSIS/DSP/Testing/Include/Tests/BinaryTestsQ7.h
index a9fa1f1..21f1321 100755
--- a/CMSIS/DSP/Testing/Include/Tests/BinaryTestsQ7.h
+++ b/CMSIS/DSP/Testing/Include/Tests/BinaryTestsQ7.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/matrix_functions.h"
+
 class BinaryTestsQ7:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/ComplexTestsF32.h b/CMSIS/DSP/Testing/Include/Tests/ComplexTestsF32.h
index 61036a4..a54f06b 100755
--- a/CMSIS/DSP/Testing/Include/Tests/ComplexTestsF32.h
+++ b/CMSIS/DSP/Testing/Include/Tests/ComplexTestsF32.h
@@ -1,5 +1,9 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/complex_math_functions.h"
+
+
 class ComplexTestsF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/ComplexTestsQ15.h b/CMSIS/DSP/Testing/Include/Tests/ComplexTestsQ15.h
index 4ddc789..7429179 100755
--- a/CMSIS/DSP/Testing/Include/Tests/ComplexTestsQ15.h
+++ b/CMSIS/DSP/Testing/Include/Tests/ComplexTestsQ15.h
@@ -1,5 +1,9 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/complex_math_functions.h"
+
+
 class ComplexTestsQ15:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/ComplexTestsQ31.h b/CMSIS/DSP/Testing/Include/Tests/ComplexTestsQ31.h
index 359d8f7..9f53c84 100755
--- a/CMSIS/DSP/Testing/Include/Tests/ComplexTestsQ31.h
+++ b/CMSIS/DSP/Testing/Include/Tests/ComplexTestsQ31.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/complex_math_functions.h"
+
 class ComplexTestsQ31:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/DECIMF32.h b/CMSIS/DSP/Testing/Include/Tests/DECIMF32.h
index c54ff15..e376d9c 100755
--- a/CMSIS/DSP/Testing/Include/Tests/DECIMF32.h
+++ b/CMSIS/DSP/Testing/Include/Tests/DECIMF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/filtering_functions.h"
+
 class DECIMF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/DECIMQ15.h b/CMSIS/DSP/Testing/Include/Tests/DECIMQ15.h
index 5dd15db..4a0efb3 100755
--- a/CMSIS/DSP/Testing/Include/Tests/DECIMQ15.h
+++ b/CMSIS/DSP/Testing/Include/Tests/DECIMQ15.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/filtering_functions.h"
+
 class DECIMQ15:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/DECIMQ31.h b/CMSIS/DSP/Testing/Include/Tests/DECIMQ31.h
index 01179ae..00fa702 100755
--- a/CMSIS/DSP/Testing/Include/Tests/DECIMQ31.h
+++ b/CMSIS/DSP/Testing/Include/Tests/DECIMQ31.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/filtering_functions.h"
+
 class DECIMQ31:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/DistanceTestsF32.h b/CMSIS/DSP/Testing/Include/Tests/DistanceTestsF32.h
index fdddaed..08a2b6c 100755
--- a/CMSIS/DSP/Testing/Include/Tests/DistanceTestsF32.h
+++ b/CMSIS/DSP/Testing/Include/Tests/DistanceTestsF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/distance_functions.h"
+
 class DistanceTestsF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/DistanceTestsU32.h b/CMSIS/DSP/Testing/Include/Tests/DistanceTestsU32.h
index e14f16e..0dfdc2c 100755
--- a/CMSIS/DSP/Testing/Include/Tests/DistanceTestsU32.h
+++ b/CMSIS/DSP/Testing/Include/Tests/DistanceTestsU32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/distance_functions.h"
+
 class DistanceTestsU32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/ExampleCategoryF32.h b/CMSIS/DSP/Testing/Include/Tests/ExampleCategoryF32.h
index f3a4ef2..e6d4385 100755
--- a/CMSIS/DSP/Testing/Include/Tests/ExampleCategoryF32.h
+++ b/CMSIS/DSP/Testing/Include/Tests/ExampleCategoryF32.h
@@ -6,6 +6,9 @@
   correspond to what is used for the test suite.
 
 */
+
+#include "dsp/basic_math_functions.h"
+
 class ExampleCategoryF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/ExampleCategoryQ15.h b/CMSIS/DSP/Testing/Include/Tests/ExampleCategoryQ15.h
index 7993bde..db7f13a 100755
--- a/CMSIS/DSP/Testing/Include/Tests/ExampleCategoryQ15.h
+++ b/CMSIS/DSP/Testing/Include/Tests/ExampleCategoryQ15.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/basic_math_functions.h"
+
 class ExampleCategoryQ15:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/ExampleCategoryQ31.h b/CMSIS/DSP/Testing/Include/Tests/ExampleCategoryQ31.h
index e3a15b4..41d932e 100755
--- a/CMSIS/DSP/Testing/Include/Tests/ExampleCategoryQ31.h
+++ b/CMSIS/DSP/Testing/Include/Tests/ExampleCategoryQ31.h
@@ -1,5 +1,9 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/basic_math_functions.h"
+
+
 class ExampleCategoryQ31:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/ExampleCategoryQ7.h b/CMSIS/DSP/Testing/Include/Tests/ExampleCategoryQ7.h
index 5d2b854..55db8b0 100755
--- a/CMSIS/DSP/Testing/Include/Tests/ExampleCategoryQ7.h
+++ b/CMSIS/DSP/Testing/Include/Tests/ExampleCategoryQ7.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/basic_math_functions.h"
+
 class ExampleCategoryQ7:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/FIRF32.h b/CMSIS/DSP/Testing/Include/Tests/FIRF32.h
index fd1ca73..bb7ed4a 100644
--- a/CMSIS/DSP/Testing/Include/Tests/FIRF32.h
+++ b/CMSIS/DSP/Testing/Include/Tests/FIRF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/filtering_functions.h"
+
 class FIRF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/FIRQ15.h b/CMSIS/DSP/Testing/Include/Tests/FIRQ15.h
index b17a6dd..28a41c6 100644
--- a/CMSIS/DSP/Testing/Include/Tests/FIRQ15.h
+++ b/CMSIS/DSP/Testing/Include/Tests/FIRQ15.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/filtering_functions.h"
+
 class FIRQ15:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/FIRQ31.h b/CMSIS/DSP/Testing/Include/Tests/FIRQ31.h
index 92298ce..946a2c2 100644
--- a/CMSIS/DSP/Testing/Include/Tests/FIRQ31.h
+++ b/CMSIS/DSP/Testing/Include/Tests/FIRQ31.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/filtering_functions.h"
+
 class FIRQ31:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/FIRQ7.h b/CMSIS/DSP/Testing/Include/Tests/FIRQ7.h
index 59bb345..6f81313 100644
--- a/CMSIS/DSP/Testing/Include/Tests/FIRQ7.h
+++ b/CMSIS/DSP/Testing/Include/Tests/FIRQ7.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/filtering_functions.h"
+
 class FIRQ7:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/FastMathF32.h b/CMSIS/DSP/Testing/Include/Tests/FastMathF32.h
index 298a421..fb29fad 100755
--- a/CMSIS/DSP/Testing/Include/Tests/FastMathF32.h
+++ b/CMSIS/DSP/Testing/Include/Tests/FastMathF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/fast_math_functions.h"
+
 class FastMathF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/FastMathQ15.h b/CMSIS/DSP/Testing/Include/Tests/FastMathQ15.h
index df41880..08d51f6 100755
--- a/CMSIS/DSP/Testing/Include/Tests/FastMathQ15.h
+++ b/CMSIS/DSP/Testing/Include/Tests/FastMathQ15.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/fast_math_functions.h"
+
 class FastMathQ15:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/FastMathQ31.h b/CMSIS/DSP/Testing/Include/Tests/FastMathQ31.h
index dbcd05a..3c1837f 100755
--- a/CMSIS/DSP/Testing/Include/Tests/FastMathQ31.h
+++ b/CMSIS/DSP/Testing/Include/Tests/FastMathQ31.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/fast_math_functions.h"
+
 class FastMathQ31:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/InterpolationTestsF32.h b/CMSIS/DSP/Testing/Include/Tests/InterpolationTestsF32.h
index 304cc2f..5710e9d 100755
--- a/CMSIS/DSP/Testing/Include/Tests/InterpolationTestsF32.h
+++ b/CMSIS/DSP/Testing/Include/Tests/InterpolationTestsF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/interpolation_functions.h"
+
 class InterpolationTestsF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/InterpolationTestsQ15.h b/CMSIS/DSP/Testing/Include/Tests/InterpolationTestsQ15.h
index c0a02d2..0167f3a 100755
--- a/CMSIS/DSP/Testing/Include/Tests/InterpolationTestsQ15.h
+++ b/CMSIS/DSP/Testing/Include/Tests/InterpolationTestsQ15.h
@@ -1,5 +1,9 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/interpolation_functions.h"
+
+
 class InterpolationTestsQ15:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/InterpolationTestsQ31.h b/CMSIS/DSP/Testing/Include/Tests/InterpolationTestsQ31.h
index 55b1d18..5954da3 100755
--- a/CMSIS/DSP/Testing/Include/Tests/InterpolationTestsQ31.h
+++ b/CMSIS/DSP/Testing/Include/Tests/InterpolationTestsQ31.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/interpolation_functions.h"
+
 class InterpolationTestsQ31:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/InterpolationTestsQ7.h b/CMSIS/DSP/Testing/Include/Tests/InterpolationTestsQ7.h
index 677bd5f..17a4a48 100755
--- a/CMSIS/DSP/Testing/Include/Tests/InterpolationTestsQ7.h
+++ b/CMSIS/DSP/Testing/Include/Tests/InterpolationTestsQ7.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/interpolation_functions.h"
+
 class InterpolationTestsQ7:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/MISCF32.h b/CMSIS/DSP/Testing/Include/Tests/MISCF32.h
index e7402af..5253925 100755
--- a/CMSIS/DSP/Testing/Include/Tests/MISCF32.h
+++ b/CMSIS/DSP/Testing/Include/Tests/MISCF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/filtering_functions.h"
+
 class MISCF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/MISCQ15.h b/CMSIS/DSP/Testing/Include/Tests/MISCQ15.h
index f9a1821..8379b7c 100755
--- a/CMSIS/DSP/Testing/Include/Tests/MISCQ15.h
+++ b/CMSIS/DSP/Testing/Include/Tests/MISCQ15.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/filtering_functions.h"
+
 class MISCQ15:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/MISCQ31.h b/CMSIS/DSP/Testing/Include/Tests/MISCQ31.h
index 6288c3d..97844d8 100755
--- a/CMSIS/DSP/Testing/Include/Tests/MISCQ31.h
+++ b/CMSIS/DSP/Testing/Include/Tests/MISCQ31.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/filtering_functions.h"
+
 class MISCQ31:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/MISCQ7.h b/CMSIS/DSP/Testing/Include/Tests/MISCQ7.h
index ed68e1c..6eca866 100755
--- a/CMSIS/DSP/Testing/Include/Tests/MISCQ7.h
+++ b/CMSIS/DSP/Testing/Include/Tests/MISCQ7.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/filtering_functions.h"
+
 class MISCQ7:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/SVMF32.h b/CMSIS/DSP/Testing/Include/Tests/SVMF32.h
index 6bb96e1..ff42769 100755
--- a/CMSIS/DSP/Testing/Include/Tests/SVMF32.h
+++ b/CMSIS/DSP/Testing/Include/Tests/SVMF32.h
@@ -1,5 +1,9 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/svm_functions.h"
+
+
 class SVMF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/StatsTestsF32.h b/CMSIS/DSP/Testing/Include/Tests/StatsTestsF32.h
index 712d184..8fb638e 100755
--- a/CMSIS/DSP/Testing/Include/Tests/StatsTestsF32.h
+++ b/CMSIS/DSP/Testing/Include/Tests/StatsTestsF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/statistics_functions.h"
+
 class StatsTestsF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/StatsTestsF64.h b/CMSIS/DSP/Testing/Include/Tests/StatsTestsF64.h
index eb54cb6..42b0f04 100755
--- a/CMSIS/DSP/Testing/Include/Tests/StatsTestsF64.h
+++ b/CMSIS/DSP/Testing/Include/Tests/StatsTestsF64.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/statistics_functions.h"
+
 class StatsTestsF64:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/StatsTestsQ15.h b/CMSIS/DSP/Testing/Include/Tests/StatsTestsQ15.h
index f2e7f32..b2c9b12 100755
--- a/CMSIS/DSP/Testing/Include/Tests/StatsTestsQ15.h
+++ b/CMSIS/DSP/Testing/Include/Tests/StatsTestsQ15.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/statistics_functions.h"
+
 class StatsTestsQ15:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/StatsTestsQ31.h b/CMSIS/DSP/Testing/Include/Tests/StatsTestsQ31.h
index 04d554e..d1fce07 100755
--- a/CMSIS/DSP/Testing/Include/Tests/StatsTestsQ31.h
+++ b/CMSIS/DSP/Testing/Include/Tests/StatsTestsQ31.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/statistics_functions.h"
+
 class StatsTestsQ31:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/StatsTestsQ7.h b/CMSIS/DSP/Testing/Include/Tests/StatsTestsQ7.h
index 74227a6..4817bf6 100755
--- a/CMSIS/DSP/Testing/Include/Tests/StatsTestsQ7.h
+++ b/CMSIS/DSP/Testing/Include/Tests/StatsTestsQ7.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/statistics_functions.h"
+
 class StatsTestsQ7:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/SupportBarTestsF32.h b/CMSIS/DSP/Testing/Include/Tests/SupportBarTestsF32.h
index d7228ca..1d88904 100755
--- a/CMSIS/DSP/Testing/Include/Tests/SupportBarTestsF32.h
+++ b/CMSIS/DSP/Testing/Include/Tests/SupportBarTestsF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/support_functions.h"
+
 class SupportBarTestsF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/SupportTestsF32.h b/CMSIS/DSP/Testing/Include/Tests/SupportTestsF32.h
index f2dc55b..57486f7 100755
--- a/CMSIS/DSP/Testing/Include/Tests/SupportTestsF32.h
+++ b/CMSIS/DSP/Testing/Include/Tests/SupportTestsF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/support_functions.h"
+
 class SupportTestsF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/SupportTestsQ15.h b/CMSIS/DSP/Testing/Include/Tests/SupportTestsQ15.h
index 4f942e7..8a37203 100755
--- a/CMSIS/DSP/Testing/Include/Tests/SupportTestsQ15.h
+++ b/CMSIS/DSP/Testing/Include/Tests/SupportTestsQ15.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/support_functions.h"
+
 class SupportTestsQ15:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/SupportTestsQ31.h b/CMSIS/DSP/Testing/Include/Tests/SupportTestsQ31.h
index 6959c47..e6ad476 100755
--- a/CMSIS/DSP/Testing/Include/Tests/SupportTestsQ31.h
+++ b/CMSIS/DSP/Testing/Include/Tests/SupportTestsQ31.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/support_functions.h"
+
 class SupportTestsQ31:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/SupportTestsQ7.h b/CMSIS/DSP/Testing/Include/Tests/SupportTestsQ7.h
index 32efad6..7b89158 100755
--- a/CMSIS/DSP/Testing/Include/Tests/SupportTestsQ7.h
+++ b/CMSIS/DSP/Testing/Include/Tests/SupportTestsQ7.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/support_functions.h"
+
 class SupportTestsQ7:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/TransformCF16.h b/CMSIS/DSP/Testing/Include/Tests/TransformCF16.h
index 528690f..b344a52 100755
--- a/CMSIS/DSP/Testing/Include/Tests/TransformCF16.h
+++ b/CMSIS/DSP/Testing/Include/Tests/TransformCF16.h
@@ -1,6 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
-#include "arm_math_f16.h"
+
+#include "dsp/transform_functions_f16.h"
+
 class TransformCF16:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/TransformCF32.h b/CMSIS/DSP/Testing/Include/Tests/TransformCF32.h
index 3738964..c1cf023 100755
--- a/CMSIS/DSP/Testing/Include/Tests/TransformCF32.h
+++ b/CMSIS/DSP/Testing/Include/Tests/TransformCF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/transform_functions.h"
+
 class TransformCF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/TransformCF64.h b/CMSIS/DSP/Testing/Include/Tests/TransformCF64.h
index e0e9c8b..1c53208 100755
--- a/CMSIS/DSP/Testing/Include/Tests/TransformCF64.h
+++ b/CMSIS/DSP/Testing/Include/Tests/TransformCF64.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/transform_functions.h"
+
 class TransformCF64:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/TransformCQ15.h b/CMSIS/DSP/Testing/Include/Tests/TransformCQ15.h
index e1df0bf..df3aece 100755
--- a/CMSIS/DSP/Testing/Include/Tests/TransformCQ15.h
+++ b/CMSIS/DSP/Testing/Include/Tests/TransformCQ15.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/transform_functions.h"
+
 class TransformCQ15:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/TransformCQ31.h b/CMSIS/DSP/Testing/Include/Tests/TransformCQ31.h
index 50bab31..d55544f 100755
--- a/CMSIS/DSP/Testing/Include/Tests/TransformCQ31.h
+++ b/CMSIS/DSP/Testing/Include/Tests/TransformCQ31.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/transform_functions.h"
+
 class TransformCQ31:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/TransformRF32.h b/CMSIS/DSP/Testing/Include/Tests/TransformRF32.h
index 21b64df..5bc0098 100755
--- a/CMSIS/DSP/Testing/Include/Tests/TransformRF32.h
+++ b/CMSIS/DSP/Testing/Include/Tests/TransformRF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/transform_functions.h"
+
 class TransformRF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/TransformRF64.h b/CMSIS/DSP/Testing/Include/Tests/TransformRF64.h
index 92f4121..2c19760 100755
--- a/CMSIS/DSP/Testing/Include/Tests/TransformRF64.h
+++ b/CMSIS/DSP/Testing/Include/Tests/TransformRF64.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/transform_functions.h"
+
 class TransformRF64:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/TransformRQ15.h b/CMSIS/DSP/Testing/Include/Tests/TransformRQ15.h
index ec1c78b..05ac0bd 100755
--- a/CMSIS/DSP/Testing/Include/Tests/TransformRQ15.h
+++ b/CMSIS/DSP/Testing/Include/Tests/TransformRQ15.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/transform_functions.h"
+
 class TransformRQ15:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/TransformRQ31.h b/CMSIS/DSP/Testing/Include/Tests/TransformRQ31.h
index 37158e6..f2109a5 100755
--- a/CMSIS/DSP/Testing/Include/Tests/TransformRQ31.h
+++ b/CMSIS/DSP/Testing/Include/Tests/TransformRQ31.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/transform_functions.h"
+
 class TransformRQ31:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/UnaryTestsF32.h b/CMSIS/DSP/Testing/Include/Tests/UnaryTestsF32.h
index ce9308d..331e22e 100755
--- a/CMSIS/DSP/Testing/Include/Tests/UnaryTestsF32.h
+++ b/CMSIS/DSP/Testing/Include/Tests/UnaryTestsF32.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/matrix_functions.h"
+
 class UnaryTestsF32:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/UnaryTestsF64.h b/CMSIS/DSP/Testing/Include/Tests/UnaryTestsF64.h
index 8c548c8..32eae9b 100755
--- a/CMSIS/DSP/Testing/Include/Tests/UnaryTestsF64.h
+++ b/CMSIS/DSP/Testing/Include/Tests/UnaryTestsF64.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/matrix_functions.h"
+
 class UnaryTestsF64:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/UnaryTestsQ15.h b/CMSIS/DSP/Testing/Include/Tests/UnaryTestsQ15.h
index bbe40c8..1e98280 100755
--- a/CMSIS/DSP/Testing/Include/Tests/UnaryTestsQ15.h
+++ b/CMSIS/DSP/Testing/Include/Tests/UnaryTestsQ15.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/matrix_functions.h"
+
 class UnaryTestsQ15:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/UnaryTestsQ31.h b/CMSIS/DSP/Testing/Include/Tests/UnaryTestsQ31.h
index a33ac92..4e48131 100755
--- a/CMSIS/DSP/Testing/Include/Tests/UnaryTestsQ31.h
+++ b/CMSIS/DSP/Testing/Include/Tests/UnaryTestsQ31.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/matrix_functions.h"
+
 class UnaryTestsQ31:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Include/Tests/UnaryTestsQ7.h b/CMSIS/DSP/Testing/Include/Tests/UnaryTestsQ7.h
index 1f8a99f..60ee22c 100755
--- a/CMSIS/DSP/Testing/Include/Tests/UnaryTestsQ7.h
+++ b/CMSIS/DSP/Testing/Include/Tests/UnaryTestsQ7.h
@@ -1,5 +1,8 @@
 #include "Test.h"
 #include "Pattern.h"
+
+#include "dsp/matrix_functions.h"
+
 class UnaryTestsQ7:public Client::Suite
     {
         public:
diff --git a/CMSIS/DSP/Testing/Source/Benchmarks/TransformF32.cpp b/CMSIS/DSP/Testing/Source/Benchmarks/TransformF32.cpp
index 53de1c8..b36c1c5 100755
--- a/CMSIS/DSP/Testing/Source/Benchmarks/TransformF32.cpp
+++ b/CMSIS/DSP/Testing/Source/Benchmarks/TransformF32.cpp
@@ -1,6 +1,5 @@
 #include "TransformF32.h"
 #include "Error.h"
-#include "arm_math.h"
 
     void TransformF32::test_cfft_f32()
     { 
diff --git a/CMSIS/DSP/Testing/Source/Tests/BasicTestsF16.cpp b/CMSIS/DSP/Testing/Source/Tests/BasicTestsF16.cpp
index ee64e1b..21312f1 100755
--- a/CMSIS/DSP/Testing/Source/Tests/BasicTestsF16.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/BasicTestsF16.cpp
@@ -2,7 +2,6 @@
 #include <stdio.h>
 #include "Error.h"
 
-#include "arm_math_f16.h"
 
 #define SNR_THRESHOLD 62
 #define SNR_DOTPROD_THRESHOLD 40
@@ -19,7 +18,6 @@
 #define GET_F16_PTR() \
 const float16_t *inp1=input1.ptr(); \
 const float16_t *inp2=input2.ptr(); \
-float16_t *refp=ref.ptr(); \
 float16_t *outp=output.ptr();
 
     void BasicTestsF16::test_add_f16()
@@ -71,6 +69,8 @@
 
         GET_F16_PTR();
 
+        (void)inp2;
+
         arm_negate_f16(inp1,outp,input1.nbSamples());
 
         ASSERT_EMPTY_TAIL(output);
@@ -86,6 +86,8 @@
 
         GET_F16_PTR();
 
+        (void)inp2;
+
         arm_offset_f16(inp1,0.5,outp,input1.nbSamples());
 
         ASSERT_EMPTY_TAIL(output);
@@ -101,6 +103,8 @@
 
         GET_F16_PTR();
 
+        (void)inp2;
+
         arm_scale_f16(inp1,0.5,outp,input1.nbSamples());
 
         ASSERT_EMPTY_TAIL(output);
@@ -136,6 +140,8 @@
 
         GET_F16_PTR();
 
+        (void)inp2;
+
         arm_abs_f16(inp1,outp,input1.nbSamples());
 
         ASSERT_EMPTY_TAIL(output);
@@ -152,7 +158,8 @@
       
        Testing::nbSamples_t nb=MAX_NB_SAMPLES; 
 
-       
+       (void)params;
+
        switch(id)
        {
         case BasicTestsF16::TEST_ADD_F16_1:
@@ -304,5 +311,6 @@
 
     void BasicTestsF16::tearDown(Testing::testID_t id,Client::PatternMgr *mgr)
     {
+        (void)id;
         output.dump(mgr);
     }
diff --git a/CMSIS/DSP/Testing/Source/Tests/BayesF32.cpp b/CMSIS/DSP/Testing/Source/Tests/BayesF32.cpp
index b2e0e0c..eb4b305 100755
--- a/CMSIS/DSP/Testing/Source/Tests/BayesF32.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/BayesF32.cpp
@@ -1,7 +1,6 @@
 #include "BayesF32.h"
 #include <stdio.h>
 #include "Error.h"
-#include "arm_math.h"
 #include "Test.h"
 
 
diff --git a/CMSIS/DSP/Testing/Source/Tests/DistanceTestsF32.cpp b/CMSIS/DSP/Testing/Source/Tests/DistanceTestsF32.cpp
index 07906f3..f2a990f 100755
--- a/CMSIS/DSP/Testing/Source/Tests/DistanceTestsF32.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/DistanceTestsF32.cpp
@@ -1,7 +1,6 @@
 #include "DistanceTestsF32.h"
 #include <stdio.h>
 #include "Error.h"
-#include "arm_math.h"
 #include "Test.h"
 
 
diff --git a/CMSIS/DSP/Testing/Source/Tests/DistanceTestsU32.cpp b/CMSIS/DSP/Testing/Source/Tests/DistanceTestsU32.cpp
index 0fa2615..86fd63c 100755
--- a/CMSIS/DSP/Testing/Source/Tests/DistanceTestsU32.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/DistanceTestsU32.cpp
@@ -1,7 +1,6 @@
 #include "DistanceTestsU32.h"
 #include <stdio.h>
 #include "Error.h"
-#include "arm_math.h"
 #include "Test.h"
 
 #define ERROR_THRESHOLD 1e-8
diff --git a/CMSIS/DSP/Testing/Source/Tests/FastMathF32.cpp b/CMSIS/DSP/Testing/Source/Tests/FastMathF32.cpp
index 22547f6..b91b746 100755
--- a/CMSIS/DSP/Testing/Source/Tests/FastMathF32.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/FastMathF32.cpp
@@ -1,7 +1,6 @@
 #include "FastMathF32.h"
 #include <stdio.h>
 #include "Error.h"
-#include "arm_math.h"
 #include "arm_vec_math.h"
 #include "Test.h"
 
diff --git a/CMSIS/DSP/Testing/Source/Tests/FastMathQ15.cpp b/CMSIS/DSP/Testing/Source/Tests/FastMathQ15.cpp
index 338a160..e28cd0b 100755
--- a/CMSIS/DSP/Testing/Source/Tests/FastMathQ15.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/FastMathQ15.cpp
@@ -1,7 +1,6 @@
 #include "FastMathQ15.h"
 #include <stdio.h>
 #include "Error.h"
-#include "arm_math.h"
 #include "Test.h"
 
 
diff --git a/CMSIS/DSP/Testing/Source/Tests/FastMathQ31.cpp b/CMSIS/DSP/Testing/Source/Tests/FastMathQ31.cpp
index bde559b..1176918 100755
--- a/CMSIS/DSP/Testing/Source/Tests/FastMathQ31.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/FastMathQ31.cpp
@@ -1,7 +1,6 @@
 #include "FastMathQ31.h"
 #include <stdio.h>
 #include "Error.h"
-#include "arm_math.h"
 #include "Test.h"
 
 
diff --git a/CMSIS/DSP/Testing/Source/Tests/MISCF32.cpp b/CMSIS/DSP/Testing/Source/Tests/MISCF32.cpp
index 64d019f..2bf5b06 100755
--- a/CMSIS/DSP/Testing/Source/Tests/MISCF32.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/MISCF32.cpp
@@ -1,7 +1,6 @@
 #include "MISCF32.h"
 #include <stdio.h>
 #include "Error.h"
-#include "arm_math.h"
 #include "arm_vec_math.h"
 #include "Test.h"
 
diff --git a/CMSIS/DSP/Testing/Source/Tests/MISCQ15.cpp b/CMSIS/DSP/Testing/Source/Tests/MISCQ15.cpp
index d4497ed..19124ef 100755
--- a/CMSIS/DSP/Testing/Source/Tests/MISCQ15.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/MISCQ15.cpp
@@ -1,7 +1,6 @@
 #include "MISCQ15.h"
 #include <stdio.h>
 #include "Error.h"
-#include "arm_math.h"
 #include "arm_vec_math.h"
 #include "Test.h"
 
diff --git a/CMSIS/DSP/Testing/Source/Tests/MISCQ31.cpp b/CMSIS/DSP/Testing/Source/Tests/MISCQ31.cpp
index a9f18a4..a7cd54d 100755
--- a/CMSIS/DSP/Testing/Source/Tests/MISCQ31.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/MISCQ31.cpp
@@ -1,7 +1,6 @@
 #include "MISCQ31.h"
 #include <stdio.h>
 #include "Error.h"
-#include "arm_math.h"
 #include "arm_vec_math.h"
 #include "Test.h"
 
diff --git a/CMSIS/DSP/Testing/Source/Tests/MISCQ7.cpp b/CMSIS/DSP/Testing/Source/Tests/MISCQ7.cpp
index 8260323..71d0ebb 100755
--- a/CMSIS/DSP/Testing/Source/Tests/MISCQ7.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/MISCQ7.cpp
@@ -1,7 +1,6 @@
 #include "MISCQ7.h"
 #include <stdio.h>
 #include "Error.h"
-#include "arm_math.h"
 #include "arm_vec_math.h"
 #include "Test.h"
 
diff --git a/CMSIS/DSP/Testing/Source/Tests/StatsTestsF32.cpp b/CMSIS/DSP/Testing/Source/Tests/StatsTestsF32.cpp
index ddc3877..4289124 100755
--- a/CMSIS/DSP/Testing/Source/Tests/StatsTestsF32.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/StatsTestsF32.cpp
@@ -1,7 +1,6 @@
 #include "StatsTestsF32.h"
 #include <stdio.h>
 #include "Error.h"
-#include "arm_math.h"
 #include "Test.h"
 
 
diff --git a/CMSIS/DSP/Testing/Source/Tests/StatsTestsF64.cpp b/CMSIS/DSP/Testing/Source/Tests/StatsTestsF64.cpp
index cf4f5b0..2d72037 100755
--- a/CMSIS/DSP/Testing/Source/Tests/StatsTestsF64.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/StatsTestsF64.cpp
@@ -1,7 +1,6 @@
 #include "StatsTestsF64.h"
 #include <stdio.h>
 #include "Error.h"
-#include "arm_math.h"
 #include "Test.h"
 
 
diff --git a/CMSIS/DSP/Testing/Source/Tests/StatsTestsQ15.cpp b/CMSIS/DSP/Testing/Source/Tests/StatsTestsQ15.cpp
index 4e972fa..9bd6310 100755
--- a/CMSIS/DSP/Testing/Source/Tests/StatsTestsQ15.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/StatsTestsQ15.cpp
@@ -1,4 +1,3 @@
-#include "arm_math.h"
 #include "StatsTestsQ15.h"
 #include <stdio.h>
 #include "Error.h"
diff --git a/CMSIS/DSP/Testing/Source/Tests/StatsTestsQ31.cpp b/CMSIS/DSP/Testing/Source/Tests/StatsTestsQ31.cpp
index edb1000..5f443fe 100755
--- a/CMSIS/DSP/Testing/Source/Tests/StatsTestsQ31.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/StatsTestsQ31.cpp
@@ -1,4 +1,3 @@
-#include "arm_math.h"
 #include "StatsTestsQ31.h"
 #include <stdio.h>
 #include "Error.h"
diff --git a/CMSIS/DSP/Testing/Source/Tests/StatsTestsQ7.cpp b/CMSIS/DSP/Testing/Source/Tests/StatsTestsQ7.cpp
index 72f086c..2450c3a 100755
--- a/CMSIS/DSP/Testing/Source/Tests/StatsTestsQ7.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/StatsTestsQ7.cpp
@@ -1,4 +1,3 @@
-#include "arm_math.h"
 #include "StatsTestsQ7.h"
 #include <stdio.h>
 #include "Error.h"
diff --git a/CMSIS/DSP/Testing/Source/Tests/SupportBarTestsF32.cpp b/CMSIS/DSP/Testing/Source/Tests/SupportBarTestsF32.cpp
index 02d9e32..4f4087b 100755
--- a/CMSIS/DSP/Testing/Source/Tests/SupportBarTestsF32.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/SupportBarTestsF32.cpp
@@ -1,7 +1,6 @@
 #include "SupportBarTestsF32.h"
 #include <stdio.h>
 #include "Error.h"
-#include "arm_math.h"
 #include "Test.h"
 
 
diff --git a/CMSIS/DSP/Testing/Source/Tests/SupportTestsF32.cpp b/CMSIS/DSP/Testing/Source/Tests/SupportTestsF32.cpp
index 838fe9e..3e0d449 100755
--- a/CMSIS/DSP/Testing/Source/Tests/SupportTestsF32.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/SupportTestsF32.cpp
@@ -2,7 +2,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "Error.h"
-#include "arm_math.h"
 #include "Test.h"
 
 #define SNR_THRESHOLD 120
diff --git a/CMSIS/DSP/Testing/Source/Tests/SupportTestsQ15.cpp b/CMSIS/DSP/Testing/Source/Tests/SupportTestsQ15.cpp
index e0eb839..7bf911a 100755
--- a/CMSIS/DSP/Testing/Source/Tests/SupportTestsQ15.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/SupportTestsQ15.cpp
@@ -1,7 +1,6 @@
 #include "SupportTestsQ15.h"
 #include <stdio.h>
 #include "Error.h"
-#include "arm_math.h"
 #include "Test.h"
 
 #define SNR_THRESHOLD 120
diff --git a/CMSIS/DSP/Testing/Source/Tests/SupportTestsQ31.cpp b/CMSIS/DSP/Testing/Source/Tests/SupportTestsQ31.cpp
index 010c752..a682c80 100755
--- a/CMSIS/DSP/Testing/Source/Tests/SupportTestsQ31.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/SupportTestsQ31.cpp
@@ -1,7 +1,6 @@
 #include "SupportTestsQ31.h"
 #include <stdio.h>
 #include "Error.h"
-#include "arm_math.h"
 #include "Test.h"
 
 #define SNR_THRESHOLD 120
diff --git a/CMSIS/DSP/Testing/Source/Tests/SupportTestsQ7.cpp b/CMSIS/DSP/Testing/Source/Tests/SupportTestsQ7.cpp
index e5acc90..53c6af0 100755
--- a/CMSIS/DSP/Testing/Source/Tests/SupportTestsQ7.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/SupportTestsQ7.cpp
@@ -1,7 +1,6 @@
 #include "SupportTestsQ7.h"
 #include <stdio.h>
 #include "Error.h"
-#include "arm_math.h"
 #include "Test.h"
 
 #define SNR_THRESHOLD 120
diff --git a/CMSIS/DSP/Testing/Source/Tests/TransformCF16.cpp b/CMSIS/DSP/Testing/Source/Tests/TransformCF16.cpp
index 5544774..aeaab85 100755
--- a/CMSIS/DSP/Testing/Source/Tests/TransformCF16.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/TransformCF16.cpp
@@ -1,4 +1,3 @@
-#include "arm_math_f16.h"
 #include "TransformCF16.h"
 #include <stdio.h>
 #include "Error.h"
@@ -34,7 +33,8 @@
     void TransformCF16::setUp(Testing::testID_t id,std::vector<Testing::param_t>& paramsArgs,Client::PatternMgr *mgr)
     {
 
-
+       (void)paramsArgs;
+       
        switch(id)
        {
           case TransformCF16::TEST_CFFT_F16_1:
@@ -476,5 +476,6 @@
 
     void TransformCF16::tearDown(Testing::testID_t id,Client::PatternMgr *mgr)
     {
+        (void)id;
         outputfft.dump(mgr);
     }
diff --git a/CMSIS/DSP/Testing/Source/Tests/TransformCF32.cpp b/CMSIS/DSP/Testing/Source/Tests/TransformCF32.cpp
index 705a9d1..ef37b86 100755
--- a/CMSIS/DSP/Testing/Source/Tests/TransformCF32.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/TransformCF32.cpp
@@ -1,7 +1,6 @@
 #include "TransformCF32.h"
 #include <stdio.h>
 #include "Error.h"
-#include "arm_math.h"
 #include "Test.h"
 
 #define SNR_THRESHOLD 120
diff --git a/CMSIS/DSP/Testing/Source/Tests/TransformCF64.cpp b/CMSIS/DSP/Testing/Source/Tests/TransformCF64.cpp
index f8c3235..cab120e 100755
--- a/CMSIS/DSP/Testing/Source/Tests/TransformCF64.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/TransformCF64.cpp
@@ -1,7 +1,6 @@
 #include "TransformCF64.h"
 #include <stdio.h>
 #include "Error.h"
-#include "arm_math.h"
 #include "Test.h"
 
 #define SNR_THRESHOLD 250
diff --git a/CMSIS/DSP/Testing/Source/Tests/TransformCQ15.cpp b/CMSIS/DSP/Testing/Source/Tests/TransformCQ15.cpp
index 50ddc6c..d1a1e79 100755
--- a/CMSIS/DSP/Testing/Source/Tests/TransformCQ15.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/TransformCQ15.cpp
@@ -1,7 +1,6 @@
 #include "TransformCQ15.h"
 #include <stdio.h>
 #include "Error.h"
-#include "arm_math.h"
 #include "Test.h"
 
 #define SNR_THRESHOLD 30
diff --git a/CMSIS/DSP/Testing/Source/Tests/TransformCQ31.cpp b/CMSIS/DSP/Testing/Source/Tests/TransformCQ31.cpp
index a8bdf80..bd3fedb 100755
--- a/CMSIS/DSP/Testing/Source/Tests/TransformCQ31.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/TransformCQ31.cpp
@@ -1,7 +1,6 @@
 #include "TransformCQ31.h"
 #include <stdio.h>
 #include "Error.h"
-#include "arm_math.h"
 #include "Test.h"
 
 #define SNR_THRESHOLD 90
diff --git a/CMSIS/DSP/Testing/Source/Tests/TransformRF32.cpp b/CMSIS/DSP/Testing/Source/Tests/TransformRF32.cpp
index b7747f2..08143de 100755
--- a/CMSIS/DSP/Testing/Source/Tests/TransformRF32.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/TransformRF32.cpp
@@ -1,7 +1,6 @@
 #include "TransformRF32.h"
 #include <stdio.h>
 #include "Error.h"
-#include "arm_math.h"
 #include "Test.h"
 
 
diff --git a/CMSIS/DSP/Testing/Source/Tests/TransformRF64.cpp b/CMSIS/DSP/Testing/Source/Tests/TransformRF64.cpp
index b2ba7ee..05a26e4 100755
--- a/CMSIS/DSP/Testing/Source/Tests/TransformRF64.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/TransformRF64.cpp
@@ -1,7 +1,6 @@
 #include "TransformRF64.h"
 #include <stdio.h>
 #include "Error.h"
-#include "arm_math.h"
 #include "Test.h"
 
 
diff --git a/CMSIS/DSP/Testing/Source/Tests/TransformRQ15.cpp b/CMSIS/DSP/Testing/Source/Tests/TransformRQ15.cpp
index 48353c7..2f3deec 100755
--- a/CMSIS/DSP/Testing/Source/Tests/TransformRQ15.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/TransformRQ15.cpp
@@ -1,7 +1,6 @@
 #include "TransformRQ15.h"
 #include <stdio.h>
 #include "Error.h"
-#include "arm_math.h"
 #include "Test.h"
 
 
diff --git a/CMSIS/DSP/Testing/Source/Tests/TransformRQ31.cpp b/CMSIS/DSP/Testing/Source/Tests/TransformRQ31.cpp
index 0c4dc72..5038603 100755
--- a/CMSIS/DSP/Testing/Source/Tests/TransformRQ31.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/TransformRQ31.cpp
@@ -1,7 +1,6 @@
 #include "TransformRQ31.h"
 #include <stdio.h>
 #include "Error.h"
-#include "arm_math.h"
 #include "Test.h"
 
 
diff --git a/CMSIS/DSP/Testing/Source/Tests/UnaryTestsF64.cpp b/CMSIS/DSP/Testing/Source/Tests/UnaryTestsF64.cpp
index 562948b..bac9afe 100755
--- a/CMSIS/DSP/Testing/Source/Tests/UnaryTestsF64.cpp
+++ b/CMSIS/DSP/Testing/Source/Tests/UnaryTestsF64.cpp
@@ -1,4 +1,3 @@
-#include "arm_math.h"
 #include "UnaryTestsF64.h"
 #include <stdio.h>
 #include "Error.h"
diff --git a/CMSIS/DSP/Testing/main.cpp b/CMSIS/DSP/Testing/main.cpp
index e82d86b..0a54767 100644
--- a/CMSIS/DSP/Testing/main.cpp
+++ b/CMSIS/DSP/Testing/main.cpp
@@ -1,5 +1,5 @@
 #include <cstdio>
-#include "arm_math.h"
+#include "arm_math_types.h"
 extern int testmain(const char *);
 
 extern "C" const char *patternData;