diff --git a/lexor.lex b/lexor.lex
index d4788e9da..ddc4ea9e9 100644
--- a/lexor.lex
+++ b/lexor.lex
@@ -145,12 +145,12 @@ TU [munpf]
 "<=" { return K_LE; }
 ">=" { return K_GE; }
 "=>" { return K_EG; }
-"+=>"|"-=>" 	{
+"+=>"|"-=>"	{
 			/*
 			 * Resolve the ambiguity between the += assignment
 			 * operator and +=> polarity edge path operator
-			 * 
-			 * +=> should be treated as two separate tokens '+' and 
+			 *
+			 * +=> should be treated as two separate tokens '+' and
 			 * '=>' (K_EG), therefore we only consume the first
 			 * character of the matched pattern i.e. either + or -
 			 * and push back the rest of the matches text (=>) in
diff --git a/parse.y b/parse.y
index dcae0f02a..45a37a7d2 100644
--- a/parse.y
+++ b/parse.y
@@ -330,7 +330,7 @@ static long check_enum_seq_value(const YYLTYPE&loc, verinum *arg, bool zero_ok)
 %token <text>   PATHPULSE_IDENTIFIER
 %token <number> BASED_NUMBER DEC_NUMBER
 %token <realtime> REALTIME
-%token K_PLUS_EQ K_MINUS_EQ 
+%token K_PLUS_EQ K_MINUS_EQ
 %token K_LE K_GE K_EG K_EQ K_NE K_CEQ K_CNE K_LS K_RS K_RSS K_SG
  /* K_CONTRIBUTE is <+, the contribution assign. */
 %token K_CONTRIBUTE
diff --git a/tgt-vvp/eval_expr.c b/tgt-vvp/eval_expr.c
index e79043543..e7d17a559 100644
--- a/tgt-vvp/eval_expr.c
+++ b/tgt-vvp/eval_expr.c
@@ -3143,7 +3143,7 @@ static struct vector_info draw_unary_expr(ivl_expr_t expr, unsigned wid)
 		  res.base = allocate_vector(wid);
 		  res.wid = wid;
 		  fprintf(vvp_out, "    %%cvt/vr %d, %d, %u;\n", res.base, word, wid);
-		  clr_word(word);		  
+		  clr_word(word);
 		  break;
 
 		default:
diff --git a/vhdlpp/parse.y b/vhdlpp/parse.y
index 63616566d..e95ad028c 100644
--- a/vhdlpp/parse.y
+++ b/vhdlpp/parse.y
@@ -117,7 +117,7 @@ static void delete_global_scope(void)
     delete active_scope;
 }
 
-//delete global entities that were gathered over the parsing process 
+//delete global entities that were gathered over the parsing process
 static void delete_design_entities(void)
 {
       for(map<perm_string,Entity*>::iterator cur = design_entities.begin()
@@ -162,7 +162,7 @@ const VType*parse_type_by_name(perm_string name)
 
       IfSequential::Elsif*elsif;
       std::list<IfSequential::Elsif*>*elsif_list;
-      
+
       CaseSeqStmt::CaseStmtAlternative* case_alt;
       std::list<CaseSeqStmt::CaseStmtAlternative*>* case_alt_list;
 
@@ -234,7 +234,7 @@ const VType*parse_type_by_name(perm_string name)
 %type <expr> choice expression factor primary relation
 %type <expr> expression_logical expression_logical_and expression_logical_or
 %type <expr> expression_logical_xnor expression_logical_xor
-%type <expr> name 
+%type <expr> name
 %type <expr> shift_expression simple_expression term waveform_element
 
 %type <expr_list> waveform waveform_elements
@@ -446,7 +446,7 @@ case_statement_alternative_list
       }
   | case_statement_alternative
       {
-    std::list<CaseSeqStmt::CaseStmtAlternative*>*tmp = 
+    std::list<CaseSeqStmt::CaseStmtAlternative*>*tmp =
         new std::list<CaseSeqStmt::CaseStmtAlternative*>();
     tmp->push_back($1);
     $$ = tmp;
@@ -456,7 +456,7 @@ case_statement_alternative_list
 case_statement_alternative
   : K_when choice ARROW sequence_of_statements
       {
-    CaseSeqStmt::CaseStmtAlternative* tmp = 
+    CaseSeqStmt::CaseStmtAlternative* tmp =
         new CaseSeqStmt::CaseStmtAlternative($2, $4);
     FILE_NAME(tmp, @1);
     delete $4;
@@ -1091,7 +1091,7 @@ loop_statement
     sorrymsg(@1, "Loop statements are not supported");
     $$ = tmp;
       };
-      
+
 mode
   : K_in  { $$ = PORT_IN; }
   | K_out { $$ = PORT_OUT; }
diff --git a/vhdlpp/parse_types.h b/vhdlpp/parse_types.h
index c3695947a..2110c6ed5 100644
--- a/vhdlpp/parse_types.h
+++ b/vhdlpp/parse_types.h
@@ -79,6 +79,6 @@ class range_t {
       bool direction_;
     private: //not implemented
       range_t(const range_t&);
-      range_t operator=(const range_t&);    
+      range_t operator=(const range_t&);
 };
 #endif
diff --git a/vhdlpp/scope.h b/vhdlpp/scope.h
index 69a8de4a7..4d573948a 100644
--- a/vhdlpp/scope.h
+++ b/vhdlpp/scope.h
@@ -154,7 +154,7 @@ class ActiveScope : public ScopeBase {
             old_constants_.erase(it);
         new_constants_[name] = new const_t(obj, val);
       }
-          
+
       void destroy_global_scope()
       {
           cleanup();
diff --git a/vhdlpp/sequential.cc b/vhdlpp/sequential.cc
index 870ac6512..48b0d3a11 100644
--- a/vhdlpp/sequential.cc
+++ b/vhdlpp/sequential.cc
@@ -169,7 +169,7 @@ LoopStatement::~LoopStatement()
 
 ForLoopStatement::ForLoopStatement(perm_string it, range_t* range, list<SequentialStmt*>* stmts)
 : LoopStatement(stmts), it_(it), range_(range)
-{ 
+{
 }
 
 ForLoopStatement::~ForLoopStatement()
diff --git a/vhdlpp/sequential.h b/vhdlpp/sequential.h
index afefeb9e9..8c187e9f8 100644
--- a/vhdlpp/sequential.h
+++ b/vhdlpp/sequential.h
@@ -110,7 +110,7 @@ class CaseSeqStmt : public SequentialStmt {
             CaseStmtAlternative(Expression* exp, list<SequentialStmt*>* stmts);
             ~CaseStmtAlternative();
             void dump(ostream& out, int indent) const;
-            
+
             //TODO: implement the following:
             //int elaborate(Entity*ent, Architecture*arc);
             //int emit(ostream&out, Entity*entity, Architecture*arc);