diff --git a/tgt-vhdl/vhdl_syntax.hh b/tgt-vhdl/vhdl_syntax.hh
index 3e04dce88..32745b097 100644
--- a/tgt-vhdl/vhdl_syntax.hh
+++ b/tgt-vhdl/vhdl_syntax.hh
@@ -54,12 +54,12 @@ public:
    virtual vhdl_expr *to_vector(vhdl_type_name_t name, int w);
    virtual vhdl_expr *to_string();
    virtual void find_vars(vhdl_var_set_t& read) {}
-   
+
 protected:
    static void open_parens(ostream& of);
    static void close_parens(ostream& of);
    static int paren_levels;
-   
+
    const vhdl_type *type_;
    bool isconst_;
 };
@@ -820,7 +820,7 @@ public:
    // Managing set of blocking assignment targets in this block
    void add_blocking_target(vhdl_var_ref* ref);
    bool is_blocking_target(vhdl_var_ref* ref) const;
-   
+
 protected:
    stmt_container stmts_;
    vhdl_scope scope_;
diff --git a/vhdlpp/Makefile.in b/vhdlpp/Makefile.in
index 4e51a4d1b..de12d50b6 100644
--- a/vhdlpp/Makefile.in
+++ b/vhdlpp/Makefile.in
@@ -57,7 +57,7 @@ CXXFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CXX@ @CXXFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@ @EXTRALIBS@
 
-M = StringHeap.o LineInfo.o 
+M = StringHeap.o LineInfo.o
 
 O = main.o compiler.o entity.o entity_elaborate.o \
     lexor.o lexor_keyword.o parse.o vhdlreal.o vhdlint.o $M
diff --git a/vhdlpp/lexor_keyword.gperf b/vhdlpp/lexor_keyword.gperf
index ce630ed83..9c8d307b6 100644
--- a/vhdlpp/lexor_keyword.gperf
+++ b/vhdlpp/lexor_keyword.gperf
@@ -71,7 +71,7 @@ nand,		GN_KEYWORD_2008,	K_nand
 new,		GN_KEYWORD_2008,	K_new
 next,		GN_KEYWORD_2008,	K_next
 nor,		GN_KEYWORD_2008,	K_nor
-not,		GN_KEYWORD_2008,	K_not 
+not,		GN_KEYWORD_2008,	K_not
 null,		GN_KEYWORD_2008,	K_null
 of,		GN_KEYWORD_2008,	K_of
 on,		GN_KEYWORD_2008,	K_on