diff --git a/dl/dl.gyp b/dl/dl.gyp
index fb7386f..f0f0eb7 100644
--- a/dl/dl.gyp
+++ b/dl/dl.gyp
@@ -15,59 +15,62 @@
     {
       'target_name': 'arm_fft',
       'type': 'static_library',
+      'include_dirs': [
+        '../',
+      ],
       'sources': [
-        'armCOMM.h',
-        'armCOMM_s.h',
-        'armOMX.h',
-        'armSP.h',
-        'omxSP.h',
-        'omxtypes.h',
-        'omxtypes_s.h',
+        'api/armCOMM.h',
+        'api/armCOMM_s.h',
+        'api/armOMX.h',
+        'api/omxtypes.h',
+        'api/omxtypes_s.h',
+        'sp/api/armSP.h',
+        'sp/api/omxSP.h',
         # Complex 32-bit fixed-point FFT.
-        'armSP_FFT_S32TwiddleTable.c',
-        'omxSP_FFTGetBufSize_C_SC32.c',
-        'omxSP_FFTInit_C_SC32.c',
-        'armSP_FFT_CToC_SC32_Radix2_fs_unsafe_s.S',
-        'armSP_FFT_CToC_SC32_Radix2_ls_unsafe_s.S',
-        'armSP_FFT_CToC_SC32_Radix2_fs_unsafe_s.S',
-        'armSP_FFT_CToC_SC32_Radix4_fs_unsafe_s.S',
-        'armSP_FFT_CToC_SC32_Radix4_ls_unsafe_s.S',
-        'armSP_FFT_CToC_SC32_Radix2_unsafe_s.S',
-        'armSP_FFT_CToC_SC32_Radix4_unsafe_s.S',
-        'armSP_FFT_CToC_SC32_Radix8_fs_unsafe_s.S',
-        'omxSP_FFTInv_CToC_SC32_Sfs_s.S',
-        'omxSP_FFTFwd_CToC_SC32_Sfs_s.S',
+        'sp/src/armSP_FFT_S32TwiddleTable.c',
+        'sp/src/omxSP_FFTGetBufSize_C_SC32.c',
+        'sp/src/omxSP_FFTInit_C_SC32.c',
+        'sp/src/armSP_FFT_CToC_SC32_Radix2_fs_unsafe_s.S',
+        'sp/src/armSP_FFT_CToC_SC32_Radix2_ls_unsafe_s.S',
+        'sp/src/armSP_FFT_CToC_SC32_Radix2_fs_unsafe_s.S',
+        'sp/src/armSP_FFT_CToC_SC32_Radix4_fs_unsafe_s.S',
+        'sp/src/armSP_FFT_CToC_SC32_Radix4_ls_unsafe_s.S',
+        'sp/src/armSP_FFT_CToC_SC32_Radix2_unsafe_s.S',
+        'sp/src/armSP_FFT_CToC_SC32_Radix4_unsafe_s.S',
+        'sp/src/armSP_FFT_CToC_SC32_Radix8_fs_unsafe_s.S',
+        'sp/src/omxSP_FFTInv_CToC_SC32_Sfs_s.S',
+        'sp/src/omxSP_FFTFwd_CToC_SC32_Sfs_s.S',
         # Real 32-bit fixed-point FFT
-        'armSP_FFTInv_CCSToR_S32_preTwiddleRadix2_unsafe_s.S',
-        'omxSP_FFTFwd_RToCCS_S32_Sfs_s.S',
-        'omxSP_FFTGetBufSize_R_S32.c',
-        'omxSP_FFTInit_R_S32.c',
-        'omxSP_FFTInv_CCSToR_S32_Sfs_s.S',
+        'sp/src/armSP_FFTInv_CCSToR_S32_preTwiddleRadix2_unsafe_s.S',
+        'sp/src/omxSP_FFTFwd_RToCCS_S32_Sfs_s.S',
+        'sp/src/omxSP_FFTGetBufSize_R_S32.c',
+        'sp/src/omxSP_FFTInit_R_S32.c',
+        'sp/src/omxSP_FFTInv_CCSToR_S32_Sfs_s.S',
         # Real 16-bit fixed-point FFT
-        'omxSP_FFTFwd_RToCCS_S16S32_Sfs_s.S',
-        'omxSP_FFTGetBufSize_R_S16S32.c',
-        'omxSP_FFTInit_R_S16S32.c',
-        'omxSP_FFTInv_CCSToR_S32S16_Sfs_s.S',
+        'sp/src/omxSP_FFTFwd_RToCCS_S16S32_Sfs_s.S',
+        'sp/src/omxSP_FFTGetBufSize_R_S16S32.c',
+        'sp/src/omxSP_FFTInit_R_S16S32.c',
+        'sp/src/omxSP_FFTInv_CCSToR_S32S16_Sfs_s.S',
         # Complex floating-point FFT
-        'armSP_FFT_CToC_FC32_Radix2_fs_unsafe_s.S',
-        'armSP_FFT_CToC_FC32_Radix2_ls_unsafe_s.S',
-        'armSP_FFT_CToC_FC32_Radix2_fs_unsafe_s.S',
-        'armSP_FFT_CToC_FC32_Radix4_fs_unsafe_s.S',
-        'armSP_FFT_CToC_FC32_Radix4_ls_unsafe_s.S',
-        'armSP_FFT_CToC_FC32_Radix2_unsafe_s.S',
-        'armSP_FFT_CToC_FC32_Radix4_unsafe_s.S',
-        'armSP_FFT_CToC_FC32_Radix8_fs_unsafe_s.S',
-        'armSP_FFT_F32TwiddleTable.c',
-        'omxSP_FFTGetBufSize_C_FC32.c',
-        'omxSP_FFTInit_C_FC32.c',
-        'omxSP_FFTInv_CToC_FC32_Sfs_s.S',
-        'omxSP_FFTFwd_CToC_FC32_Sfs_s.S',
+        'sp/src/armSP_FFT_CToC_FC32_Radix2_fs_unsafe_s.S',
+        'sp/src/armSP_FFT_CToC_FC32_Radix2_ls_unsafe_s.S',
+        'sp/src/armSP_FFT_CToC_FC32_Radix2_fs_unsafe_s.S',
+        'sp/src/armSP_FFT_CToC_FC32_Radix4_fs_unsafe_s.S',
+        'sp/src/armSP_FFT_CToC_FC32_Radix4_ls_unsafe_s.S',
+        'sp/src/armSP_FFT_CToC_FC32_Radix2_unsafe_s.S',
+        'sp/src/armSP_FFT_CToC_FC32_Radix4_unsafe_s.S',
+        'sp/src/armSP_FFT_CToC_FC32_Radix8_fs_unsafe_s.S',
+        'sp/src/armSP_FFT_F32TwiddleTable.c',
+        'sp/src/omxSP_FFTGetBufSize_C_FC32.c',
+        'sp/src/omxSP_FFTInit_C_FC32.c',
+        'sp/src/omxSP_FFTInv_CToC_FC32_Sfs_s.S',
+        'sp/src/omxSP_FFTFwd_CToC_FC32_Sfs_s.S',
         # Real floating-point FFT
-        'armSP_FFTInv_CCSToR_F32_preTwiddleRadix2_unsafe_s.S',
-        'omxSP_FFTFwd_RToCCS_F32_Sfs_s.S',
-        'omxSP_FFTGetBufSize_R_F32.c',
-        'omxSP_FFTInit_R_F32.c',
-        'omxSP_FFTInv_CCSToR_F32_Sfs_s.S',
+        'sp/src/armSP_FFTInv_CCSToR_F32_preTwiddleRadix2_unsafe_s.S',
+        'sp/src/omxSP_FFTFwd_RToCCS_F32_Sfs_s.S',
+        'sp/src/omxSP_FFTGetBufSize_R_F32.c',
+        'sp/src/omxSP_FFTInit_R_F32.c',
+        'sp/src/omxSP_FFTInv_CCSToR_F32_Sfs_s.S',
       ],
       'conditions' : [
         ['big_float_fft == 1', {
diff --git a/dl/sp/api/armSP.h b/dl/sp/api/armSP.h
index 27528ef..f615a87 100644
--- a/dl/sp/api/armSP.h
+++ b/dl/sp/api/armSP.h
@@ -29,7 +29,7 @@
 #ifndef _armSP_H_
 #define _armSP_H_
 
-#include "omxtypes.h"
+#include "dl/api/omxtypes.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/dl/sp/api/omxSP.h b/dl/sp/api/omxSP.h
index b0ad9cb..2a16cc0 100644
--- a/dl/sp/api/omxSP.h
+++ b/dl/sp/api/omxSP.h
@@ -46,7 +46,7 @@
 #ifndef _OMXSP_H_
 #define _OMXSP_H_
 
-#include "omxtypes.h"
+#include "dl/api/omxtypes.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/dl/sp/src/armSP_FFTInv_CCSToR_F32_preTwiddleRadix2_unsafe_s.S b/dl/sp/src/armSP_FFTInv_CCSToR_F32_preTwiddleRadix2_unsafe_s.S
index 1cacafc..f375991 100644
--- a/dl/sp/src/armSP_FFTInv_CCSToR_F32_preTwiddleRadix2_unsafe_s.S
+++ b/dl/sp/src/armSP_FFTInv_CCSToR_F32_preTwiddleRadix2_unsafe_s.S
@@ -22,8 +22,8 @@
 
 @// Include standard headers
 
-#include "omxtypes_s.h"
-#include "armCOMM_s.h"
+#include "dl/api/armCOMM_s.h"
+#include "dl/api/omxtypes_s.h"
 
 
 @// Import symbols required from other files
diff --git a/dl/sp/src/armSP_FFTInv_CCSToR_S32_preTwiddleRadix2_unsafe_s.S b/dl/sp/src/armSP_FFTInv_CCSToR_S32_preTwiddleRadix2_unsafe_s.S
index bc1cad0..57fef7a 100644
--- a/dl/sp/src/armSP_FFTInv_CCSToR_S32_preTwiddleRadix2_unsafe_s.S
+++ b/dl/sp/src/armSP_FFTInv_CCSToR_S32_preTwiddleRadix2_unsafe_s.S
@@ -30,8 +30,8 @@
         
 @// Include standard headers
 
-#include "omxtypes_s.h"
-#include "armCOMM_s.h"
+#include "dl/api/armCOMM_s.h"
+#include "dl/api/omxtypes_s.h"
         
         
 @// Import symbols required from other files
diff --git a/dl/sp/src/armSP_FFT_CToC_FC32_Radix2_fs_unsafe_s.S b/dl/sp/src/armSP_FFT_CToC_FC32_Radix2_fs_unsafe_s.S
index c5aefd5..323eb83 100644
--- a/dl/sp/src/armSP_FFT_CToC_FC32_Radix2_fs_unsafe_s.S
+++ b/dl/sp/src/armSP_FFT_CToC_FC32_Radix2_fs_unsafe_s.S
@@ -21,8 +21,8 @@
 
 @// Include standard headers
 
-#include "omxtypes_s.h"
-#include "armCOMM_s.h"
+#include "dl/api/armCOMM_s.h"
+#include "dl/api/omxtypes_s.h"
 
 
 @// Import symbols required from other files
diff --git a/dl/sp/src/armSP_FFT_CToC_FC32_Radix2_ls_unsafe_s.S b/dl/sp/src/armSP_FFT_CToC_FC32_Radix2_ls_unsafe_s.S
index 6000813..02f3888 100644
--- a/dl/sp/src/armSP_FFT_CToC_FC32_Radix2_ls_unsafe_s.S
+++ b/dl/sp/src/armSP_FFT_CToC_FC32_Radix2_ls_unsafe_s.S
@@ -21,8 +21,8 @@
 
 @// Include standard headers
 
-#include "omxtypes_s.h"
-#include "armCOMM_s.h"
+#include "dl/api/armCOMM_s.h"
+#include "dl/api/omxtypes_s.h"
 
 
 @// Import symbols required from other files
diff --git a/dl/sp/src/armSP_FFT_CToC_FC32_Radix2_unsafe_s.S b/dl/sp/src/armSP_FFT_CToC_FC32_Radix2_unsafe_s.S
index 7c888ee..73c1f4b 100644
--- a/dl/sp/src/armSP_FFT_CToC_FC32_Radix2_unsafe_s.S
+++ b/dl/sp/src/armSP_FFT_CToC_FC32_Radix2_unsafe_s.S
@@ -21,8 +21,8 @@
 
 @// Include standard headers
 
-#include "omxtypes_s.h"
-#include "armCOMM_s.h"
+#include "dl/api/armCOMM_s.h"
+#include "dl/api/omxtypes_s.h"
 
 
 @// Import symbols required from other files
diff --git a/dl/sp/src/armSP_FFT_CToC_FC32_Radix4_fs_unsafe_s.S b/dl/sp/src/armSP_FFT_CToC_FC32_Radix4_fs_unsafe_s.S
index b66a8ef..a463a10 100644
--- a/dl/sp/src/armSP_FFT_CToC_FC32_Radix4_fs_unsafe_s.S
+++ b/dl/sp/src/armSP_FFT_CToC_FC32_Radix4_fs_unsafe_s.S
@@ -21,8 +21,8 @@
 
 @// Include standard headers
 
-#include "omxtypes_s.h"
-#include "armCOMM_s.h"
+#include "dl/api/armCOMM_s.h"
+#include "dl/api/omxtypes_s.h"
 
 @// Import symbols required from other files
 @// (For example tables)
diff --git a/dl/sp/src/armSP_FFT_CToC_FC32_Radix4_ls_unsafe_s.S b/dl/sp/src/armSP_FFT_CToC_FC32_Radix4_ls_unsafe_s.S
index 8a840ed..091f600 100644
--- a/dl/sp/src/armSP_FFT_CToC_FC32_Radix4_ls_unsafe_s.S
+++ b/dl/sp/src/armSP_FFT_CToC_FC32_Radix4_ls_unsafe_s.S
@@ -20,8 +20,8 @@
 
 @// Include standard headers
 
-#include "omxtypes_s.h"
-#include "armCOMM_s.h"
+#include "dl/api/armCOMM_s.h"
+#include "dl/api/omxtypes_s.h"
 
 @// Import symbols required from other files
 @// (For example tables)
diff --git a/dl/sp/src/armSP_FFT_CToC_FC32_Radix4_unsafe_s.S b/dl/sp/src/armSP_FFT_CToC_FC32_Radix4_unsafe_s.S
index 6405483..355fa0f 100644
--- a/dl/sp/src/armSP_FFT_CToC_FC32_Radix4_unsafe_s.S
+++ b/dl/sp/src/armSP_FFT_CToC_FC32_Radix4_unsafe_s.S
@@ -21,8 +21,8 @@
 
 @// Include standard headers
 
-#include "omxtypes_s.h"
-#include "armCOMM_s.h"
+#include "dl/api/armCOMM_s.h"
+#include "dl/api/omxtypes_s.h"
 
 
 @// Import symbols required from other files
diff --git a/dl/sp/src/armSP_FFT_CToC_FC32_Radix8_fs_unsafe_s.S b/dl/sp/src/armSP_FFT_CToC_FC32_Radix8_fs_unsafe_s.S
index d6eb71b..72a0c8f 100644
--- a/dl/sp/src/armSP_FFT_CToC_FC32_Radix8_fs_unsafe_s.S
+++ b/dl/sp/src/armSP_FFT_CToC_FC32_Radix8_fs_unsafe_s.S
@@ -20,8 +20,8 @@
 
 @// Include standard headers
 
-#include "omxtypes_s.h"
-#include "armCOMM_s.h"
+#include "dl/api/armCOMM_s.h"
+#include "dl/api/omxtypes_s.h"
 
 @// Import symbols required from other files
 @// (For example tables)
diff --git a/dl/sp/src/armSP_FFT_CToC_SC32_Radix2_fs_unsafe_s.S b/dl/sp/src/armSP_FFT_CToC_SC32_Radix2_fs_unsafe_s.S
index fa3df3d..3bc5f02 100644
--- a/dl/sp/src/armSP_FFT_CToC_SC32_Radix2_fs_unsafe_s.S
+++ b/dl/sp/src/armSP_FFT_CToC_SC32_Radix2_fs_unsafe_s.S
@@ -29,8 +29,8 @@
         
 @// Include standard headers
 
-#include "omxtypes_s.h"
-#include "armCOMM_s.h"
+#include "dl/api/armCOMM_s.h"
+#include "dl/api/omxtypes_s.h"
         
         
 @// Import symbols required from other files
diff --git a/dl/sp/src/armSP_FFT_CToC_SC32_Radix2_ls_unsafe_s.S b/dl/sp/src/armSP_FFT_CToC_SC32_Radix2_ls_unsafe_s.S
index 568587a..30a8f56 100644
--- a/dl/sp/src/armSP_FFT_CToC_SC32_Radix2_ls_unsafe_s.S
+++ b/dl/sp/src/armSP_FFT_CToC_SC32_Radix2_ls_unsafe_s.S
@@ -30,8 +30,8 @@
         
 @// Include standard headers
 
-#include "omxtypes_s.h"
-#include "armCOMM_s.h"
+#include "dl/api/armCOMM_s.h"
+#include "dl/api/omxtypes_s.h"
         
         
 @// Import symbols required from other files
diff --git a/dl/sp/src/armSP_FFT_CToC_SC32_Radix2_unsafe_s.S b/dl/sp/src/armSP_FFT_CToC_SC32_Radix2_unsafe_s.S
index d103df1..a9700ec 100644
--- a/dl/sp/src/armSP_FFT_CToC_SC32_Radix2_unsafe_s.S
+++ b/dl/sp/src/armSP_FFT_CToC_SC32_Radix2_unsafe_s.S
@@ -29,8 +29,8 @@
         
 @// Include standard headers
 
-#include "omxtypes_s.h"
-#include "armCOMM_s.h"
+#include "dl/api/armCOMM_s.h"
+#include "dl/api/omxtypes_s.h"
         
         
 @// Import symbols required from other files
diff --git a/dl/sp/src/armSP_FFT_CToC_SC32_Radix4_fs_unsafe_s.S b/dl/sp/src/armSP_FFT_CToC_SC32_Radix4_fs_unsafe_s.S
index 2d82124..685f85b 100644
--- a/dl/sp/src/armSP_FFT_CToC_SC32_Radix4_fs_unsafe_s.S
+++ b/dl/sp/src/armSP_FFT_CToC_SC32_Radix4_fs_unsafe_s.S
@@ -29,8 +29,8 @@
         
 @// Include standard headers
 
-#include "omxtypes_s.h"
-#include "armCOMM_s.h"
+#include "dl/api/armCOMM_s.h"
+#include "dl/api/omxtypes_s.h"
         
 @// Import symbols required from other files
 @// (For example tables)
diff --git a/dl/sp/src/armSP_FFT_CToC_SC32_Radix4_ls_unsafe_s.S b/dl/sp/src/armSP_FFT_CToC_SC32_Radix4_ls_unsafe_s.S
index 101a65e..1b5478b 100644
--- a/dl/sp/src/armSP_FFT_CToC_SC32_Radix4_ls_unsafe_s.S
+++ b/dl/sp/src/armSP_FFT_CToC_SC32_Radix4_ls_unsafe_s.S
@@ -28,8 +28,8 @@
         
 @// Include standard headers
 
-#include "omxtypes_s.h"
-#include "armCOMM_s.h"
+#include "dl/api/armCOMM_s.h"
+#include "dl/api/omxtypes_s.h"
         
 @// Import symbols required from other files
 @// (For example tables)
diff --git a/dl/sp/src/armSP_FFT_CToC_SC32_Radix4_unsafe_s.S b/dl/sp/src/armSP_FFT_CToC_SC32_Radix4_unsafe_s.S
index 5a2e21b..3c23983 100644
--- a/dl/sp/src/armSP_FFT_CToC_SC32_Radix4_unsafe_s.S
+++ b/dl/sp/src/armSP_FFT_CToC_SC32_Radix4_unsafe_s.S
@@ -30,8 +30,8 @@
         
 @// Include standard headers
 
-#include "omxtypes_s.h"
-#include "armCOMM_s.h"
+#include "dl/api/armCOMM_s.h"
+#include "dl/api/omxtypes_s.h"
         
         
 @// Import symbols required from other files
diff --git a/dl/sp/src/armSP_FFT_CToC_SC32_Radix8_fs_unsafe_s.S b/dl/sp/src/armSP_FFT_CToC_SC32_Radix8_fs_unsafe_s.S
index 5fd8d9b..4c80b20 100644
--- a/dl/sp/src/armSP_FFT_CToC_SC32_Radix8_fs_unsafe_s.S
+++ b/dl/sp/src/armSP_FFT_CToC_SC32_Radix8_fs_unsafe_s.S
@@ -30,8 +30,8 @@
         
 @// Include standard headers
 
-#include "omxtypes_s.h"
-#include "armCOMM_s.h"
+#include "dl/api/armCOMM_s.h"
+#include "dl/api/omxtypes_s.h"
         
 @// Import symbols required from other files
 @// (For example tables)
diff --git a/dl/sp/src/armSP_FFT_F32TwiddleTable.c b/dl/sp/src/armSP_FFT_F32TwiddleTable.c
index 78cd8a4..87d9861 100644
--- a/dl/sp/src/armSP_FFT_F32TwiddleTable.c
+++ b/dl/sp/src/armSP_FFT_F32TwiddleTable.c
@@ -20,7 +20,7 @@
  * We use the negative to be consistent with the S32 version.
 **/
 
-#include "omxtypes.h"
+#include "dl/api/omxtypes.h"
 
 #define TWIDDLE_TABLE_ENTRIES ((1 << TWIDDLE_TABLE_ORDER) / 8)
 
diff --git a/dl/sp/src/armSP_FFT_S32TwiddleTable.c b/dl/sp/src/armSP_FFT_S32TwiddleTable.c
index 25807e0..a0db057 100644
--- a/dl/sp/src/armSP_FFT_S32TwiddleTable.c
+++ b/dl/sp/src/armSP_FFT_S32TwiddleTable.c
@@ -33,7 +33,7 @@
  * represented as Q31 in 32 bits. 
 **/
 
-#include "omxtypes.h"
+#include "dl/api/omxtypes.h"
 
 
 const OMX_S32 armSP_FFT_S32TwiddleTable[1026] ={
diff --git a/dl/sp/src/omxSP_FFTFwd_CToC_FC32_Sfs_s.S b/dl/sp/src/omxSP_FFTFwd_CToC_FC32_Sfs_s.S
index 65c1653..da0c10f 100644
--- a/dl/sp/src/omxSP_FFTFwd_CToC_FC32_Sfs_s.S
+++ b/dl/sp/src/omxSP_FFTFwd_CToC_FC32_Sfs_s.S
@@ -20,8 +20,8 @@
 
 @// Include standard headers
 
-#include "omxtypes_s.h"
-#include "armCOMM_s.h"
+#include "dl/api/armCOMM_s.h"
+#include "dl/api/omxtypes_s.h"
 
 @// Import symbols required from other files
 @// (For example tables)
diff --git a/dl/sp/src/omxSP_FFTFwd_CToC_SC32_Sfs_s.S b/dl/sp/src/omxSP_FFTFwd_CToC_SC32_Sfs_s.S
index 17287ec..90f969a 100644
--- a/dl/sp/src/omxSP_FFTFwd_CToC_SC32_Sfs_s.S
+++ b/dl/sp/src/omxSP_FFTFwd_CToC_SC32_Sfs_s.S
@@ -27,8 +27,8 @@
         
 @// Include standard headers
 
-#include "omxtypes_s.h"
-#include "armCOMM_s.h"
+#include "dl/api/armCOMM_s.h"
+#include "dl/api/omxtypes_s.h"
         
 @// Import symbols required from other files
 @// (For example tables)
diff --git a/dl/sp/src/omxSP_FFTFwd_RToCCS_F32_Sfs_s.S b/dl/sp/src/omxSP_FFTFwd_RToCCS_F32_Sfs_s.S
index 850fa9c..1389854 100644
--- a/dl/sp/src/omxSP_FFTFwd_RToCCS_F32_Sfs_s.S
+++ b/dl/sp/src/omxSP_FFTFwd_RToCCS_F32_Sfs_s.S
@@ -20,8 +20,8 @@
 
 @// Include standard headers
 
-#include "omxtypes_s.h"
-#include "armCOMM_s.h"
+#include "dl/api/armCOMM_s.h"
+#include "dl/api/omxtypes_s.h"
 
 
 @// Import symbols required from other files
diff --git a/dl/sp/src/omxSP_FFTFwd_RToCCS_S16S32_Sfs_s.S b/dl/sp/src/omxSP_FFTFwd_RToCCS_S16S32_Sfs_s.S
index 73b02d0..84d2300 100644
--- a/dl/sp/src/omxSP_FFTFwd_RToCCS_S16S32_Sfs_s.S
+++ b/dl/sp/src/omxSP_FFTFwd_RToCCS_S16S32_Sfs_s.S
@@ -28,8 +28,8 @@
         
 @// Include standard headers
 
-#include "omxtypes_s.h"
-#include "armCOMM_s.h"
+#include "dl/api/armCOMM_s.h"
+#include "dl/api/omxtypes_s.h"
         
         
 @// Import symbols required from other files
diff --git a/dl/sp/src/omxSP_FFTFwd_RToCCS_S32_Sfs_s.S b/dl/sp/src/omxSP_FFTFwd_RToCCS_S32_Sfs_s.S
index eaef25e..a742162 100644
--- a/dl/sp/src/omxSP_FFTFwd_RToCCS_S32_Sfs_s.S
+++ b/dl/sp/src/omxSP_FFTFwd_RToCCS_S32_Sfs_s.S
@@ -29,8 +29,8 @@
         
 @// Include standard headers
 
-#include "omxtypes_s.h"
-#include "armCOMM_s.h"
+#include "dl/api/armCOMM_s.h"
+#include "dl/api/omxtypes_s.h"
         
         
 @// Import symbols required from other files
diff --git a/dl/sp/src/omxSP_FFTGetBufSize_C_FC32.c b/dl/sp/src/omxSP_FFTGetBufSize_C_FC32.c
index 3d43686..a513d1b 100644
--- a/dl/sp/src/omxSP_FFTGetBufSize_C_FC32.c
+++ b/dl/sp/src/omxSP_FFTGetBufSize_C_FC32.c
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "armOMX.h"
-#include "armSP.h"
-#include "omxSP.h"
-#include "omxtypes.h"
+#include "dl/api/armOMX.h"
+#include "dl/api/omxtypes.h"
+#include "dl/sp/api/armSP.h"
+#include "dl/sp/api/omxSP.h"
 
 
 /**
diff --git a/dl/sp/src/omxSP_FFTGetBufSize_C_SC16.c b/dl/sp/src/omxSP_FFTGetBufSize_C_SC16.c
index 7a19848..ce87d1f 100644
--- a/dl/sp/src/omxSP_FFTGetBufSize_C_SC16.c
+++ b/dl/sp/src/omxSP_FFTGetBufSize_C_SC16.c
@@ -25,12 +25,11 @@
  * Compute the size of the specification structure required
  */
 
-#include "omxtypes.h"
-#include "armOMX.h"
-#include "omxSP.h"
-
-#include "armCOMM.h"
-#include "armSP.h"
+#include "dl/api/armCOMM.h"
+#include "dl/api/armOMX.h"
+#include "dl/api/omxtypes.h"
+#include "dl/sp/api/armSP.h"
+#include "dl/sp/api/omxSP.h"
 
 
 /**
diff --git a/dl/sp/src/omxSP_FFTGetBufSize_C_SC32.c b/dl/sp/src/omxSP_FFTGetBufSize_C_SC32.c
index c7ef65b..0ca3b56 100644
--- a/dl/sp/src/omxSP_FFTGetBufSize_C_SC32.c
+++ b/dl/sp/src/omxSP_FFTGetBufSize_C_SC32.c
@@ -25,11 +25,11 @@
  * Compute the size of the specification structure required
  */
 
-#include "omxtypes.h"
-#include "armOMX.h"
-#include "omxSP.h"
+#include "dl/api/armOMX.h"
+#include "dl/api/omxtypes.h"
+#include "dl/sp/api/armSP.h"
+#include "dl/sp/api/omxSP.h"
 
-#include "armSP.h"
 
 /**
  * Function:  omxSP_FFTGetBufSize_C_SC32   (2.2.4.1.6)
diff --git a/dl/sp/src/omxSP_FFTGetBufSize_R_F32.c b/dl/sp/src/omxSP_FFTGetBufSize_R_F32.c
index 9f2787b..d98995d 100644
--- a/dl/sp/src/omxSP_FFTGetBufSize_R_F32.c
+++ b/dl/sp/src/omxSP_FFTGetBufSize_R_F32.c
@@ -9,11 +9,11 @@
  *
  */
 
-#include "armCOMM.h"
-#include "armOMX.h"
-#include "armSP.h"
-#include "omxSP.h"
-#include "omxtypes.h"
+#include "dl/api/armCOMM.h"
+#include "dl/api/armOMX.h"
+#include "dl/api/omxtypes.h"
+#include "dl/sp/api/armSP.h"
+#include "dl/sp/api/omxSP.h"
 
 /**
  * Function: omxSP_FFTGetBufSize_R_F32
diff --git a/dl/sp/src/omxSP_FFTGetBufSize_R_S16S32.c b/dl/sp/src/omxSP_FFTGetBufSize_R_S16S32.c
index 26f1f31..9512e92 100644
--- a/dl/sp/src/omxSP_FFTGetBufSize_R_S16S32.c
+++ b/dl/sp/src/omxSP_FFTGetBufSize_R_S16S32.c
@@ -25,11 +25,11 @@
  * Computes the size of the specification structure required.
  */
 
-#include "omxtypes.h"
-#include "armOMX.h"
-#include "omxSP.h"
-#include "armCOMM.h"
-#include "armSP.h"
+#include "dl/api/armCOMM.h"
+#include "dl/api/armOMX.h"
+#include "dl/api/omxtypes.h"
+#include "dl/sp/api/armSP.h"
+#include "dl/sp/api/omxSP.h"
 
 /**
  * Function: omxSP_FFTGetBufSize_R_S16S32
diff --git a/dl/sp/src/omxSP_FFTGetBufSize_R_S32.c b/dl/sp/src/omxSP_FFTGetBufSize_R_S32.c
index 0be596e..bedf677 100644
--- a/dl/sp/src/omxSP_FFTGetBufSize_R_S32.c
+++ b/dl/sp/src/omxSP_FFTGetBufSize_R_S32.c
@@ -25,11 +25,11 @@
  * Computes the size of the specification structure required.
  */
 
-#include "omxtypes.h"
-#include "armOMX.h"
-#include "omxSP.h"
-#include "armCOMM.h"
-#include "armSP.h"
+#include "dl/api/armCOMM.h"
+#include "dl/api/armOMX.h"
+#include "dl/api/omxtypes.h"
+#include "dl/sp/api/armSP.h"
+#include "dl/sp/api/omxSP.h"
 
 /**
  * Function: omxSP_FFTGetBufSize_R_S32
diff --git a/dl/sp/src/omxSP_FFTInit_C_FC32.c b/dl/sp/src/omxSP_FFTInit_C_FC32.c
index 7cb15ed..ce81b9a 100644
--- a/dl/sp/src/omxSP_FFTInit_C_FC32.c
+++ b/dl/sp/src/omxSP_FFTInit_C_FC32.c
@@ -11,11 +11,11 @@
  *  complex float instead of SC32.
  */
 
-#include "armCOMM.h"
-#include "armOMX.h"
-#include "armSP.h"
-#include "omxSP.h"
-#include "omxtypes.h"
+#include "dl/api/armCOMM.h"
+#include "dl/api/armOMX.h"
+#include "dl/api/omxtypes.h"
+#include "dl/sp/api/armSP.h"
+#include "dl/sp/api/omxSP.h"
 
 
 /**
diff --git a/dl/sp/src/omxSP_FFTInit_C_SC16.c b/dl/sp/src/omxSP_FFTInit_C_SC16.c
index 95b2eee..342fc0c 100644
--- a/dl/sp/src/omxSP_FFTInit_C_SC16.c
+++ b/dl/sp/src/omxSP_FFTInit_C_SC16.c
@@ -25,12 +25,11 @@
  * Initializes the specification structures required
  */
 
-#include "omxtypes.h"
-#include "armOMX.h"
-#include "omxSP.h"
-
-#include "armCOMM.h"
-#include "armSP.h"
+#include "dl/api/armCOMM.h"
+#include "dl/api/armOMX.h"
+#include "dl/api/omxtypes.h"
+#include "dl/sp/api/armSP.h"
+#include "dl/sp/api/omxSP.h"
 
 
 /**
diff --git a/dl/sp/src/omxSP_FFTInit_C_SC32.c b/dl/sp/src/omxSP_FFTInit_C_SC32.c
index fc7f745..9231d8f 100644
--- a/dl/sp/src/omxSP_FFTInit_C_SC32.c
+++ b/dl/sp/src/omxSP_FFTInit_C_SC32.c
@@ -25,12 +25,11 @@
  * Initializes the specification structures required
  */
 
-#include "omxtypes.h"
-#include "armOMX.h"
-#include "omxSP.h"
-
-#include "armCOMM.h"
-#include "armSP.h"
+#include "dl/api/armCOMM.h"
+#include "dl/api/armOMX.h"
+#include "dl/api/omxtypes.h"
+#include "dl/sp/api/armSP.h"
+#include "dl/sp/api/omxSP.h"
 
 
 /**
diff --git a/dl/sp/src/omxSP_FFTInit_R_F32.c b/dl/sp/src/omxSP_FFTInit_R_F32.c
index 7a2fe9f..e5c69fb 100644
--- a/dl/sp/src/omxSP_FFTInit_R_F32.c
+++ b/dl/sp/src/omxSP_FFTInit_R_F32.c
@@ -11,11 +11,11 @@
  *  instead of S32.
  */
 
-#include "armCOMM.h"
-#include "armOMX.h"
-#include "armSP.h"
-#include "omxSP.h"
-#include "omxtypes.h"
+#include "dl/api/armCOMM.h"
+#include "dl/api/armOMX.h"
+#include "dl/api/omxtypes.h"
+#include "dl/sp/api/armSP.h"
+#include "dl/sp/api/omxSP.h"
 
 /**
  * Function: omxSP_FFTInit_R_F32
diff --git a/dl/sp/src/omxSP_FFTInit_R_S16S32.c b/dl/sp/src/omxSP_FFTInit_R_S16S32.c
index d2210e0..34e44c7 100644
--- a/dl/sp/src/omxSP_FFTInit_R_S16S32.c
+++ b/dl/sp/src/omxSP_FFTInit_R_S16S32.c
@@ -25,11 +25,11 @@
  * Initialize the real forward-FFT specification information struct.
  */
 
-#include "omxtypes.h"
-#include "armOMX.h"
-#include "omxSP.h"
-#include "armCOMM.h"
-#include "armSP.h"
+#include "dl/api/armCOMM.h"
+#include "dl/api/armOMX.h"
+#include "dl/api/omxtypes.h"
+#include "dl/sp/api/armSP.h"
+#include "dl/sp/api/omxSP.h"
 
 
 
diff --git a/dl/sp/src/omxSP_FFTInit_R_S32.c b/dl/sp/src/omxSP_FFTInit_R_S32.c
index 7a1a225..e4f0357 100644
--- a/dl/sp/src/omxSP_FFTInit_R_S32.c
+++ b/dl/sp/src/omxSP_FFTInit_R_S32.c
@@ -25,11 +25,11 @@
  * Initialize the real forward-FFT specification information struct.
  */
 
-#include "omxtypes.h"
-#include "armOMX.h"
-#include "omxSP.h"
-#include "armCOMM.h"
-#include "armSP.h"
+#include "dl/api/armCOMM.h"
+#include "dl/api/armOMX.h"
+#include "dl/api/omxtypes.h"
+#include "dl/sp/api/armSP.h"
+#include "dl/sp/api/omxSP.h"
 
 
 
diff --git a/dl/sp/src/omxSP_FFTInv_CCSToR_F32_Sfs_s.S b/dl/sp/src/omxSP_FFTInv_CCSToR_F32_Sfs_s.S
index 19e5789..2616506 100644
--- a/dl/sp/src/omxSP_FFTInv_CCSToR_F32_Sfs_s.S
+++ b/dl/sp/src/omxSP_FFTInv_CCSToR_F32_Sfs_s.S
@@ -20,8 +20,8 @@
 
 @// Include standard headers
 
-#include "omxtypes_s.h"
-#include "armCOMM_s.h"
+#include "dl/api/armCOMM_s.h"
+#include "dl/api/omxtypes_s.h"
 
 
 @// Import symbols required from other files
diff --git a/dl/sp/src/omxSP_FFTInv_CCSToR_S32S16_Sfs_s.S b/dl/sp/src/omxSP_FFTInv_CCSToR_S32S16_Sfs_s.S
index 5ab61fe..becc032 100644
--- a/dl/sp/src/omxSP_FFTInv_CCSToR_S32S16_Sfs_s.S
+++ b/dl/sp/src/omxSP_FFTInv_CCSToR_S32S16_Sfs_s.S
@@ -29,8 +29,8 @@
         
 @// Include standard headers
 
-#include "omxtypes_s.h"
-#include "armCOMM_s.h"
+#include "dl/api/armCOMM_s.h"
+#include "dl/api/omxtypes_s.h"
         
         
 @// Import symbols required from other files
diff --git a/dl/sp/src/omxSP_FFTInv_CCSToR_S32_Sfs_s.S b/dl/sp/src/omxSP_FFTInv_CCSToR_S32_Sfs_s.S
index e547f73..003d666 100644
--- a/dl/sp/src/omxSP_FFTInv_CCSToR_S32_Sfs_s.S
+++ b/dl/sp/src/omxSP_FFTInv_CCSToR_S32_Sfs_s.S
@@ -29,8 +29,8 @@
         
 @// Include standard headers
 
-#include "omxtypes_s.h"
-#include "armCOMM_s.h"
+#include "dl/api/armCOMM_s.h"
+#include "dl/api/omxtypes_s.h"
         
         
 @// Import symbols required from other files
diff --git a/dl/sp/src/omxSP_FFTInv_CToC_FC32_Sfs_s.S b/dl/sp/src/omxSP_FFTInv_CToC_FC32_Sfs_s.S
index 5d5d3d8..c2e86d2 100644
--- a/dl/sp/src/omxSP_FFTInv_CToC_FC32_Sfs_s.S
+++ b/dl/sp/src/omxSP_FFTInv_CToC_FC32_Sfs_s.S
@@ -20,8 +20,8 @@
 
 @// Include standard headers
 
-#include "omxtypes_s.h"
-#include "armCOMM_s.h"
+#include "dl/api/armCOMM_s.h"
+#include "dl/api/omxtypes_s.h"
 
 @// Import symbols required from other files
 @// (For example tables)
diff --git a/dl/sp/src/omxSP_FFTInv_CToC_SC32_Sfs_s.S b/dl/sp/src/omxSP_FFTInv_CToC_SC32_Sfs_s.S
index e645fb8..09c461c 100644
--- a/dl/sp/src/omxSP_FFTInv_CToC_SC32_Sfs_s.S
+++ b/dl/sp/src/omxSP_FFTInv_CToC_SC32_Sfs_s.S
@@ -28,8 +28,8 @@
         
 @// Include standard headers
 
-#include "omxtypes_s.h"
-#include "armCOMM_s.h"
+#include "dl/api/armCOMM_s.h"
+#include "dl/api/omxtypes_s.h"
         
 @// Import symbols required from other files
 @// (For example tables)
diff --git a/dl/sp/src/test/aligned_ptr.c b/dl/sp/src/test/aligned_ptr.c
index 2bb3e7a..d80167c 100644
--- a/dl/sp/src/test/aligned_ptr.c
+++ b/dl/sp/src/test/aligned_ptr.c
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "aligned_ptr.h"
+#include "dl/sp/src/test/aligned_ptr.h"
 
 #include <stdlib.h>
 
diff --git a/dl/sp/src/test/compare.c b/dl/sp/src/test/compare.c
index 56a4baf..6cf76b4 100644
--- a/dl/sp/src/test/compare.c
+++ b/dl/sp/src/test/compare.c
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include <stdio.h>
+#include "dl/sp/src/test/compare.h"
+
 #include <math.h>
-#include "armSP.h"
-#include "compare.h"
+#include <stdio.h>
 
 extern int verbose;
 
diff --git a/dl/sp/src/test/compare.h b/dl/sp/src/test/compare.h
index 5b5d182..258c627 100644
--- a/dl/sp/src/test/compare.h
+++ b/dl/sp/src/test/compare.h
@@ -11,6 +11,8 @@
 #ifndef WEBRTC_ARM_FFT_TEST_COMPARE_H_
 #define WEBRTC_ARM_FFT_TEST_COMPARE_H_
 
+#include "dl/api/omxtypes.h"
+
 struct SnrResult {
   /* SNR (in dB) for real component (for complex signals) */
   float real_snr_;
diff --git a/dl/sp/src/test/gensig.c b/dl/sp/src/test/gensig.c
index 7dbf0a7..c019bf2 100644
--- a/dl/sp/src/test/gensig.c
+++ b/dl/sp/src/test/gensig.c
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "gensig.h"
+#include "dl/sp/src/test/gensig.h"
 
 #include <stdio.h>
 #include <math.h>
diff --git a/dl/sp/src/test/test_fft.gyp b/dl/sp/src/test/test_fft.gyp
index cb7cd47..ee63818 100644
--- a/dl/sp/src/test/test_fft.gyp
+++ b/dl/sp/src/test/test_fft.gyp
@@ -11,16 +11,29 @@
     # Override this value to build with small float FFT tables
     'big_float_fft%' : 1,
   },
+  'target_defaults': {
+    'include_dirs': [
+      '../../../../',
+    ],
+    'dependencies' : [
+      '../../../dl.gyp:arm_fft',
+      'test_utilities'
+    ],
+    'conditions': [
+      ['big_float_fft == 1', {
+        'defines': [
+          'BIG_FFT_TABLE',
+        ],
+      }],
+    ],
+  },
   'targets': [
     {
       # Test utilities
       'target_name': 'test_utilities',
       'type' : '<(component)',
-      'include_dirs': [
-        '..',
-      ],
-      'dependencies' : [
-        '../arm_fft.gyp:arm_fft',
+      'dependencies!' : [
+        'test_utilities'
       ],
       'sources' : [
         'aligned_ptr.c',
@@ -33,13 +46,6 @@
       # Test complex fixed-point 32-bit FFT
       'target_name': 'test_fft32',
       'type': 'executable',
-      'include_dirs': [
-        '..',
-      ],
-      'dependencies' : [
-        '../arm_fft.gyp:arm_fft',
-        'test_utilities'
-      ],
       'sources': [
         'test_fft32.c',
       ],
@@ -48,12 +54,6 @@
       # Test real 32-bit fixed-point FFT
       'target_name': 'test_rfft32',
       'type': 'executable',
-      'include_dirs': [
-        '..',
-      ],
-      'dependencies' : [
-        'test_utilities'
-      ],
       'sources': [
         'test_rfft32.c',
       ],
@@ -62,12 +62,6 @@
       # Test real 16-bit fixed-point FFT
       'target_name': 'test_rfft16',
       'type': 'executable',
-      'include_dirs': [
-        '..',
-      ],
-      'dependencies' : [
-        'test_utilities'
-      ],
       'sources': [
         'test_rfft16.c',
       ],
@@ -76,64 +70,25 @@
       # Test complex floating-point FFT
       'target_name': 'test_float_fft',
       'type': 'executable',
-      'include_dirs': [
-        '..',
-      ],
-      'dependencies' : [
-        'test_utilities'
-      ],
       'sources': [
         'test_float_fft.c',
       ],
-      'conditions': [
-        ['big_float_fft == 1', {
-          'defines': [
-            'BIG_FFT_TABLE',
-          ],
-        }],
-      ],
     },
     {
       # Test real floating-point FFT
       'target_name': 'test_float_rfft',
       'type': 'executable',
-      'include_dirs': [
-        '..',
-      ],
-      'dependencies' : [
-        'test_utilities'
-      ],
       'sources': [
         'test_float_rfft.c',
       ],
-      'conditions': [
-        ['big_float_fft == 1', {
-          'defines': [
-            'BIG_FFT_TABLE',
-          ],
-        }],
-      ],
     },
     {
       # Simple timing test of FFTs
       'target_name': 'test_fft_time',
       'type': 'executable',
-      'include_dirs': [
-        '..',
-      ],
-      'dependencies' : [
-        'test_utilities'
-      ],
       'sources': [
         'test_fft_time.c',
       ],
-      'conditions': [
-        ['big_float_fft == 1', {
-          'defines': [
-            'BIG_FFT_TABLE',
-          ],
-        }],
-      ],
     },
     {
       # Build all test programs.
diff --git a/dl/sp/src/test/test_fft32.c b/dl/sp/src/test/test_fft32.c
index 2963deb..72ef96c 100644
--- a/dl/sp/src/test/test_fft32.c
+++ b/dl/sp/src/test/test_fft32.c
@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-#include <math.h>
 #include <unistd.h>
 
-#include "aligned_ptr.h"
-#include "armSP.h"
-#include "compare.h"
-#include "gensig.h"
-#include "omxSP.h"
-#include "test_util.h"
+#include "dl/sp/api/armSP.h"
+#include "dl/sp/api/omxSP.h"
+#include "dl/sp/src/test/aligned_ptr.h"
+#include "dl/sp/src/test/compare.h"
+#include "dl/sp/src/test/gensig.h"
+#include "dl/sp/src/test/test_util.h"
 
 #define MAX_FFT_ORDER   12
 
diff --git a/dl/sp/src/test/test_fft_time.c b/dl/sp/src/test/test_fft_time.c
index 33ede2a..a401594 100644
--- a/dl/sp/src/test/test_fft_time.c
+++ b/dl/sp/src/test/test_fft_time.c
@@ -15,11 +15,10 @@
 #include <sys/time.h>
 #include <unistd.h>
 
-#include "aligned_ptr.h"
-#include "armCOMM.h"
-#include "armSP.h"
-#include "gensig.h"
-#include "omxSP.h"
+#include "dl/sp/api/armSP.h"
+#include "dl/sp/api/omxSP.h"
+#include "dl/sp/src/test/aligned_ptr.h"
+#include "dl/sp/src/test/gensig.h"
 
 #define MAX_FFT_ORDER   TWIDDLE_TABLE_ORDER
 #define MAX_FFT_ORDER_FIXED_POINT 12
diff --git a/dl/sp/src/test/test_float_fft.c b/dl/sp/src/test/test_float_fft.c
index bee55d6..397315f 100644
--- a/dl/sp/src/test/test_float_fft.c
+++ b/dl/sp/src/test/test_float_fft.c
@@ -14,13 +14,12 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "aligned_ptr.h"
-#include "armCOMM.h"
-#include "armSP.h"
-#include "compare.h"
-#include "gensig.h"
-#include "omxSP.h"
-#include "test_util.h"
+#include "dl/sp/api/armSP.h"
+#include "dl/sp/api/omxSP.h"
+#include "dl/sp/src/test/aligned_ptr.h"
+#include "dl/sp/src/test/compare.h"
+#include "dl/sp/src/test/gensig.h"
+#include "dl/sp/src/test/test_util.h"
 
 #define MAX_FFT_ORDER   TWIDDLE_TABLE_ORDER
 
diff --git a/dl/sp/src/test/test_float_rfft.c b/dl/sp/src/test/test_float_rfft.c
index 8850ef4..cb3262f 100644
--- a/dl/sp/src/test/test_float_rfft.c
+++ b/dl/sp/src/test/test_float_rfft.c
@@ -14,13 +14,12 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "aligned_ptr.h"
-#include "armCOMM.h"
-#include "armSP.h"
-#include "compare.h"
-#include "gensig.h"
-#include "omxSP.h"
-#include "test_util.h"
+#include "dl/sp/api/armSP.h"
+#include "dl/sp/api/omxSP.h"
+#include "dl/sp/src/test/aligned_ptr.h"
+#include "dl/sp/src/test/compare.h"
+#include "dl/sp/src/test/gensig.h"
+#include "dl/sp/src/test/test_util.h"
 
 #define MAX_FFT_ORDER   TWIDDLE_TABLE_ORDER
 
diff --git a/dl/sp/src/test/test_rfft16.c b/dl/sp/src/test/test_rfft16.c
index 0acf2e2..171ccdc 100644
--- a/dl/sp/src/test/test_rfft16.c
+++ b/dl/sp/src/test/test_rfft16.c
@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-#include <math.h>
 #include <unistd.h>
 
-#include "aligned_ptr.h"
-#include "armSP.h"
-#include "compare.h"
-#include "gensig.h"
-#include "omxSP.h"
-#include "test_util.h"
+#include "dl/sp/api/armSP.h"
+#include "dl/sp/api/omxSP.h"
+#include "dl/sp/src/test/aligned_ptr.h"
+#include "dl/sp/src/test/compare.h"
+#include "dl/sp/src/test/gensig.h"
+#include "dl/sp/src/test/test_util.h"
 
 int verbose;
 int signal_value;
diff --git a/dl/sp/src/test/test_rfft32.c b/dl/sp/src/test/test_rfft32.c
index 8d9beab..544b29d 100644
--- a/dl/sp/src/test/test_rfft32.c
+++ b/dl/sp/src/test/test_rfft32.c
@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-#include <math.h>
 #include <unistd.h>
 
-#include "aligned_ptr.h"
-#include "armSP.h"
-#include "compare.h"
-#include "gensig.h"
-#include "omxSP.h"
-#include "test_util.h"
+#include "dl/sp/api/armSP.h"
+#include "dl/sp/api/omxSP.h"
+#include "dl/sp/src/test/aligned_ptr.h"
+#include "dl/sp/src/test/compare.h"
+#include "dl/sp/src/test/gensig.h"
+#include "dl/sp/src/test/test_util.h"
 
 int verbose;
 int signal_value;
diff --git a/dl/sp/src/test/test_util.c b/dl/sp/src/test/test_util.c
index b412754..ab989c4 100644
--- a/dl/sp/src/test/test_util.c
+++ b/dl/sp/src/test/test_util.c
@@ -7,15 +7,15 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
+#include "dl/sp/src/test/test_util.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-#include "armSP.h"
-#include "compare.h"
-#include "test_util.h"
+#include "dl/sp/api/armSP.h"
+#include "dl/sp/src/test/compare.h"
 
 /*
  * Test resuls from running either forward or inverse FFT tests
diff --git a/dl/sp/src/test/test_util.h b/dl/sp/src/test/test_util.h
index b64e518..c75ccc7 100644
--- a/dl/sp/src/test/test_util.h
+++ b/dl/sp/src/test/test_util.h
@@ -11,6 +11,10 @@
 #ifndef WEBRTC_ARM_FFT_TEST_UTIL_H_
 #define WEBRTC_ARM_FFT_TEST_UTIL_H_
 
+#include <stdio.h>
+
+#include "dl/sp/src/test/compare.h"
+
 /* Command line options */
 struct Options {
     /*