diff --git a/testcases/kernel/timers/timer_delete/timer_delete01.1-1.c b/testcases/kernel/timers/timer_delete/timer_delete01.1-1.c
index 54f96ff..b19a657 100644
--- a/testcases/kernel/timers/timer_delete/timer_delete01.1-1.c
+++ b/testcases/kernel/timers/timer_delete/timer_delete01.1-1.c
@@ -27,7 +27,6 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include "posixtest.h"
-#include "timer_delete01.h"
 
 #define SIGTOTEST SIGALRM
 #define TIMERSEC 3
diff --git a/testcases/kernel/timers/timer_delete/timer_delete01.1-2.c b/testcases/kernel/timers/timer_delete/timer_delete01.1-2.c
index 32b2f25..e015cc4 100644
--- a/testcases/kernel/timers/timer_delete/timer_delete01.1-2.c
+++ b/testcases/kernel/timers/timer_delete/timer_delete01.1-2.c
@@ -22,7 +22,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include "posixtest.h"
-#include "timer_delete01.h"
 
 #define SIGTOTEST SIGALRM
 #define TIMERSEC 3
diff --git a/testcases/kernel/timers/timer_delete/timer_delete01.5-1.c b/testcases/kernel/timers/timer_delete/timer_delete01.5-1.c
index 4e4412f..ed6232c 100644
--- a/testcases/kernel/timers/timer_delete/timer_delete01.5-1.c
+++ b/testcases/kernel/timers/timer_delete/timer_delete01.5-1.c
@@ -13,7 +13,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include "posixtest.h"
-#include "timer_delete01.h"
 
 #define BOGUSTIMERID 99999
 
diff --git a/testcases/kernel/timers/timer_delete/timer_delete01.5-2.c b/testcases/kernel/timers/timer_delete/timer_delete01.5-2.c
index 34dcfbc..658c5ff 100644
--- a/testcases/kernel/timers/timer_delete/timer_delete01.5-2.c
+++ b/testcases/kernel/timers/timer_delete/timer_delete01.5-2.c
@@ -21,7 +21,6 @@
 #include <stdlib.h>
 #include <errno.h>
 #include "posixtest.h"
-#include "timer_delete01.h"
 
 #define SIGTOTEST SIGALRM
 #define TIMERSEC 3
diff --git a/testcases/kernel/timers/timer_delete/timer_delete01.h b/testcases/kernel/timers/timer_delete/timer_delete01.h
deleted file mode 100644
index 439b34f..0000000
--- a/testcases/kernel/timers/timer_delete/timer_delete01.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-/* timer_create */
-#ifndef __NR_timer_create
-#if defined(__i386__)
-#define __NR_timer_create 259
-#elif defined(__ppc__)
-#define __NR_timer_create 240
-#elif defined(__ppc64__)
-#define __NR_timer_create 240
-#elif defined(__x86_64__)
-#define __NR_timer_create 222
-#elif defined(__s390__)
-#define __NR_timer_create 254
-#elif defined(__ia64__)
-#define __NR_timer_create 1248
-#elif defined(__h8300__)
-#define __NR_timer_create 259
-#elif defined(__parisc__)
-#define __NR_HPUX_timer_create 348
-#endif
-#endif
-#pragma weak timer_create
-
-/* timer_settime */
-#ifndef __NR_timer_settime
-#if defined(__parisc__)
-#define __NR_HPUX_timer_settime 350
-#else
-#define __NR_timer_settime (__NR_timer_create+1)
-#endif
-#endif
-#pragma weak timer_settime
-
-/* timer_delete */
-#ifndef __NR_timer_delete
-#if defined(__parisc__)
-#define __NR_HPUX_timer_delete 349
-#else
-#define __NR_timer_delete (__NR_timer_create+4)
-#endif
-#endif
-#pragma weak timer_delete
-
diff --git a/testcases/kernel/timers/timer_gettime/timer_gettime01.1-1.c b/testcases/kernel/timers/timer_gettime/timer_gettime01.1-1.c
index 627e0bf..2229324 100644
--- a/testcases/kernel/timers/timer_gettime/timer_gettime01.1-1.c
+++ b/testcases/kernel/timers/timer_gettime/timer_gettime01.1-1.c
@@ -23,7 +23,6 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include "posixtest.h"
-#include "timer_gettime01.h"
 
 #define TIMERSEC 5
 #define ACCEPTABLEDELTA 1
diff --git a/testcases/kernel/timers/timer_gettime/timer_gettime01.1-2.c b/testcases/kernel/timers/timer_gettime/timer_gettime01.1-2.c
index c5ba465..3ea9fe3 100644
--- a/testcases/kernel/timers/timer_gettime/timer_gettime01.1-2.c
+++ b/testcases/kernel/timers/timer_gettime/timer_gettime01.1-2.c
@@ -24,7 +24,6 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include "posixtest.h"
-#include "timer_gettime01.h"
 
 
 #define TIMERSEC 8
diff --git a/testcases/kernel/timers/timer_gettime/timer_gettime01.1-3.c b/testcases/kernel/timers/timer_gettime/timer_gettime01.1-3.c
index 334bceb..69ec0ae 100644
--- a/testcases/kernel/timers/timer_gettime/timer_gettime01.1-3.c
+++ b/testcases/kernel/timers/timer_gettime/timer_gettime01.1-3.c
@@ -24,7 +24,6 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include "posixtest.h"
-#include "timer_gettime01.h"
 
 
 #define TIMERNSEC 80000000
diff --git a/testcases/kernel/timers/timer_gettime/timer_gettime01.1-4.c b/testcases/kernel/timers/timer_gettime/timer_gettime01.1-4.c
index b7c2621..42a4427 100644
--- a/testcases/kernel/timers/timer_gettime/timer_gettime01.1-4.c
+++ b/testcases/kernel/timers/timer_gettime/timer_gettime01.1-4.c
@@ -28,7 +28,6 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include "posixtest.h"
-#include "timer_gettime01.h"
 
 
 #define TIMERVALSEC 2
diff --git a/testcases/kernel/timers/timer_gettime/timer_gettime01.2-1.c b/testcases/kernel/timers/timer_gettime/timer_gettime01.2-1.c
index d6758b4..17a40b3 100644
--- a/testcases/kernel/timers/timer_gettime/timer_gettime01.2-1.c
+++ b/testcases/kernel/timers/timer_gettime/timer_gettime01.2-1.c
@@ -18,7 +18,6 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include "posixtest.h"
-#include "timer_gettime01.h"
 
 
 #define TIMERSEC 1
diff --git a/testcases/kernel/timers/timer_gettime/timer_gettime01.2-2.c b/testcases/kernel/timers/timer_gettime/timer_gettime01.2-2.c
index bb536fb..820467b 100644
--- a/testcases/kernel/timers/timer_gettime/timer_gettime01.2-2.c
+++ b/testcases/kernel/timers/timer_gettime/timer_gettime01.2-2.c
@@ -19,7 +19,6 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include "posixtest.h"
-#include "timer_gettime01.h"
 
 
 #define TIMERSEC 1
diff --git a/testcases/kernel/timers/timer_gettime/timer_gettime01.3-1.c b/testcases/kernel/timers/timer_gettime/timer_gettime01.3-1.c
index 8553264..3ab268d 100644
--- a/testcases/kernel/timers/timer_gettime/timer_gettime01.3-1.c
+++ b/testcases/kernel/timers/timer_gettime/timer_gettime01.3-1.c
@@ -23,7 +23,6 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include "posixtest.h"
-#include "timer_gettime01.h"
 
 
 #define TIMERSEC 2
diff --git a/testcases/kernel/timers/timer_gettime/timer_gettime01.6-1.c b/testcases/kernel/timers/timer_gettime/timer_gettime01.6-1.c
index bd98fc4..8070c7e 100644
--- a/testcases/kernel/timers/timer_gettime/timer_gettime01.6-1.c
+++ b/testcases/kernel/timers/timer_gettime/timer_gettime01.6-1.c
@@ -13,7 +13,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include "posixtest.h"
-#include "timer_gettime01.h"
 
 
 #define BOGUSTID 9999
diff --git a/testcases/kernel/timers/timer_gettime/timer_gettime01.6-2.c b/testcases/kernel/timers/timer_gettime/timer_gettime01.6-2.c
index 8899270..32da35e 100644
--- a/testcases/kernel/timers/timer_gettime/timer_gettime01.6-2.c
+++ b/testcases/kernel/timers/timer_gettime/timer_gettime01.6-2.c
@@ -18,7 +18,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include "posixtest.h"
-#include "timer_gettime01.h"
 
 
 int main(int argc, char *argv[])
diff --git a/testcases/kernel/timers/timer_gettime/timer_gettime01.6-3.c b/testcases/kernel/timers/timer_gettime/timer_gettime01.6-3.c
index 6321852..988a8bf 100644
--- a/testcases/kernel/timers/timer_gettime/timer_gettime01.6-3.c
+++ b/testcases/kernel/timers/timer_gettime/timer_gettime01.6-3.c
@@ -17,7 +17,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include "posixtest.h"
-#include "timer_gettime01.h"
 
 
 int main(int argc, char *argv[])
diff --git a/testcases/kernel/timers/timer_gettime/timer_gettime01.h b/testcases/kernel/timers/timer_gettime/timer_gettime01.h
deleted file mode 100644
index 18a7b57..0000000
--- a/testcases/kernel/timers/timer_gettime/timer_gettime01.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-/* timer_create */
-#ifndef __NR_timer_create
-#if defined(__i386__)
-#define __NR_timer_create 259
-#elif defined(__ppc__)
-#define __NR_timer_create 240
-#elif defined(__ppc64__)
-#define __NR_timer_create 240
-#elif defined(__x86_64__)
-#define __NR_timer_create 222
-#elif defined(__s390__)
-#define __NR_timer_create 254
-#elif defined(__ia64__)
-#define __NR_timer_create 1248
-#elif defined(__h8300__)
-#define __NR_timer_create 259
-#elif defined(__parisc__)
-#define __NR_HPUX_timer_create 348
-#endif
-#endif
-#pragma weak timer_create
-
-/* timer_settime */
-#ifndef __NR_timer_settime
-#if defined(__parisc__)
-#define __NR_HPUX_timer_settime 350
-#else
-#define __NR_timer_settime (__NR_timer_create+1)
-#endif
-#endif
-#pragma weak timer_settime
-
-/* timer_gettime */
-#ifndef __NR_timer_gettime
-#if defined(__parisc__)
-#define __NR_HPUX_timer_gettime 351
-#else
-#define __NR_timer_gettime (__NR_timer_create+2)
-#endif
-#endif
-#pragma weak timer_gettime
-
-/* timer_delete */
-#ifndef __NR_timer_delete
-#if defined(__parisc__)
-#define __NR_HPUX_timer_delete 349
-#else
-#define __NR_timer_delete (__NR_timer_create+4)
-#endif
-#endif
-#pragma weak timer_delete
-
-/* clock_gettime */
-#ifndef __NR_clock_gettime
-#if defined(__parisc__)
-#define __NR_HPUX_clock_gettime 346
-#else
-#define __NR_clock_gettime (__NR_timer_create+6)
-#endif
-#endif
-#pragma weak clock_gettime