diff --git a/vvp/stop.cc b/vvp/stop.cc
index a80cc2fe4..e77c9eba7 100644
--- a/vvp/stop.cc
+++ b/vvp/stop.cc
@@ -40,7 +40,7 @@
 # include  <cstdlib>
 # include  "ivl_alloc.h"
 
-class __vpiScope*stop_current_scope = 0;
+__vpiScope*stop_current_scope = 0;
 bool stop_is_finish;  /* When set, $stop acts like $finish (set in main.cc). */
 int  stop_is_finish_exit_code = 0;
 
@@ -127,7 +127,7 @@ static void cmd_call(unsigned argc, char*argv[])
 		 the name in argv[idx+2]. Look in the current scope. */
 
 	    for (unsigned tmp = 0 ;  (tmp < ntable)&& !handle ;  tmp += 1) {
-		  class __vpiScope*scope;
+		  __vpiScope*scope;
 		  const char*name;
 
 		  switch (table[tmp]->get_type_code()) {
@@ -228,7 +228,7 @@ static void cmd_list(unsigned, char*[])
       printf("%u items in this scope:\n", ntable);
       for (unsigned idx = 0 ;  idx < ntable ;  idx += 1) {
 
-	    class __vpiScope*scope;
+	    __vpiScope*scope;
 	    struct __vpiSignal*sig;
 
 	    switch (table[idx]->get_type_code()) {
@@ -324,7 +324,7 @@ static void cmd_push(unsigned argc, char* argv[])
 	    __vpiHandle**table;
 	    unsigned ntable;
 
-	    class __vpiScope*child = 0;
+	    __vpiScope*child = 0;
 
 	    if (stop_current_scope) {
 		  table = &stop_current_scope->intern[0];
@@ -339,7 +339,7 @@ static void cmd_push(unsigned argc, char* argv[])
 		  if (table[tmp]->get_type_code() != vpiModule)
 			continue;
 
-		  class __vpiScope*cp = dynamic_cast<__vpiScope*>(table[tmp]);
+		  __vpiScope*cp = dynamic_cast<__vpiScope*>(table[tmp]);
 
 		    /* This is a scope, and the name matches, then
 		       report that I found the child. */
@@ -396,7 +396,7 @@ static void cmd_trace(unsigned argc, char*argv[])
 
 static void cmd_where(unsigned, char*[])
 {
-      class __vpiScope*cur = stop_current_scope;
+      __vpiScope*cur = stop_current_scope;
 
       while (cur) {
 	    switch (cur->get_type_code()) {
diff --git a/vvp/vpi_cobject.cc b/vvp/vpi_cobject.cc
index 438f08f6e..76e17bb9f 100644
--- a/vvp/vpi_cobject.cc
+++ b/vvp/vpi_cobject.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Picture Elements, Inc.
+ * Copyright (c) 2012-2015 Picture Elements, Inc.
  *    Stephen Williams (steve@icarus.com)
  *
  *    This source code is free software; you can redistribute it
@@ -48,7 +48,7 @@ vpiHandle vpip_make_cobject_var(const char*name, vvp_net_t*net)
       __vpiScope*scope = vpip_peek_current_scope();
       const char*use_name = name ? vpip_name_string(name) : 0;
 
-      class __vpiCobjectVar*obj = new __vpiCobjectVar(scope, use_name, net);
+      __vpiCobjectVar*obj = new __vpiCobjectVar(scope, use_name, net);
 
       return obj;
 }
@@ -56,7 +56,7 @@ vpiHandle vpip_make_cobject_var(const char*name, vvp_net_t*net)
 #ifdef CHECK_WITH_VALGRIND
 void class_delete(vpiHandle item)
 {
-      class __vpiCobjectVar*obj = dynamic_cast<__vpiCobjectVar*>(item);
+      __vpiCobjectVar*obj = dynamic_cast<__vpiCobjectVar*>(item);
       delete obj;
 }
 #endif
diff --git a/vvp/vpi_darray.cc b/vvp/vpi_darray.cc
index 77193b2c1..9159bcee4 100644
--- a/vvp/vpi_darray.cc
+++ b/vvp/vpi_darray.cc
@@ -341,7 +341,7 @@ vpiHandle vpip_make_queue_var(const char*name, vvp_net_t*net)
       __vpiScope*scope = vpip_peek_current_scope();
       const char*use_name = name ? vpip_name_string(name) : 0;
 
-      class __vpiQueueVar*obj = new __vpiQueueVar(scope, use_name, net);
+      __vpiQueueVar*obj = new __vpiQueueVar(scope, use_name, net);
 
       return obj;
 }
@@ -349,14 +349,14 @@ vpiHandle vpip_make_queue_var(const char*name, vvp_net_t*net)
 #ifdef CHECK_WITH_VALGRIND
 void darray_delete(vpiHandle item)
 {
-      class __vpiDarrayVar*obj = dynamic_cast<__vpiDarrayVar*>(item);
+      __vpiDarrayVar*obj = dynamic_cast<__vpiDarrayVar*>(item);
       if (obj->vals_words) delete [] (obj->vals_words-1);
       delete obj;
 }
 
 void queue_delete(vpiHandle item)
 {
-      class __vpiQueueVar*obj = dynamic_cast<__vpiQueueVar*>(item);
+      __vpiQueueVar*obj = dynamic_cast<__vpiQueueVar*>(item);
       delete obj;
 }
 #endif
diff --git a/vvp/vpi_string.cc b/vvp/vpi_string.cc
index 3aaccf7ae..b0fbe330c 100644
--- a/vvp/vpi_string.cc
+++ b/vvp/vpi_string.cc
@@ -94,7 +94,7 @@ vpiHandle vpip_make_string_var(const char*name, vvp_net_t*net)
       __vpiScope*scope = vpip_peek_current_scope();
       const char*use_name = name ? vpip_name_string(name) : 0;
 
-      class __vpiStringVar*obj = new __vpiStringVar(scope, use_name, net);
+      __vpiStringVar*obj = new __vpiStringVar(scope, use_name, net);
 
       return obj;
 }
@@ -102,7 +102,7 @@ vpiHandle vpip_make_string_var(const char*name, vvp_net_t*net)
 #ifdef CHECK_WITH_VALGRIND
 void string_delete(vpiHandle item)
 {
-      class __vpiStringVar*obj = dynamic_cast<__vpiStringVar*>(item);
+      __vpiStringVar*obj = dynamic_cast<__vpiStringVar*>(item);
       delete obj;
 }
 #endif
diff --git a/vvp/vpi_vthr_vector.cc b/vvp/vpi_vthr_vector.cc
index 8d7a2663e..c55214b79 100644
--- a/vvp/vpi_vthr_vector.cc
+++ b/vvp/vpi_vthr_vector.cc
@@ -576,7 +576,7 @@ void thread_vthr_delete(vpiHandle item)
 
 static void thread_vthr_delete_real(vpiHandle item)
 {
-      class __vpiVThrVec4Stack*obj = dynamic_cast<__vpiVThrVec4Stack*>(item);
+      __vpiVThrVec4Stack*obj = dynamic_cast<__vpiVThrVec4Stack*>(item);
       delete obj;
 }
 
@@ -593,13 +593,13 @@ void vpi_handle_delete()
 
 vpiHandle vpip_make_vthr_str_stack(unsigned depth)
 {
-      class __vpiVThrStrStack*obj = new __vpiVThrStrStack(depth);
+      __vpiVThrStrStack*obj = new __vpiVThrStrStack(depth);
       return obj;
 }
 
 vpiHandle vpip_make_vthr_vec4_stack(unsigned depth, bool signed_flag, unsigned wid)
 {
-      class __vpiVThrVec4Stack*obj = new __vpiVThrVec4Stack(depth, signed_flag, wid);
+      __vpiVThrVec4Stack*obj = new __vpiVThrVec4Stack(depth, signed_flag, wid);
       return obj;
 }
 
@@ -613,7 +613,7 @@ void thread_string_delete(vpiHandle item)
 
 static void thread_string_delete_real(vpiHandle item)
 {
-      class __vpiVThrStrStack*obj = dynamic_cast<__vpiVThrStrStack*>(item);
+      __vpiVThrStrStack*obj = dynamic_cast<__vpiVThrStrStack*>(item);
       delete obj;
 }