diff --git a/elaborate.cc b/elaborate.cc
index b603790b0..f78b45e2c 100644
--- a/elaborate.cc
+++ b/elaborate.cc
@@ -1385,8 +1385,8 @@ void PGModule::elaborate_mod_(Design*des, Module*rmod, NetScope*scope) const
 			for (unsigned pidx = 0; pidx < prts.size(); pidx += 1) {
 			      prts[pidx]->port_type(NetNet::NOT_A_PORT);
 			      prts[pidx] = cast_to_int(des, scope, prts[pidx],
-			                              prts_vector_width /
-			                              instance.size());
+			                               prts_vector_width /
+			                               instance.size());
 			      prts[pidx]->port_type(NetNet::POUTPUT);
 			}
 		  }
diff --git a/netlist.h b/netlist.h
index ec42bf682..c779a6c84 100644
--- a/netlist.h
+++ b/netlist.h
@@ -1476,7 +1476,7 @@ class NetReplicate  : public NetNode {
 class NetUserFunc  : public NetNode {
 
     public:
-      NetUserFunc(NetScope*s, perm_string n, NetScope*def, NetEvWait*trigger);
+      NetUserFunc(NetScope*s, perm_string n, NetScope*def, NetEvWait*trigger__);
       ~NetUserFunc();
 
       ivl_variable_type_t data_type(unsigned port) const;
@@ -1503,7 +1503,7 @@ class NetSysFunc  : public NetNode {
     public:
       NetSysFunc(NetScope*s, perm_string n,
 		 const struct sfunc_return_type*def,
-		 unsigned ports, NetEvWait*trigger);
+		 unsigned ports, NetEvWait*trigger__);
       ~NetSysFunc();
 
       ivl_variable_type_t data_type() const;
@@ -1802,7 +1802,7 @@ class NetPartSelect  : public NetNode {
       explicit NetPartSelect(NetNet*sig,
 			     unsigned off, unsigned wid, dir_t dir);
       explicit NetPartSelect(NetNet*sig, NetNet*sel,
-			     unsigned wid, bool signed_flag = false);
+			     unsigned wid, bool signed_flag__ = false);
       ~NetPartSelect();
 
       unsigned base()  const;
diff --git a/pform.h b/pform.h
index b0f862783..e6c500d24 100644
--- a/pform.h
+++ b/pform.h
@@ -161,8 +161,8 @@ extern void pform_module_define_port(const struct vlltype&li,
 extern Module::port_t* pform_module_port_reference(perm_string name,
 						   const char*file,
 						   unsigned lineno);
-extern void pform_endmodule(const char*, bool in_celldefine,
-                            Module::UCDriveType uc_drive);
+extern void pform_endmodule(const char*, bool inside_celldefine,
+                            Module::UCDriveType uc_drive_def);
 
 extern void pform_make_udp(perm_string name, list<perm_string>*parms,
 			   svector<PWire*>*decl, list<string>*table,