Use "includes" instead of <includes>.

59 files changed, 152 insertions, 152 deletions

diff --git a/src/bin/cxx/font_effect_blur_alpha.cc b/src/bin/cxx/font_effect_blur_alpha.cc
index e4937d0..543cad1 100644
--- a/src/bin/cxx/font_effect_blur_alpha.cc
+++ b/src/bin/cxx/font_effect_blur_alpha.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <font_effect_blur_alpha_capi.h>
+#include "font_effect_blur_alpha_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_blend_many_smooth_same_scaled.cc b/src/bin/cxx/image_blend_many_smooth_same_scaled.cc
index b14f439..5fcf9f0 100644
--- a/src/bin/cxx/image_blend_many_smooth_same_scaled.cc
+++ b/src/bin/cxx/image_blend_many_smooth_same_scaled.cc
@@ -14,7 +14,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_blend_many_smooth_same_scaled_capi.h>
+#include "image_blend_many_smooth_same_scaled_capi.h"
 
 #define MANYNUM 8192
 
diff --git a/src/bin/cxx/image_blend_nearest_same_scaled.cc b/src/bin/cxx/image_blend_nearest_same_scaled.cc
index 4bd2728..83e6008 100644
--- a/src/bin/cxx/image_blend_nearest_same_scaled.cc
+++ b/src/bin/cxx/image_blend_nearest_same_scaled.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_blend_occlude1_few_capi.h>
+#include "image_blend_occlude1_few_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_blend_nearest_scaled.cc b/src/bin/cxx/image_blend_nearest_scaled.cc
index 85f2863..a40b184 100644
--- a/src/bin/cxx/image_blend_nearest_scaled.cc
+++ b/src/bin/cxx/image_blend_nearest_scaled.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_blend_nearest_scaled_capi.h>
+#include "image_blend_nearest_scaled_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_blend_nearest_solid_same_scaled.cc b/src/bin/cxx/image_blend_nearest_solid_same_scaled.cc
index 6455637..b21d7fa 100644
--- a/src/bin/cxx/image_blend_nearest_solid_same_scaled.cc
+++ b/src/bin/cxx/image_blend_nearest_solid_same_scaled.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_blend_nearest_solid_same_scaled_capi.h>
+#include "image_blend_nearest_solid_same_scaled_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_blend_nearest_solid_scaled.cc b/src/bin/cxx/image_blend_nearest_solid_scaled.cc
index 5798ea8..3fc0432 100644
--- a/src/bin/cxx/image_blend_nearest_solid_scaled.cc
+++ b/src/bin/cxx/image_blend_nearest_solid_scaled.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_blend_nearest_solid_scaled_capi.h>
+#include "image_blend_nearest_solid_scaled_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_blend_occlude1.cc b/src/bin/cxx/image_blend_occlude1.cc
index 0776f29..b70eed1 100644
--- a/src/bin/cxx/image_blend_occlude1.cc
+++ b/src/bin/cxx/image_blend_occlude1.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_blend_occlude1_capi.h>
+#include "image_blend_occlude1_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_blend_occlude1_few.cc b/src/bin/cxx/image_blend_occlude1_few.cc
index 2b6ab47..c02cd9c 100644
--- a/src/bin/cxx/image_blend_occlude1_few.cc
+++ b/src/bin/cxx/image_blend_occlude1_few.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_blend_occlude1_few_capi.h>
+#include "image_blend_occlude1_few_capi.h"
 
 #undef OBNUM
 #define OBNUM 32
diff --git a/src/bin/cxx/image_blend_occlude1_many.cc b/src/bin/cxx/image_blend_occlude1_many.cc
index 9ce7288..f24a649 100644
--- a/src/bin/cxx/image_blend_occlude1_many.cc
+++ b/src/bin/cxx/image_blend_occlude1_many.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_blend_occlude1_many_capi.h>
+#include "image_blend_occlude1_many_capi.h"
 
 #undef OBNUM
 #define OBNUM 320
diff --git a/src/bin/cxx/image_blend_occlude1_very_many.cc b/src/bin/cxx/image_blend_occlude1_very_many.cc
index e1c439a..6432ff3 100644
--- a/src/bin/cxx/image_blend_occlude1_very_many.cc
+++ b/src/bin/cxx/image_blend_occlude1_very_many.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_blend_occlude1_very_many_capi.h>
+#include "image_blend_occlude1_very_many_capi.h"
 
 #include "main.h"
 
diff --git a/src/bin/cxx/image_blend_occlude2.cc b/src/bin/cxx/image_blend_occlude2.cc
index 5192e93..e3c1def 100644
--- a/src/bin/cxx/image_blend_occlude2.cc
+++ b/src/bin/cxx/image_blend_occlude2.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_blend_occlude2_capi.h>
+#include "image_blend_occlude2_capi.h"
 
 #include "main.h"
 
diff --git a/src/bin/cxx/image_blend_occlude2_few.cc b/src/bin/cxx/image_blend_occlude2_few.cc
index b75eb59..f38afc3 100644
--- a/src/bin/cxx/image_blend_occlude2_few.cc
+++ b/src/bin/cxx/image_blend_occlude2_few.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_blend_occlude2_few_capi.h>
+#include "image_blend_occlude2_few_capi.h"
 
 #include "main.h"
 
diff --git a/src/bin/cxx/image_blend_occlude2_many.cc b/src/bin/cxx/image_blend_occlude2_many.cc
index be055ae..e10becd 100644
--- a/src/bin/cxx/image_blend_occlude2_many.cc
+++ b/src/bin/cxx/image_blend_occlude2_many.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_blend_occlude2_many_capi.h>
+#include "image_blend_occlude2_many_capi.h"
 
 #include "main.h"
 
diff --git a/src/bin/cxx/image_blend_occlude2_very_many.cc b/src/bin/cxx/image_blend_occlude2_very_many.cc
index 5f4c830..542c3fb 100644
--- a/src/bin/cxx/image_blend_occlude2_very_many.cc
+++ b/src/bin/cxx/image_blend_occlude2_very_many.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_blend_occlude2_very_many_capi.h>
+#include "image_blend_occlude2_very_many_capi.h"
 
 #include "main.h"
 
diff --git a/src/bin/cxx/image_blend_occlude3.cc b/src/bin/cxx/image_blend_occlude3.cc
index a118116..04a5859 100644
--- a/src/bin/cxx/image_blend_occlude3.cc
+++ b/src/bin/cxx/image_blend_occlude3.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_blend_occlude3_capi.h>
+#include "image_blend_occlude3_capi.h"
 
 #include "main.h"
 
diff --git a/src/bin/cxx/image_blend_occlude3_few.cc b/src/bin/cxx/image_blend_occlude3_few.cc
index e842d9c..4394f37 100644
--- a/src/bin/cxx/image_blend_occlude3_few.cc
+++ b/src/bin/cxx/image_blend_occlude3_few.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_blend_occlude3_few_capi.h>
+#include "image_blend_occlude3_few_capi.h"
 
 #include "main.h"
 
diff --git a/src/bin/cxx/image_blend_occlude3_many.cc b/src/bin/cxx/image_blend_occlude3_many.cc
index 20ac9e1..082b0b3 100644
--- a/src/bin/cxx/image_blend_occlude3_many.cc
+++ b/src/bin/cxx/image_blend_occlude3_many.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_blend_occlude3_many_capi.h>
+#include "image_blend_occlude3_many_capi.h"
 
 #undef OBNUM
 #define OBNUM 320
diff --git a/src/bin/cxx/image_blend_occlude3_very_many.cc b/src/bin/cxx/image_blend_occlude3_very_many.cc
index 1961938..b2fb5b7 100644
--- a/src/bin/cxx/image_blend_occlude3_very_many.cc
+++ b/src/bin/cxx/image_blend_occlude3_very_many.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_blend_occlude3_very_many_capi.h>
+#include "image_blend_occlude3_very_many_capi.h"
 
 
 #undef OBNUM
diff --git a/src/bin/cxx/image_blend_smooth_same_scaled.cc b/src/bin/cxx/image_blend_smooth_same_scaled.cc
index 5e9dee7..ab513d2 100644
--- a/src/bin/cxx/image_blend_smooth_same_scaled.cc
+++ b/src/bin/cxx/image_blend_smooth_same_scaled.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_blend_smooth_same_scaled_capi.h>
+#include "image_blend_smooth_same_scaled_capi.h"
 
 
 /* standard var */
diff --git a/src/bin/cxx/image_blend_smooth_scaled.cc b/src/bin/cxx/image_blend_smooth_scaled.cc
index e228b43..e17641e 100644
--- a/src/bin/cxx/image_blend_smooth_scaled.cc
+++ b/src/bin/cxx/image_blend_smooth_scaled.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_blend_smooth_scaled_capi.h>
+#include "image_blend_smooth_scaled_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_blend_smooth_solid_same_scaled.cc b/src/bin/cxx/image_blend_smooth_solid_same_scaled.cc
index 18889c3..7a26419 100644
--- a/src/bin/cxx/image_blend_smooth_solid_same_scaled.cc
+++ b/src/bin/cxx/image_blend_smooth_solid_same_scaled.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_blend_smooth_solid_same_scaled_capi.h>
+#include "image_blend_smooth_solid_same_scaled_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_blend_smooth_solid_scaled.cc b/src/bin/cxx/image_blend_smooth_solid_scaled.cc
index 0072814..b96018e 100644
--- a/src/bin/cxx/image_blend_smooth_solid_scaled.cc
+++ b/src/bin/cxx/image_blend_smooth_solid_scaled.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_blend_smooth_solid_scaled_capi.h>
+#include "image_blend_smooth_solid_scaled_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_blend_solid_border.cc b/src/bin/cxx/image_blend_solid_border.cc
index 14d8794..89be101 100644
--- a/src/bin/cxx/image_blend_solid_border.cc
+++ b/src/bin/cxx/image_blend_solid_border.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_blend_solid_border_capi.h>
+#include "image_blend_solid_border_capi.h"
 
 static efl::eina::list<evas::image> images;
 
diff --git a/src/bin/cxx/image_blend_solid_middle_border.cc b/src/bin/cxx/image_blend_solid_middle_border.cc
index 0c3cf5e..67da17a 100644
--- a/src/bin/cxx/image_blend_solid_middle_border.cc
+++ b/src/bin/cxx/image_blend_solid_middle_border.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_blend_solid_middle_border_capi.h>
+#include "image_blend_solid_middle_border_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_blend_unscaled.cc b/src/bin/cxx/image_blend_unscaled.cc
index eb54e4e..ce150e6 100644
--- a/src/bin/cxx/image_blend_unscaled.cc
+++ b/src/bin/cxx/image_blend_unscaled.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_blend_unscaled_capi.h>
+#include "image_blend_unscaled_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_crossfade.cc b/src/bin/cxx/image_crossfade.cc
index b041547..aa51135 100644
--- a/src/bin/cxx/image_crossfade.cc
+++ b/src/bin/cxx/image_crossfade.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_crossfade_capi.h>
+#include "image_crossfade_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_data_argb.cc b/src/bin/cxx/image_data_argb.cc
index 82bbd8d..55f5aab 100644
--- a/src/bin/cxx/image_data_argb.cc
+++ b/src/bin/cxx/image_data_argb.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_data_argb_capi.h>
+#include "image_data_argb_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_data_argb_alpha.cc b/src/bin/cxx/image_data_argb_alpha.cc
index 2fb2ca5..e6a73bc 100644
--- a/src/bin/cxx/image_data_argb_alpha.cc
+++ b/src/bin/cxx/image_data_argb_alpha.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_data_argb_alpha_capi.h>
+#include "image_data_argb_alpha_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_data_ycbcr601pl.cc b/src/bin/cxx/image_data_ycbcr601pl.cc
index db55aff..2e9c35b 100644
--- a/src/bin/cxx/image_data_ycbcr601pl.cc
+++ b/src/bin/cxx/image_data_ycbcr601pl.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_data_ycbcr601pl_capi.h>
+#include "image_data_ycbcr601pl_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_data_ycbcr601pl_map_nearest_solid_rotate.cc b/src/bin/cxx/image_data_ycbcr601pl_map_nearest_solid_rotate.cc
index dfe56aa..0efd907 100644
--- a/src/bin/cxx/image_data_ycbcr601pl_map_nearest_solid_rotate.cc
+++ b/src/bin/cxx/image_data_ycbcr601pl_map_nearest_solid_rotate.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_data_ycbcr601pl_map_nearest_solid_rotate_capi.h>
+#include "image_data_ycbcr601pl_map_nearest_solid_rotate_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc b/src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc
index 373aeb5..181b223 100644
--- a/src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc
+++ b/src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_data_ycbcr601pl_map_solid_rotate_capi.h>
+#include "image_data_ycbcr601pl_map_solid_rotate_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc b/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc
index a7a6527..0a91b74 100644
--- a/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc
+++ b/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_data_ycbcr601pl_wide_stride_capi.h>
+#include "image_data_ycbcr601pl_wide_stride_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_map_3d_1.cc b/src/bin/cxx/image_map_3d_1.cc
index 2b9bfca..bfd8004 100644
--- a/src/bin/cxx/image_map_3d_1.cc
+++ b/src/bin/cxx/image_map_3d_1.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_map_3d_1_capi.h>
+#include "image_map_3d_1_capi.h""
 
 typedef struct _Point
 {
diff --git a/src/bin/cxx/image_map_3d_2.cc b/src/bin/cxx/image_map_3d_2.cc
index 65f0d73..7c0518c 100644
--- a/src/bin/cxx/image_map_3d_2.cc
+++ b/src/bin/cxx/image_map_3d_2.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_map_3d_2_capi.h>
+#include "image_map_3d_2_capi.h""
 
 typedef struct _Point
 {
diff --git a/src/bin/cxx/image_map_3d_3.cc b/src/bin/cxx/image_map_3d_3.cc
index 3f59874..cf593f6 100644
--- a/src/bin/cxx/image_map_3d_3.cc
+++ b/src/bin/cxx/image_map_3d_3.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_map_3d_3_capi.h>
+#include "image_map_3d_3_capi.h""
 
 typedef struct _Point
 {
diff --git a/src/bin/cxx/image_map_3d_4.cc b/src/bin/cxx/image_map_3d_4.cc
index 4cfcfa6..37036d1 100644
--- a/src/bin/cxx/image_map_3d_4.cc
+++ b/src/bin/cxx/image_map_3d_4.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_map_3d_4_capi.h>
+#include "image_map_3d_4_capi.h""
 
 typedef struct _Point
 {
diff --git a/src/bin/cxx/image_map_3d_5.cc b/src/bin/cxx/image_map_3d_5.cc
index 95e047d..bd6c8b6 100644
--- a/src/bin/cxx/image_map_3d_5.cc
+++ b/src/bin/cxx/image_map_3d_5.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_map_3d_5_capi.h>
+#include "image_map_3d_5_capi.h""
 
 typedef struct _Point
 {
diff --git a/src/bin/cxx/image_map_3d_6.cc b/src/bin/cxx/image_map_3d_6.cc
index 70c894e..71de8f2 100644
--- a/src/bin/cxx/image_map_3d_6.cc
+++ b/src/bin/cxx/image_map_3d_6.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_map_3d_6_capi.h>
+#include "image_map_3d_6_capi.h""
 
 typedef struct _Point
 {
diff --git a/src/bin/cxx/image_map_3d_flow.cc b/src/bin/cxx/image_map_3d_flow.cc
index 11de600..bc66da8 100644
--- a/src/bin/cxx/image_map_3d_flow.cc
+++ b/src/bin/cxx/image_map_3d_flow.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_map_3d_flow_capi.h>
+#include "image_map_3d_flow_capi.h""
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_map_color_alpha_nearest_rotate.cc b/src/bin/cxx/image_map_color_alpha_nearest_rotate.cc
index 149b37b..af95e02 100644
--- a/src/bin/cxx/image_map_color_alpha_nearest_rotate.cc
+++ b/src/bin/cxx/image_map_color_alpha_nearest_rotate.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_map_color_alpha_nearest_rotate_capi.h>
+#include "image_map_color_alpha_nearest_rotate_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_map_color_alpha_nearest_solid_rotate.cc b/src/bin/cxx/image_map_color_alpha_nearest_solid_rotate.cc
index 5de43de..1fded4d 100644
--- a/src/bin/cxx/image_map_color_alpha_nearest_solid_rotate.cc
+++ b/src/bin/cxx/image_map_color_alpha_nearest_solid_rotate.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_map_color_alpha_nearest_solid_rotate_capi.h>
+#include "image_map_color_alpha_nearest_solid_rotate_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_map_color_alpha_rotate.cc b/src/bin/cxx/image_map_color_alpha_rotate.cc
index de45513..0e7c4e4 100644
--- a/src/bin/cxx/image_map_color_alpha_rotate.cc
+++ b/src/bin/cxx/image_map_color_alpha_rotate.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_map_color_alpha_rotate_capi.h>
+#include "image_map_color_alpha_rotate_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_map_color_alpha_solid_rotate.cc b/src/bin/cxx/image_map_color_alpha_solid_rotate.cc
index 26e0e2a..684ad5e 100644
--- a/src/bin/cxx/image_map_color_alpha_solid_rotate.cc
+++ b/src/bin/cxx/image_map_color_alpha_solid_rotate.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_map_color_alpha_solid_rotate_capi.h>
+#include "image_map_color_alpha_solid_rotate_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_map_color_nearest_rotate.cc b/src/bin/cxx/image_map_color_nearest_rotate.cc
index cfb8a38..370639a 100644
--- a/src/bin/cxx/image_map_color_nearest_rotate.cc
+++ b/src/bin/cxx/image_map_color_nearest_rotate.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_map_color_nearest_rotate_capi.h>
+#include "image_map_color_nearest_rotate_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_map_color_nearest_solid_rotate.cc b/src/bin/cxx/image_map_color_nearest_solid_rotate.cc
index f79ffd1..8561c23 100644
--- a/src/bin/cxx/image_map_color_nearest_solid_rotate.cc
+++ b/src/bin/cxx/image_map_color_nearest_solid_rotate.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_map_color_nearest_solid_rotate_capi.h>
+#include "image_map_color_nearest_solid_rotate_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_map_color_rotate.cc b/src/bin/cxx/image_map_color_rotate.cc
index 61d72de..fb5b890 100644
--- a/src/bin/cxx/image_map_color_rotate.cc
+++ b/src/bin/cxx/image_map_color_rotate.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_map_color_rotate_capi.h>
+#include "image_map_color_rotate_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_map_color_solid_rotate.cc b/src/bin/cxx/image_map_color_solid_rotate.cc
index 5f6bcc1..a78b83b 100644
--- a/src/bin/cxx/image_map_color_solid_rotate.cc
+++ b/src/bin/cxx/image_map_color_solid_rotate.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_map_color_solid_rotate_capi.h>
+#include "image_map_color_solid_rotate_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_map_nearest_rotate.cc b/src/bin/cxx/image_map_nearest_rotate.cc
index ce2689f..f5807e6 100644
--- a/src/bin/cxx/image_map_nearest_rotate.cc
+++ b/src/bin/cxx/image_map_nearest_rotate.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_map_nearest_rotate_capi.h>
+#include "image_map_nearest_rotate_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_map_nearest_solid_rotate.cc b/src/bin/cxx/image_map_nearest_solid_rotate.cc
index c0c2414..3d7f9bb 100644
--- a/src/bin/cxx/image_map_nearest_solid_rotate.cc
+++ b/src/bin/cxx/image_map_nearest_solid_rotate.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_map_nearest_solid_rotate_capi.h>
+#include "image_map_nearest_solid_rotate_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_map_rotate.cc b/src/bin/cxx/image_map_rotate.cc
index dc4992c..f9b08b8 100644
--- a/src/bin/cxx/image_map_rotate.cc
+++ b/src/bin/cxx/image_map_rotate.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_map_rotate_capi.h>
+#include "image_map_rotate_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_map_solid_rotate.cc b/src/bin/cxx/image_map_solid_rotate.cc
index d45e66f..8057d02 100644
--- a/src/bin/cxx/image_map_solid_rotate.cc
+++ b/src/bin/cxx/image_map_solid_rotate.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_map_solid_rotate_capi.h>
+#include "image_map_solid_rotate_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_quality_scale.cc b/src/bin/cxx/image_quality_scale.cc
index ed0452e..783a638 100644
--- a/src/bin/cxx/image_quality_scale.cc
+++ b/src/bin/cxx/image_quality_scale.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <image_quality_scale_capi.h>
+#include "image_quality_scale_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/line_blend.cc b/src/bin/cxx/line_blend.cc
index 9e531a3..3126659 100644
--- a/src/bin/cxx/line_blend.cc
+++ b/src/bin/cxx/line_blend.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <line_blend_capi.h>
+#include "line_blend_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/proxy_image.cc b/src/bin/cxx/proxy_image.cc
index a7bc39d..fe287d9 100644
--- a/src/bin/cxx/proxy_image.cc
+++ b/src/bin/cxx/proxy_image.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <proxy_image_capi.h>
+#include "proxy_image_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/proxy_image_offscreen.cc b/src/bin/cxx/proxy_image_offscreen.cc
index 6b23874..1791bc1 100644
--- a/src/bin/cxx/proxy_image_offscreen.cc
+++ b/src/bin/cxx/proxy_image_offscreen.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <proxy_image_offscreen_capi.h>
+#include "proxy_image_offscreen_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/proxy_text_fixed.cc b/src/bin/cxx/proxy_text_fixed.cc
index 752a02a..29240b0 100644
--- a/src/bin/cxx/proxy_text_fixed.cc
+++ b/src/bin/cxx/proxy_text_fixed.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <proxy_text_fixed_capi.h>
+#include "proxy_text_fixed_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/proxy_text_random.cc b/src/bin/cxx/proxy_text_random.cc
index 11d5f67..7189cd3 100644
--- a/src/bin/cxx/proxy_text_random.cc
+++ b/src/bin/cxx/proxy_text_random.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <proxy_text_random_capi.h>
+#include "proxy_text_random_capi.h"
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/tests.h b/src/bin/cxx/tests.h
index 0560784..a0d524e 100644
--- a/src/bin/cxx/tests.h
+++ b/src/bin/cxx/tests.h
@@ -3,100 +3,100 @@
 extern "C" {
 #endif
 
-#include <font_effect_blur_alpha_capi.h>
-#include <image_blend_border_capi.h>
-#include <image_blend_border_recolor_capi.h>
-#include <image_blend_fade_pow2_unscaled_capi.h>
-#include <image_blend_fade_unscaled_capi.h>
-#include <image_blend_many_smooth_same_scaled_capi.h>
-#include <image_blend_nearest_same_scaled_capi.h>
-#include <image_blend_nearest_scaled_capi.h>
-#include <image_blend_nearest_solid_same_scaled_capi.h>
-#include <image_blend_nearest_solid_scaled_capi.h>
-#include <image_blend_occlude1_capi.h>
-#include <image_blend_occlude1_few_capi.h>
-#include <image_blend_occlude1_many_capi.h>
-#include <image_blend_occlude1_very_many_capi.h>
-#include <image_blend_occlude2_capi.h>
-#include <image_blend_occlude2_few_capi.h>
-#include <image_blend_occlude2_many_capi.h>
-#include <image_blend_occlude2_very_many_capi.h>
-#include <image_blend_occlude3_capi.h>
-#include <image_blend_occlude3_few_capi.h>
-#include <image_blend_occlude3_many_capi.h>
-#include <image_blend_occlude3_very_many_capi.h>
-#include <image_blend_smooth_same_scaled_capi.h>
-#include <image_blend_smooth_scaled_capi.h>
-#include <image_blend_smooth_solid_same_scaled_capi.h>
-#include <image_blend_smooth_solid_scaled_capi.h>
-#include <image_blend_solid_border_capi.h>
-#include <image_blend_solid_fade_pow2_unscaled_capi.h>
-#include <image_blend_solid_fade_unscaled_capi.h>
-#include <image_blend_solid_middle_border_capi.h>
-#include <image_blend_solid_middle_unscaled_capi.h>
-#include <image_blend_solid_unscaled_capi.h>
-#include <image_blend_unscaled_capi.h>
-#include <image_crossfade_capi.h>
-#include <image_data_argb_alpha_capi.h>
-#include <image_data_argb_capi.h>
-#include <image_data_ycbcr601pl_capi.h>
-#include <image_data_ycbcr601pl_map_nearest_solid_rotate_capi.h>
-#include <image_data_ycbcr601pl_map_solid_rotate_capi.h>
-#include <image_data_ycbcr601pl_wide_stride_capi.h>
-#include <image_map_3d_1_capi.h>
-#include <image_map_3d_2_capi.h>
-#include <image_map_3d_3_capi.h>
-#include <image_map_3d_4_capi.h>
-#include <image_map_3d_5_capi.h>
-#include <image_map_3d_6_capi.h>
-#include <image_map_3d_flow_capi.h>
-#include <image_map_color_alpha_nearest_rotate_capi.h>
-#include <image_map_color_alpha_nearest_solid_rotate_capi.h>
-#include <image_map_color_alpha_rotate_capi.h>
-#include <image_map_color_alpha_solid_rotate_capi.h>
-#include <image_map_color_nearest_rotate_capi.h>
-#include <image_map_color_nearest_solid_rotate_capi.h>
-#include <image_map_color_rotate_capi.h>
-#include <image_map_color_solid_rotate_capi.h>
-#include <image_map_nearest_rotate_capi.h>
-#include <image_map_nearest_solid_rotate_capi.h>
-#include <image_map_rotate_capi.h>
-#include <image_map_solid_rotate_capi.h>
-#include <image_quality_scale_capi.h>
-#include <line_blend_capi.h>
-#include <proxy_image_capi.h>
-#include <proxy_image_offscreen_capi.h>
-#include <proxy_text_fixed_capi.h>
-#include <proxy_text_random_capi.h>
-#include <rect_blend_capi.h>
-#include <rect_blend_few_capi.h>
-#include <rect_blend_pow2_capi.h>
-#include <rect_blend_pow2_few_capi.h>
-#include <rect_solid_capi.h>
-#include <rect_solid_few_capi.h>
-#include <text_basic_capi.h>
-#include <text_change_capi.h>
-#include <text_styles_capi.h>
-#include <text_styles_different_strings_capi.h>
-#include <textblock_auto_align_capi.h>
-#include <textblock_basic_capi.h>
-#include <textblock_intl_capi.h>
-#include <textblock_text_append_capi.h>
-#include <widgets_file_icons_2_capi.h>
-#include <widgets_file_icons_2_grouped_capi.h>
-#include <widgets_file_icons_2_same_capi.h>
-#include <widgets_file_icons_2_same_grouped_capi.h>
-#include <widgets_file_icons_3_capi.h>
-#include <widgets_file_icons_4_capi.h>
-#include <widgets_file_icons_capi.h>
-#include <widgets_list_1_capi.h>
-#include <widgets_list_1_grouped_capi.h>
-#include <widgets_list_2_capi.h>
-#include <widgets_list_2_grouped_capi.h>
-#include <widgets_list_3_capi.h>
-#include <widgets_list_3_grouped_capi.h>
-#include <widgets_list_4_capi.h>
-#include <widgets_list_4_grouped_capi.h>
+#include "font_effect_blur_alpha_capi.h"
+#include "image_blend_border_capi.h"
+#include "image_blend_border_recolor_capi.h"
+#include "image_blend_fade_pow2_unscaled_capi.h"
+#include "image_blend_fade_unscaled_capi.h"
+#include "image_blend_many_smooth_same_scaled_capi.h"
+#include "image_blend_nearest_same_scaled_capi.h"
+#include "image_blend_nearest_scaled_capi.h"
+#include "image_blend_nearest_solid_same_scaled_capi.h"
+#include "image_blend_nearest_solid_scaled_capi.h"
+#include "image_blend_occlude1_capi.h"
+#include "image_blend_occlude1_few_capi.h"
+#include "image_blend_occlude1_many_capi.h"
+#include "image_blend_occlude1_very_many_capi.h"
+#include "image_blend_occlude2_capi.h"
+#include "image_blend_occlude2_few_capi.h"
+#include "image_blend_occlude2_many_capi.h"
+#include "image_blend_occlude2_very_many_capi.h"
+#include "image_blend_occlude3_capi.h"
+#include "image_blend_occlude3_few_capi.h"
+#include "image_blend_occlude3_many_capi.h"
+#include "image_blend_occlude3_very_many_capi.h"
+#include "image_blend_smooth_same_scaled_capi.h"
+#include "image_blend_smooth_scaled_capi.h"
+#include "image_blend_smooth_solid_same_scaled_capi.h"
+#include "image_blend_smooth_solid_scaled_capi.h"
+#include "image_blend_solid_border_capi.h"
+#include "image_blend_solid_fade_pow2_unscaled_capi.h"
+#include "image_blend_solid_fade_unscaled_capi.h"
+#include "image_blend_solid_middle_border_capi.h"
+#include "image_blend_solid_middle_unscaled_capi.h"
+#include "image_blend_solid_unscaled_capi.h"
+#include "image_blend_unscaled_capi.h"
+#include "image_crossfade_capi.h"
+#include "image_data_argb_alpha_capi.h"
+#include "image_data_argb_capi.h"
+#include "image_data_ycbcr601pl_capi.h"
+#include "image_data_ycbcr601pl_map_nearest_solid_rotate_capi.h"
+#include "image_data_ycbcr601pl_map_solid_rotate_capi.h"
+#include "image_data_ycbcr601pl_wide_stride_capi.h"
+#include "image_map_3d_1_capi.h"
+#include "image_map_3d_2_capi.h"
+#include "image_map_3d_3_capi.h"
+#include "image_map_3d_4_capi.h"
+#include "image_map_3d_5_capi.h"
+#include "image_map_3d_6_capi.h"
+#include "image_map_3d_flow_capi.h"
+#include "image_map_color_alpha_nearest_rotate_capi.h"
+#include "image_map_color_alpha_nearest_solid_rotate_capi.h"
+#include "image_map_color_alpha_rotate_capi.h"
+#include "image_map_color_alpha_solid_rotate_capi.h"
+#include "image_map_color_nearest_rotate_capi.h"
+#include "image_map_color_nearest_solid_rotate_capi.h"
+#include "image_map_color_rotate_capi.h"
+#include "image_map_color_solid_rotate_capi.h"
+#include "image_map_nearest_rotate_capi.h"
+#include "image_map_nearest_solid_rotate_capi.h"
+#include "image_map_rotate_capi.h"
+#include "image_map_solid_rotate_capi.h"
+#include "image_quality_scale_capi.h"
+#include "line_blend_capi.h"
+#include "proxy_image_capi.h"
+#include "proxy_image_offscreen_capi.h"
+#include "proxy_text_fixed_capi.h"
+#include "proxy_text_random_capi.h"
+#include "rect_blend_capi.h"
+#include "rect_blend_few_capi.h"
+#include "rect_blend_pow2_capi.h"
+#include "rect_blend_pow2_few_capi.h"
+#include "rect_solid_capi.h"
+#include "rect_solid_few_capi.h"
+#include "text_basic_capi.h"
+#include "text_change_capi.h"
+#include "text_styles_capi.h"
+#include "text_styles_different_strings_capi.h"
+#include "textblock_auto_align_capi.h"
+#include "textblock_basic_capi.h"
+#include "textblock_intl_capi.h"
+#include "textblock_text_append_capi.h"
+#include "widgets_file_icons_2_capi.h"
+#include "widgets_file_icons_2_grouped_capi.h"
+#include "widgets_file_icons_2_same_capi.h"
+#include "widgets_file_icons_2_same_grouped_capi.h"
+#include "widgets_file_icons_3_capi.h"
+#include "widgets_file_icons_4_capi.h"
+#include "widgets_file_icons_capi.h"
+#include "widgets_list_1_capi.h"
+#include "widgets_list_1_grouped_capi.h"
+#include "widgets_list_2_capi.h"
+#include "widgets_list_2_grouped_capi.h"
+#include "widgets_list_3_capi.h"
+#include "widgets_list_3_grouped_capi.h"
+#include "widgets_list_4_capi.h"
+#include "widgets_list_4_grouped_capi.h"
 
 #ifdef __cplusplus
 }
diff --git a/src/bin/cxx/widgets_file_icons_2_same_grouped.cc b/src/bin/cxx/widgets_file_icons_2_same_grouped.cc
index 00c6bd1..bb136c6 100644
--- a/src/bin/cxx/widgets_file_icons_2_same_grouped.cc
+++ b/src/bin/cxx/widgets_file_icons_2_same_grouped.cc
@@ -13,7 +13,7 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include <widgets_file_icons_2_same_grouped_capi.h>
+#include "widgets_file_icons_2_same_grouped_capi.h"
 
 /* standard var */
 static int done = 0;