diff --git a/testcases/backlight/backlight.c b/testcases/backlight/backlight.c
index 7e49387c94978f828f677fa139c6b166681d725b..7bc42ebffb23912edd2e2a9a72a51ec73762df08 100644
--- a/testcases/backlight/backlight.c
+++ b/testcases/backlight/backlight.c
@@ -41,8 +41,8 @@
 #include <linux/fs.h>
 
 /* Harness Specific Include Files. */
-#include "test.h"
-#include "usctest.h"
+#include "old/test.h"
+
 #include "config.h"
 
 #define BUF		5
diff --git a/testcases/bwrite/bwrite.c b/testcases/bwrite/bwrite.c
index c9fd133099ce993b27b1ca87cb99043fafedc49e..2d13c7fcacfbfb150aaeb3741981770bc8412eab 100755
--- a/testcases/bwrite/bwrite.c
+++ b/testcases/bwrite/bwrite.c
@@ -37,8 +37,8 @@
 #include <sys/time.h>
 
 /* Harness Specific Include Files. */
-#include "test.h"
-#include "usctest.h"
+#include "old/test.h"
+
 #include "config.h"
 
 /* Local Defines */
diff --git a/testcases/can/can.c b/testcases/can/can.c
index 23ea56fb928a70d7848c259220b95991ff3377db..5f44e0a24c1a7abbfe174c1d56578c6d9f2e43fe 100755
--- a/testcases/can/can.c
+++ b/testcases/can/can.c
@@ -50,8 +50,8 @@
 #include <poll.h>
 
 /* Harness Specific Include Files. */
-#include "test.h"
-#include "usctest.h"
+#include "old/test.h"
+
 #include "config.h"
 
 /* Local Defines */
diff --git a/testcases/flashled/flashled.c b/testcases/flashled/flashled.c
index 977fb72649e9b65502285425902337fb7aef7e16..f26078c167dc0241acfb53b11db47fceea2f51a8 100755
--- a/testcases/flashled/flashled.c
+++ b/testcases/flashled/flashled.c
@@ -32,8 +32,8 @@
 #include <sys/ioctl.h>
 
 /* Harness Specific Include Files. */
-#include "test.h"
-#include "usctest.h"
+#include "old/test.h"
+
 #include "config.h"
 
 /* Local Defines */
diff --git a/testcases/fwrite/fwrite.c b/testcases/fwrite/fwrite.c
index 5f0e20f715c55d0a3d555a248a39b2baebb530cf..b1c588e7e976b35ac9174a33400c2af5b51d1ff9 100644
--- a/testcases/fwrite/fwrite.c
+++ b/testcases/fwrite/fwrite.c
@@ -40,8 +40,8 @@
 #include <sys/time.h>
 
 /* Harness Specific Include Files. */
-#include "test.h"
-#include "usctest.h"
+#include "old/test.h"
+
 #include "config.h"
 
 /* Local Defines */
diff --git a/testcases/gpio/gpio.c b/testcases/gpio/gpio.c
index 21726c8b519824d67b4785a88f2df3cdcac03efc..126375516358b5f7ec45646ec90faf48906ac99a 100755
--- a/testcases/gpio/gpio.c
+++ b/testcases/gpio/gpio.c
@@ -34,8 +34,8 @@
 #include <unistd.h>
 
 /* Harness Specific Include Files. */
-#include "test.h"
-#include "usctest.h"
+#include "old/test.h"
+
 #include "config.h"
 
 /* Local Defines */
diff --git a/testcases/i2c/i2c.c b/testcases/i2c/i2c.c
index 183a24bdc23d96465fd45428cd5357fb59cec58e..8c5ff55274781a667d54eda554e92414811dcb89 100755
--- a/testcases/i2c/i2c.c
+++ b/testcases/i2c/i2c.c
@@ -37,8 +37,8 @@
 #include <unistd.h>
 
 /* Harness Specific Include Files. */
-#include "test.h"
-#include "usctest.h"
+#include "old/test.h"
+
 #include "config.h"
 
 /* Local Defines */
diff --git a/testcases/iptest/iptest.c b/testcases/iptest/iptest.c
index a409d7889916f38e178f28bce61e82112eda8f61..030ac05ddccb0a1f1042d3ac48e07325b5eb5ab7 100755
--- a/testcases/iptest/iptest.c
+++ b/testcases/iptest/iptest.c
@@ -23,8 +23,8 @@
 #include <time.h>
 
 /* Harness Specific Include Files. */
-#include "test.h"
-#include "usctest.h"
+#include "old/test.h"
+
 #include "config.h"
 
 /************************************************************************/
diff --git a/testcases/lm73temp/lm73temp.c b/testcases/lm73temp/lm73temp.c
index d5d078240db822cc9821856c120268489ab4573e..31b3def3c547f7a41b573cc5a9442d625b9c26a0 100755
--- a/testcases/lm73temp/lm73temp.c
+++ b/testcases/lm73temp/lm73temp.c
@@ -33,8 +33,8 @@
 #include <unistd.h>
 
 /* Harness Specific Include Files. */
-#include "test.h"
-#include "usctest.h"
+#include "old/test.h"
+
 #include "config.h"
 
 /* Local Defines */
diff --git a/testcases/qwheel/qwheel.c b/testcases/qwheel/qwheel.c
index 00368869bbfa160823bb19a7b9f5372dd5a9e7f9..8daad04ab30231298186c673fd0a6b20cfb2d217 100644
--- a/testcases/qwheel/qwheel.c
+++ b/testcases/qwheel/qwheel.c
@@ -38,8 +38,8 @@
 #include <linux/input.h>
 
 /* Harness Specific Include Files. */
-#include "test.h"
-#include "usctest.h"
+#include "old/test.h"
+
 #include "config.h"
 
 /* Local Defines */
@@ -243,7 +243,7 @@ main(int   argc,    /* number of command line parameters                      */
 	 char **argv)   /* pointer to the array of the command line parameters.   */
 {
 	int ret = 0;
-	char leds[3];
+	char leds[4];
 
 	int opt_qwheel_dev = 0, opt_sysfs_dev = 0, opt_timeout = 0;
 	char *str_qwheel_dev, *str_sysfs_dev, *str_timeout;
diff --git a/testcases/rs485pingpong/rs485pingpong.c b/testcases/rs485pingpong/rs485pingpong.c
index 1e9d9f6cd5077bd15214d1c4714568fc2b79e852..ba7ff55e0fe24fbaafb855f3f5e3ce164f582cf6 100644
--- a/testcases/rs485pingpong/rs485pingpong.c
+++ b/testcases/rs485pingpong/rs485pingpong.c
@@ -45,8 +45,8 @@
 #include <asm/ioctls.h>
 
 /* Harness Specific Include Files. */
-#include "test.h"
-#include "usctest.h"
+#include "old/test.h"
+
 #include "config.h"
 
 /* Local Defines */
diff --git a/testcases/rtccheck/rtccheck.c b/testcases/rtccheck/rtccheck.c
index 2248caaae1985ce4c6c4838c2c046c6d80f2342d..cedf3b9517c195d1b003de64ac69ee7af93a0ba8 100644
--- a/testcases/rtccheck/rtccheck.c
+++ b/testcases/rtccheck/rtccheck.c
@@ -35,8 +35,8 @@
 #include <sched.h>
 
 /* Harness Specific Include Files. */
-#include "test.h"
-#include "usctest.h"
+#include "old/test.h"
+
 #include "config.h"
 
 /* Local Defines */
diff --git a/testcases/serial/serial.c b/testcases/serial/serial.c
index 14d1fd491e3095bec46ed02a1a207e7556223221..f6ceceed31b0a9601400c92a9c15513d5119eaad 100755
--- a/testcases/serial/serial.c
+++ b/testcases/serial/serial.c
@@ -42,8 +42,8 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
-#include "test.h"
-#include "usctest.h"
+#include "old/test.h"
+
 
 
 #if !defined(TRUE) && !defined(FALSE)
diff --git a/testcases/timerapi/timerapi-test.c b/testcases/timerapi/timerapi-test.c
index 734d6cd650d2a23723fc56eb6bdf06023bb00906..3c86283e97b67cc4e67c6a8b62d002d2ae1da72b 100644
--- a/testcases/timerapi/timerapi-test.c
+++ b/testcases/timerapi/timerapi-test.c
@@ -4,6 +4,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #define VERSION						"1.0"
 #define SVN_REV						"$Revision: 3627 $"
diff --git a/testcases/touchmon/touchmon.c b/testcases/touchmon/touchmon.c
index 636f460cc6286f6161f962aeca0222cc19a3a11a..0603a9507e43f816cf1480a124811bdaa41c6e8a 100755
--- a/testcases/touchmon/touchmon.c
+++ b/testcases/touchmon/touchmon.c
@@ -33,7 +33,7 @@ char *setting_socket_r = NULL;
 char *setting_socket_s = NULL;
 char *setting_socket_poll = NULL;
 char *setting_logfile = NULL;
-int setting_counter_bound_lower = INT_MAX;
+int setting_counter_bound_lower = WINT_MAX;
 int setting_counter_bound_upper = 0;
 int setting_timeout = 0;
 int setting_daemonize = FALSE;
diff --git a/testcases/touchmon/touchmon.h b/testcases/touchmon/touchmon.h
index eee7a4dde5f85f7f2cd09ea626bd162ed6e0b7d9..b4ff8d14e96ee3c188c3ec198377d1c45b85951b 100755
--- a/testcases/touchmon/touchmon.h
+++ b/testcases/touchmon/touchmon.h
@@ -20,8 +20,7 @@
 
 
 /* harness specific includes */
-#include "test.h"
-#include "usctest.h"
+#include "old/test.h"
 
 #define max(x, y) ((x > y) ? (x) : (y))
 #define min(x, y) ((x > y) ? (y) : (x))
@@ -130,4 +129,4 @@ int do_request_poll();
 int do_request_count();
 void do_request_reset();
 void do_request_term();
-#endif
\ No newline at end of file
+#endif
diff --git a/testcases/v4l2capture/v4l2capture.c b/testcases/v4l2capture/v4l2capture.c
index 446fc9279bab83bdda43d554e82c01239326a3fa..283a95b7a45f17b1b1b61b933690ef22e8ff2787 100755
--- a/testcases/v4l2capture/v4l2capture.c
+++ b/testcases/v4l2capture/v4l2capture.c
@@ -36,8 +36,8 @@
 #include <linux/videodev2.h>
 
 /* Harness specific include files. */
-#include "test.h"
-#include "usctest.h"
+#include "old/test.h"
+
 #include "config.h"
 
 /* Local include files */