diff --git a/libveriuser/a_compare_handles.c b/libveriuser/a_compare_handles.c
index da0c0d0eb..2725717c5 100644
--- a/libveriuser/a_compare_handles.c
+++ b/libveriuser/a_compare_handles.c
@@ -17,19 +17,22 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: a_compare_handles.c,v 1.2 2003/08/26 16:26:02 steve Exp $"
+#ident "$Id: a_compare_handles.c,v 1.3 2004/02/18 02:51:59 steve Exp $"
 #endif
 
 # include  <vpi_user.h>
 # include  <acc_user.h>
 
-int acc_compare_handles(handle handle1, handle handle2)
+PLI_INT32 acc_compare_handles(handle handle1, handle handle2)
 {
       return handle1 == handle2;
 }
 
 /*
  * $Log: a_compare_handles.c,v $
+ * Revision 1.3  2004/02/18 02:51:59  steve
+ *  Fix type mismatches of various VPI functions.
+ *
  * Revision 1.2  2003/08/26 16:26:02  steve
  *  ifdef idents correctly.
  *
diff --git a/libveriuser/a_fetch_range.c b/libveriuser/a_fetch_range.c
index fedc45f40..6be4debb3 100644
--- a/libveriuser/a_fetch_range.c
+++ b/libveriuser/a_fetch_range.c
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: a_fetch_range.c,v 1.1 2003/06/04 01:56:20 steve Exp $"
+#ident "$Id: a_fetch_range.c,v 1.2 2004/02/18 02:51:59 steve Exp $"
 #endif
 
 #include  <vpi_user.h>
@@ -26,7 +26,7 @@
 /*
  * acc_fetch_range implemented using VPI interface
  */
-PLI_INT32 acc_fetch_range(handle object, PLI_INT32 *msb, PLI_INT32 *lsb)
+PLI_INT32 acc_fetch_range(handle object, int *msb, int *lsb)
 {
       *msb = vpi_get(vpiLeftRange, object);
       *lsb = vpi_get(vpiRightRange, object);
@@ -35,6 +35,9 @@ PLI_INT32 acc_fetch_range(handle object, PLI_INT32 *msb, PLI_INT32 *lsb)
 
 /*
  * $Log: a_fetch_range.c,v $
+ * Revision 1.2  2004/02/18 02:51:59  steve
+ *  Fix type mismatches of various VPI functions.
+ *
  * Revision 1.1  2003/06/04 01:56:20  steve
  * 1) Adds configure logic to clean up compiler warnings
  * 2) adds acc_compare_handle, acc_fetch_range, acc_next_scope and
diff --git a/libveriuser/a_fetch_tfarg.c b/libveriuser/a_fetch_tfarg.c
index 77085b449..1b8377244 100644
--- a/libveriuser/a_fetch_tfarg.c
+++ b/libveriuser/a_fetch_tfarg.c
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: a_fetch_tfarg.c,v 1.8 2003/06/14 01:16:17 steve Exp $"
+#ident "$Id: a_fetch_tfarg.c,v 1.9 2004/02/18 02:51:59 steve Exp $"
 #endif
 
 #include  <vpi_user.h>
@@ -56,7 +56,7 @@ double acc_fetch_itfarg(PLI_INT32 n, handle obj)
       return rtn;
 }
 
-double acc_fetch_tfarg(int n)
+double acc_fetch_tfarg(PLI_INT32 n)
 {
       return acc_fetch_itfarg_int(n, vpi_handle(vpiSysTfCall,0));
 }
@@ -134,6 +134,9 @@ char *acc_fetch_tfarg_str(PLI_INT32 n)
 
 /*
  * $Log: a_fetch_tfarg.c,v $
+ * Revision 1.9  2004/02/18 02:51:59  steve
+ *  Fix type mismatches of various VPI functions.
+ *
  * Revision 1.8  2003/06/14 01:16:17  steve
  *  ihand is system task, not scope.
  *
diff --git a/libveriuser/a_object_of_type.c b/libveriuser/a_object_of_type.c
index 4f8304994..09299f137 100644
--- a/libveriuser/a_object_of_type.c
+++ b/libveriuser/a_object_of_type.c
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: a_object_of_type.c,v 1.5 2003/06/04 01:56:20 steve Exp $"
+#ident "$Id: a_object_of_type.c,v 1.6 2004/02/18 02:51:59 steve Exp $"
 #endif
 
 #include  <assert.h>
@@ -28,7 +28,7 @@
 /*
  * acc_object_of_type implemented using VPI interface
  */
-PLI_INT32 acc_object_of_type(handle object, PLI_INT32 type)
+int acc_object_of_type(handle object, PLI_INT32 type)
 {
       int vtype;
       int rtn = 0;	/* false */
@@ -86,7 +86,7 @@ PLI_INT32 acc_object_of_type(handle object, PLI_INT32 type)
       return rtn;
 }
 
-PLI_INT32 acc_object_in_typelist(handle object, PLI_INT32*typelist)
+int acc_object_in_typelist(handle object, PLI_INT32*typelist)
 {
       while (typelist[0] != 0) {
 	    int rtn = acc_object_of_type(object, typelist[0]);
@@ -101,6 +101,9 @@ PLI_INT32 acc_object_in_typelist(handle object, PLI_INT32*typelist)
 
 /*
  * $Log: a_object_of_type.c,v $
+ * Revision 1.6  2004/02/18 02:51:59  steve
+ *  Fix type mismatches of various VPI functions.
+ *
  * Revision 1.5  2003/06/04 01:56:20  steve
  * 1) Adds configure logic to clean up compiler warnings
  * 2) adds acc_compare_handle, acc_fetch_range, acc_next_scope and
diff --git a/vvp/vpi_callback.cc b/vvp/vpi_callback.cc
index e7aa6a29f..630d40baa 100644
--- a/vvp/vpi_callback.cc
+++ b/vvp/vpi_callback.cc
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: vpi_callback.cc,v 1.32 2003/09/09 00:56:45 steve Exp $"
+#ident "$Id: vpi_callback.cc,v 1.33 2004/02/18 02:51:59 steve Exp $"
 #endif
 
 /*
@@ -486,7 +486,7 @@ vpiHandle vpi_register_cb(p_cb_data data)
  * it clears the reference to the user callback function. This causes
  * the callback to quietly reap itself.
  */
-int vpi_remove_cb(vpiHandle ref)
+PLI_INT32 vpi_remove_cb(vpiHandle ref)
 {
       assert(ref);
       assert(ref->vpi_type);
@@ -564,6 +564,9 @@ void callback_functor_s::set(vvp_ipoint_t, bool, unsigned val, unsigned)
 
 /*
  * $Log: vpi_callback.cc,v $
+ * Revision 1.33  2004/02/18 02:51:59  steve
+ *  Fix type mismatches of various VPI functions.
+ *
  * Revision 1.32  2003/09/09 00:56:45  steve
  *  Reimpelement scheduler to divide nonblocking assign queue out.
  *
diff --git a/vvp/vpi_priv.cc b/vvp/vpi_priv.cc
index 2d2b3e0d7..7865e205b 100644
--- a/vvp/vpi_priv.cc
+++ b/vvp/vpi_priv.cc
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: vpi_priv.cc,v 1.43 2003/06/25 04:04:19 steve Exp $"
+#ident "$Id: vpi_priv.cc,v 1.44 2004/02/18 02:51:59 steve Exp $"
 #endif
 
 # include  "vpi_priv.h"
@@ -104,7 +104,7 @@ const char* vpip_name_string(const char*text)
 
       return res;
 }
-int vpi_chk_error(p_vpi_error_info info)
+PLI_INT32 vpi_chk_error(p_vpi_error_info info)
 {
       if (vpip_last_error.state == 0)
 	    return 0;
@@ -126,7 +126,7 @@ int vpi_chk_error(p_vpi_error_info info)
  */
 struct __vpiSysTaskCall*vpip_cur_task = 0;
 
-int vpi_free_object(vpiHandle ref)
+PLI_INT32 vpi_free_object(vpiHandle ref)
 {
       int rtn;
 
@@ -197,7 +197,7 @@ static const char* vpi_type_values(PLI_INT32 code)
       return buf;
 }
 
-int vpi_get(int property, vpiHandle ref)
+PLI_INT32 vpi_get(int property, vpiHandle ref)
 {
       if (ref == 0)
 	    return vpip_get_global(property);
@@ -320,7 +320,7 @@ void vpi_get_time(vpiHandle obj, s_vpi_time*vp)
       }
 }
 
-int vpi_get_vlog_info(p_vpi_vlog_info vlog_info_p)
+PLI_INT32 vpi_get_vlog_info(p_vpi_vlog_info vlog_info_p)
 {
     if (vlog_info_p != 0) {
 	  *vlog_info_p = vpi_vlog_info;
@@ -628,7 +628,7 @@ extern "C" void vpi_sim_vcontrol(int operation, va_list ap)
       }
 }
 
-extern "C" void vpi_sim_control(int operation, ...)
+extern "C" void vpi_sim_control(PLI_INT32 operation, ...)
 {
       va_list ap;
       va_start(ap, operation);
@@ -636,7 +636,7 @@ extern "C" void vpi_sim_control(int operation, ...)
       va_end(ap);
 }
 
-extern "C" void vpi_control(int operation, ...)
+extern "C" void vpi_control(PLI_INT32 operation, ...)
 {
       va_list ap;
       va_start(ap, operation);
@@ -646,6 +646,9 @@ extern "C" void vpi_control(int operation, ...)
 
 /*
  * $Log: vpi_priv.cc,v $
+ * Revision 1.44  2004/02/18 02:51:59  steve
+ *  Fix type mismatches of various VPI functions.
+ *
  * Revision 1.43  2003/06/25 04:04:19  steve
  *  Fix mingw portability problems.
  *
diff --git a/vvp/vpi_tasks.cc b/vvp/vpi_tasks.cc
index b2b49ce90..c945844db 100644
--- a/vvp/vpi_tasks.cc
+++ b/vvp/vpi_tasks.cc
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: vpi_tasks.cc,v 1.25 2003/12/07 20:05:56 steve Exp $"
+#ident "$Id: vpi_tasks.cc,v 1.26 2004/02/18 02:51:59 steve Exp $"
 #endif
 
 /*
@@ -69,7 +69,7 @@ static vpiHandle systask_handle(int type, vpiHandle ref)
       };
 }
 
-static PLI_INT32 systask_get(int type, vpiHandle ref)
+static int systask_get(int type, vpiHandle ref)
 {
       struct __vpiSysTaskCall*rfp = (struct __vpiSysTaskCall*)ref;
 
@@ -465,7 +465,7 @@ void vpi_register_systf(const struct t_vpi_systf_data*ss)
       cur->info.tfname = strdup(ss->tfname);
 }
 
-int vpi_put_userdata(vpiHandle ref, void*data)
+PLI_INT32 vpi_put_userdata(vpiHandle ref, void*data)
 {
       struct __vpiSysTaskCall*rfp = (struct __vpiSysTaskCall*)ref;
       assert((ref->vpi_type->type_code == vpiSysTaskCall)
@@ -487,6 +487,9 @@ void* vpi_get_userdata(vpiHandle ref)
 
 /*
  * $Log: vpi_tasks.cc,v $
+ * Revision 1.26  2004/02/18 02:51:59  steve
+ *  Fix type mismatches of various VPI functions.
+ *
  * Revision 1.25  2003/12/07 20:05:56  steve
  *  Ducument lxt2 access.
  *