diff --git a/ivtest/vpi/br_ml20191013.c b/ivtest/vpi/br_ml20191013.c
index 051af33b7..2919e2792 100644
--- a/ivtest/vpi/br_ml20191013.c
+++ b/ivtest/vpi/br_ml20191013.c
@@ -25,15 +25,9 @@
 #endif
 
 /* prototypes of PLI application routine names */
-#ifdef IVERILOG_V0_8
-static PLI_INT32 PLIbook_PowSizetf(char *user_data);
-static PLI_INT32 PLIbook_PowCalltf(char *user_data);
-static PLI_INT32 PLIbook_PowCompiletf(char *user_data);
-#else
 static PLI_INT32 PLIbook_PowSizetf(PLI_BYTE8 *user_data);
 static PLI_INT32 PLIbook_PowCalltf(PLI_BYTE8 *user_data);
 static PLI_INT32 PLIbook_PowCompiletf(PLI_BYTE8 *user_data);
-#endif
 static PLI_INT32 PLIbook_PowStartOfSim(s_cb_data *callback_data);
 
 /**********************************************************************
@@ -68,11 +62,7 @@ void PLIbook_pow_register(void)
 /**********************************************************************
  * Sizetf application
  *********************************************************************/
-#ifdef IVERILOG_V0_8
-static PLI_INT32 PLIbook_PowSizetf(char *user_data)
-#else
 static PLI_INT32 PLIbook_PowSizetf(PLI_BYTE8 *user_data)
-#endif
 {
   (void)user_data;  /* Parameter is not used. */
   //vpi_printf("\n$pow PLI sizetf function.\n\n");
@@ -82,11 +72,7 @@ static PLI_INT32 PLIbook_PowSizetf(PLI_BYTE8 *user_data)
 /**********************************************************************
  * compiletf application to verify valid systf args.
  *********************************************************************/
-#ifdef IVERILOG_V0_8
-static PLI_INT32 PLIbook_PowCompiletf(char *user_data)
-#else
 static PLI_INT32 PLIbook_PowCompiletf(PLI_BYTE8 *user_data)
-#endif
 {
   vpiHandle systf_handle, arg_itr, arg_handle;
   PLI_INT32 tfarg_type;
@@ -145,11 +131,7 @@ static PLI_INT32 PLIbook_PowCompiletf(PLI_BYTE8 *user_data)
  * calltf to calculate base to power of exponent and return result.
  *********************************************************************/
 #include <math.h>
-#ifdef IVERILOG_V0_8
-static PLI_INT32 PLIbook_PowCalltf(char *user_data)
-#else
 static PLI_INT32 PLIbook_PowCalltf(PLI_BYTE8 *user_data)
-#endif
 {
   s_vpi_value value_s;
   vpiHandle   systf_handle, arg_itr, arg_handle;
diff --git a/ivtest/vpi/by_name.c b/ivtest/vpi/by_name.c
index 3b07b74ab..aeec03b4f 100644
--- a/ivtest/vpi/by_name.c
+++ b/ivtest/vpi/by_name.c
@@ -64,11 +64,7 @@ static void FindHandleByName(void)
     }
 }
 
-#ifdef IVERILOG_V0_8
-static PLI_INT32 CompileTF(char *x)
-#else
 static PLI_INT32 CompileTF(PLI_BYTE8 *x)
-#endif
 {
 	(void)x;  /* Parameter is not used. */
 	FindHandleByName();
diff --git a/ivtest/vpi/event1.c b/ivtest/vpi/event1.c
index c1e8373af..b22ae71df 100644
--- a/ivtest/vpi/event1.c
+++ b/ivtest/vpi/event1.c
@@ -26,11 +26,7 @@
 
 static int num;
 
-#ifdef IVERILOG_V0_8
-static PLI_INT32 CompileTF(char *x)
-#else
 static PLI_INT32 CompileTF(PLI_BYTE8 *x)
-#endif
 {
 	vpiHandle sys = vpi_handle(vpiSysTfCall, 0);
 	vpiHandle argv = vpi_iterate(vpiArgument, sys);
diff --git a/ivtest/vpi/hello_poke.c b/ivtest/vpi/hello_poke.c
index d2b6fb922..2ba8094fa 100644
--- a/ivtest/vpi/hello_poke.c
+++ b/ivtest/vpi/hello_poke.c
@@ -21,11 +21,7 @@
 # include  <vpi_user.h>
 # include  <assert.h>
 
-#ifdef IVERILOG_V0_8
-static PLI_INT32 my_hello_calltf(char *xx)
-#else
 static PLI_INT32 my_hello_calltf(PLI_BYTE8 *xx)
-#endif
 {
       s_vpi_value value;
 
diff --git a/ivtest/vpi/hello_tf.c b/ivtest/vpi/hello_tf.c
index 8566ad03d..936253d0e 100644
--- a/ivtest/vpi/hello_tf.c
+++ b/ivtest/vpi/hello_tf.c
@@ -20,11 +20,7 @@
 # include  <vpi_user.h>
 # include  <veriuser.h>
 
-#ifdef IVERILOG_V0_8
-static PLI_INT32 my_hello_calltf(char *xx)
-#else
 static PLI_INT32 my_hello_calltf(PLI_BYTE8 *xx)
-#endif
 {
       (void)xx;  /* Parameter is not used. */
       io_printf("Hello World, from VPI.\n");
diff --git a/ivtest/vpi/hello_vpi.c b/ivtest/vpi/hello_vpi.c
index 06ad374cd..2e597b6a1 100644
--- a/ivtest/vpi/hello_vpi.c
+++ b/ivtest/vpi/hello_vpi.c
@@ -30,11 +30,7 @@
 
 # include  <vpi_user.h>
 
-#ifdef IVERILOG_V0_8
-static PLI_INT32 my_hello_calltf(char *xx)
-#else
 static PLI_INT32 my_hello_calltf(PLI_BYTE8 *xx)
-#endif
 {
       (void)xx;  /* Parameter is not used. */
       vpi_printf("Hello World, from VPI.\n");
diff --git a/ivtest/vpi/listparams.c b/ivtest/vpi/listparams.c
index 2bc0d21a9..49dd68450 100644
--- a/ivtest/vpi/listparams.c
+++ b/ivtest/vpi/listparams.c
@@ -3,11 +3,7 @@
 # include  <string.h>
 # include  <assert.h>
 
-#ifdef IVERILOG_V0_8
-static PLI_INT32 listparams_compiletf(char*name)
-#else
 static PLI_INT32 listparams_compiletf(PLI_BYTE8*name)
-#endif
 {
       (void)name;  /* Parameter is not used. */
       return 0;
@@ -46,11 +42,7 @@ static void param_by_name(vpiHandle scope, const char*key)
       }
 }
 
-#ifdef IVERILOG_V0_8
-static PLI_INT32 listparams_calltf(char*name)
-#else
 static PLI_INT32 listparams_calltf(PLI_BYTE8*name)
-#endif
 {
       vpiHandle sys  = vpi_handle(vpiSysTfCall,0);
       vpiHandle scope= vpi_handle(vpiScope, sys);
diff --git a/ivtest/vpi/memmon.c b/ivtest/vpi/memmon.c
index 440a69409..7bd1682f7 100644
--- a/ivtest/vpi/memmon.c
+++ b/ivtest/vpi/memmon.c
@@ -1,11 +1,7 @@
 # include  <vpi_user.h>
 # include  <stdlib.h>
 
-#ifdef IVERILOG_V0_8
-static PLI_INT32 memmonitor_compiletf(char*name)
-#else
 static PLI_INT32 memmonitor_compiletf(PLI_BYTE8*name)
-#endif
 {
       vpiHandle sys = vpi_handle(vpiSysTfCall,0);
       vpiHandle argv = vpi_iterate(vpiArgument, sys);
@@ -41,11 +37,7 @@ static PLI_INT32 cleanup(struct t_cb_data*cb)
       return 0;
 }
 
-#ifdef IVERILOG_V0_8
-static PLI_INT32 memmonitor_calltf(char*name)
-#else
 static PLI_INT32 memmonitor_calltf(PLI_BYTE8*name)
-#endif
 {
       vpiHandle sys  = vpi_handle(vpiSysTfCall,0);
       vpiHandle argv = vpi_iterate(vpiArgument, sys);
diff --git a/ivtest/vpi/nulls1.c b/ivtest/vpi/nulls1.c
index 4d666e43c..02c9e932e 100644
--- a/ivtest/vpi/nulls1.c
+++ b/ivtest/vpi/nulls1.c
@@ -34,11 +34,7 @@ ValueChange(p_cb_data cb_data)
 	return(0);
 }
 
-#ifdef IVERILOG_V0_8
-PLI_INT32 CompileTF(char *user_data)
-#else
 PLI_INT32 CompileTF(PLI_BYTE8 *user_data)
-#endif
 {
 	s_cb_data cb_data;
 	vpiHandle call_h=vpi_handle(vpiSysTfCall,NULL);
diff --git a/ivtest/vpi/pokereg.cc b/ivtest/vpi/pokereg.cc
index 17a43afa8..e728028a7 100644
--- a/ivtest/vpi/pokereg.cc
+++ b/ivtest/vpi/pokereg.cc
@@ -33,11 +33,7 @@ static struct str_s {
     {vpiHexStrVal, "x4"}
 };
 
-#ifdef IVERILOG_V0_8
-extern "C" PLI_INT32 RegPeek(char *)
-#else
 extern "C" PLI_INT32 RegPeek(PLI_BYTE8 *)
-#endif
 {
     vpiHandle	mod_h, iterate, handle;
     vpiHandle	reg_h[5];
@@ -93,11 +89,7 @@ extern "C" PLI_INT32 RegPeek(PLI_BYTE8 *)
     return 0;
 }
 
-#ifdef IVERILOG_V0_8
-extern "C" PLI_INT32 RegPoke(char *)
-#else
 extern "C" PLI_INT32 RegPoke(PLI_BYTE8 *)
-#endif
 {
     vpiHandle	mod_h, iterate, handle;
     vpiHandle	reg_h[5];
diff --git a/ivtest/vpi/pr1693971.c b/ivtest/vpi/pr1693971.c
index 320e2adc3..5211c2ab8 100644
--- a/ivtest/vpi/pr1693971.c
+++ b/ivtest/vpi/pr1693971.c
@@ -25,15 +25,9 @@
 #endif
 
 /* prototypes of PLI application routine names */
-#ifdef IVERILOG_V0_8
-static PLI_INT32 PLIbook_PowSizetf(char *user_data);
-static PLI_INT32 PLIbook_PowCalltf(char *user_data);
-static PLI_INT32 PLIbook_PowCompiletf(char *user_data);
-#else
 static PLI_INT32 PLIbook_PowSizetf(PLI_BYTE8 *user_data);
 static PLI_INT32 PLIbook_PowCalltf(PLI_BYTE8 *user_data);
 static PLI_INT32 PLIbook_PowCompiletf(PLI_BYTE8 *user_data);
-#endif
 static PLI_INT32 PLIbook_PowStartOfSim(s_cb_data *callback_data);
 
 /**********************************************************************
@@ -68,11 +62,7 @@ void PLIbook_pow_register(void)
 /**********************************************************************
  * Sizetf application
  *********************************************************************/
-#ifdef IVERILOG_V0_8
-static PLI_INT32 PLIbook_PowSizetf(char *user_data)
-#else
 static PLI_INT32 PLIbook_PowSizetf(PLI_BYTE8 *user_data)
-#endif
 {
   (void)user_data;  /* Parameter is not used. */
   //vpi_printf("\n$my_pow PLI sizetf function.\n\n");
@@ -82,11 +72,7 @@ static PLI_INT32 PLIbook_PowSizetf(PLI_BYTE8 *user_data)
 /**********************************************************************
  * compiletf application to verify valid systf args.
  *********************************************************************/
-#ifdef IVERILOG_V0_8
-static PLI_INT32 PLIbook_PowCompiletf(char *user_data)
-#else
 static PLI_INT32 PLIbook_PowCompiletf(PLI_BYTE8 *user_data)
-#endif
 {
   vpiHandle systf_handle, arg_itr, arg_handle;
   PLI_INT32 tfarg_type;
@@ -145,11 +131,7 @@ static PLI_INT32 PLIbook_PowCompiletf(PLI_BYTE8 *user_data)
  * calltf to calculate base to power of exponent and return result.
  *********************************************************************/
 #include <math.h>
-#ifdef IVERILOG_V0_8
-static PLI_INT32 PLIbook_PowCalltf(char *user_data)
-#else
 static PLI_INT32 PLIbook_PowCalltf(PLI_BYTE8 *user_data)
-#endif
 {
   s_vpi_value value_s;
   vpiHandle   systf_handle, arg_itr, arg_handle;
diff --git a/ivtest/vpi/pr2314742.c b/ivtest/vpi/pr2314742.c
index cd8176fba..e69c1cb62 100644
--- a/ivtest/vpi/pr2314742.c
+++ b/ivtest/vpi/pr2314742.c
@@ -23,11 +23,7 @@ static int chkvpierr(void)
   return level;
 }
 
-#ifdef IVERILOG_V0_8
-static PLI_INT32 xxx_compiletf(char *user_data)
-#else
 static PLI_INT32 xxx_compiletf(PLI_BYTE8 *user_data)
-#endif
 {
   (void)user_data;  /* Parameter is not used. */
   return 0;
@@ -35,11 +31,7 @@ static PLI_INT32 xxx_compiletf(PLI_BYTE8 *user_data)
 
 char		charbuf[100];
 
-#ifdef IVERILOG_V0_8
-static PLI_INT32 xxx_calltf(char *user_data)
-#else
 static PLI_INT32 xxx_calltf(PLI_BYTE8 *user_data)
-#endif
 {
   vpiHandle             systf_h;
   s_vpi_value		vpival; /* get/set register values */
diff --git a/ivtest/vpi/pr2966059.c b/ivtest/vpi/pr2966059.c
index 019d8337c..581d460e9 100644
--- a/ivtest/vpi/pr2966059.c
+++ b/ivtest/vpi/pr2966059.c
@@ -1,10 +1,6 @@
 #include "vpi_user.h"
 
-#ifdef IVERILOG_V0_8
-static PLI_INT32 number_compiletf(char *x)
-#else
 static PLI_INT32 number_compiletf(PLI_BYTE8 *x)
-#endif
 {
       vpiHandle callh = vpi_handle(vpiSysTfCall, 0);
       vpiHandle argv = vpi_iterate(vpiArgument, callh);
diff --git a/ivtest/vpi/pr686.c b/ivtest/vpi/pr686.c
index a3e62b73f..dc68db901 100644
--- a/ivtest/vpi/pr686.c
+++ b/ivtest/vpi/pr686.c
@@ -38,21 +38,13 @@ static PLI_INT32 next_sim_time_callback(struct t_cb_data*cb)
       return 0;
 }
 
-#ifdef IVERILOG_V0_8
-static PLI_INT32 test_next_compiletf(char *name)
-#else
 static PLI_INT32 test_next_compiletf(PLI_BYTE8 *name)
-#endif
 {
       (void)name;  /* Parameter is not used. */
       return 0;
 }
 
-#ifdef IVERILOG_V0_8
-static PLI_INT32 test_next_calltf(char *name)
-#else
 static PLI_INT32 test_next_calltf(PLI_BYTE8 *name)
-#endif
 {
       vpiHandle sys, argv, value;
 
diff --git a/ivtest/vpi/pr723.c b/ivtest/vpi/pr723.c
index 239f63b35..e02eb9e86 100644
--- a/ivtest/vpi/pr723.c
+++ b/ivtest/vpi/pr723.c
@@ -1,11 +1,7 @@
 #include <assert.h>
 #include "vpi_user.h"
 
-#ifdef IVERILOG_V0_8
-static PLI_INT32 calltf(char *data)
-#else
 static PLI_INT32 calltf(PLI_BYTE8 *data)
-#endif
 {
     int i;
 
diff --git a/ivtest/vpi/realcb.c b/ivtest/vpi/realcb.c
index 59914c7da..9422b9b5a 100644
--- a/ivtest/vpi/realcb.c
+++ b/ivtest/vpi/realcb.c
@@ -39,11 +39,7 @@ static PLI_INT32 watchreal_cb(p_cb_data cb)
       return 0;
 }
 
-#ifdef IVERILOG_V0_8
-static PLI_INT32 my_watchreal_calltf(char *xx)
-#else
 static PLI_INT32 my_watchreal_calltf(PLI_BYTE8 *xx)
-#endif
 {
       struct t_cb_data cb;
       struct t_vpi_time timerec;
diff --git a/ivtest/vpi/realtime.c b/ivtest/vpi/realtime.c
index e4f74e1c6..28416ff0e 100644
--- a/ivtest/vpi/realtime.c
+++ b/ivtest/vpi/realtime.c
@@ -26,11 +26,7 @@
 
 s_vpi_time get_time = { vpiScaledRealTime, 0, 0, 0 };
 
-#ifdef IVERILOG_V0_8
-static PLI_INT32 calltf(char *data)
-#else
 static PLI_INT32 calltf(PLI_BYTE8 *data)
-#endif
 {
     vpiHandle hand, iter;
 
diff --git a/ivtest/vpi/realtime2.c b/ivtest/vpi/realtime2.c
index e4f74e1c6..28416ff0e 100644
--- a/ivtest/vpi/realtime2.c
+++ b/ivtest/vpi/realtime2.c
@@ -26,11 +26,7 @@
 
 s_vpi_time get_time = { vpiScaledRealTime, 0, 0, 0 };
 
-#ifdef IVERILOG_V0_8
-static PLI_INT32 calltf(char *data)
-#else
 static PLI_INT32 calltf(PLI_BYTE8 *data)
-#endif
 {
     vpiHandle hand, iter;
 
diff --git a/ivtest/vpi/scanmem.cc b/ivtest/vpi/scanmem.cc
index fb19a5e97..f9fd495e1 100644
--- a/ivtest/vpi/scanmem.cc
+++ b/ivtest/vpi/scanmem.cc
@@ -22,11 +22,7 @@
 #include <string.h>
 #include "vpi_user.h"
 
-#ifdef IVERILOG_V0_8
-extern "C" PLI_INT32 MemPeek(char *)
-#else
 extern "C" PLI_INT32 MemPeek(PLI_BYTE8 *)
-#endif
 {
     vpiHandle	mod_h, mem_h, iterate, handle;
     s_vpi_value	value;
@@ -79,11 +75,7 @@ extern "C" PLI_INT32 MemPeek(PLI_BYTE8 *)
 #define REP4(x) \
     (((x) & 0xff) << 24 | ((x) & 0xff) << 16 | ((x) & 0xff) << 8 | ((x) & 0xff))
 
-#ifdef IVERILOG_V0_8
-extern "C" PLI_INT32 MemPoke(char *)
-#else
 extern "C" PLI_INT32 MemPoke(PLI_BYTE8 *)
-#endif
 {
     vpiHandle	mod_h, mem_h, iterate, handle;
     s_vpi_value	value;
diff --git a/ivtest/vpi/scanmem2.cc b/ivtest/vpi/scanmem2.cc
index e170d7f73..acd807e1d 100644
--- a/ivtest/vpi/scanmem2.cc
+++ b/ivtest/vpi/scanmem2.cc
@@ -31,11 +31,7 @@ const char *str[4] = {
  "1111000000001100101011111010101110101011111011011110101010111011111011101111"
 };
 
-#ifdef IVERILOG_V0_8
-extern "C" PLI_INT32 MemPeek(char *)
-#else
 extern "C" PLI_INT32 MemPeek(PLI_BYTE8 *)
-#endif
 {
     vpiHandle	mod_h, mem_h, iterate, handle;
     s_vpi_value	value;
@@ -101,11 +97,7 @@ extern "C" PLI_INT32 MemPeek(PLI_BYTE8 *)
     return 0;
 }
 
-#ifdef IVERILOG_V0_8
-extern "C" PLI_INT32 MemPoke(char *)
-#else
 extern "C" PLI_INT32 MemPoke(PLI_BYTE8 *)
-#endif
 {
     vpiHandle	mod_h, mem_h, iterate, handle;
     s_vpi_value	value;
diff --git a/ivtest/vpi/scanmem3.cc b/ivtest/vpi/scanmem3.cc
index 39c22be80..2eb4c475c 100644
--- a/ivtest/vpi/scanmem3.cc
+++ b/ivtest/vpi/scanmem3.cc
@@ -38,11 +38,7 @@ static struct str_s {
     {vpiHexStrVal, "x8"}
 };
 
-#ifdef IVERILOG_V0_8
-extern "C" PLI_INT32 MemPeek(char *)
-#else
 extern "C" PLI_INT32 MemPeek(PLI_BYTE8 *)
-#endif
 {
     vpiHandle	mod_h, mem_h, iterate, handle;
     vpiHandle	word_h[8];
@@ -108,11 +104,7 @@ extern "C" PLI_INT32 MemPeek(PLI_BYTE8 *)
     return 0;
 }
 
-#ifdef IVERILOG_V0_8
-extern "C" PLI_INT32 MemPoke(char *)
-#else
 extern "C" PLI_INT32 MemPoke(PLI_BYTE8 *)
-#endif
 {
     vpiHandle	mod_h, mem_h, iterate, handle;
     vpiHandle	word_h[8];
diff --git a/ivtest/vpi/scopes.c b/ivtest/vpi/scopes.c
index a067f0060..5d9300ed3 100644
--- a/ivtest/vpi/scopes.c
+++ b/ivtest/vpi/scopes.c
@@ -32,11 +32,7 @@ static void RecurseScope(vpiHandle handle, int depth)
     }
 }
 
-#ifdef IVERILOG_V0_8
-static PLI_INT32 CompileTF(char *x)
-#else
 static PLI_INT32 CompileTF(PLI_BYTE8 *x)
-#endif
 {
 	(void)x;  /* Parameter is not used. */
 	RecurseScope(NULL, 0);
diff --git a/ivtest/vpi/spec_delays.c b/ivtest/vpi/spec_delays.c
index b436081e4..6244415c3 100644
--- a/ivtest/vpi/spec_delays.c
+++ b/ivtest/vpi/spec_delays.c
@@ -4,11 +4,7 @@
 # include  <assert.h>
 
 
-#ifdef IVERILOG_V0_8
-static PLI_INT32 dump_specify_compiletf(char*name)
-#else
 static PLI_INT32 dump_specify_compiletf(PLI_BYTE8*name)
-#endif
 {
       vpiHandle sys = vpi_handle(vpiSysTfCall, 0);
       vpiHandle argv = vpi_iterate(vpiArgument, sys);
@@ -37,11 +33,7 @@ static PLI_INT32 dump_specify_compiletf(PLI_BYTE8*name)
       return 0;
 }
 
-#ifdef IVERILOG_V0_8
-static PLI_INT32 dump_specify_calltf(char*name)
-#else
 static PLI_INT32 dump_specify_calltf(PLI_BYTE8*name)
-#endif
 {
       vpiHandle sys = vpi_handle(vpiSysTfCall, 0);
       vpiHandle argv = vpi_iterate(vpiArgument, sys);