diff --git a/common/libeval_compiler/grammar.lemon b/common/libeval_compiler/grammar.lemon
index 24731814bf..bd68af47c3 100644
--- a/common/libeval_compiler/grammar.lemon
+++ b/common/libeval_compiler/grammar.lemon
@@ -2,6 +2,7 @@
     This file is part of libeval, a simple math expression evaluator
 
     Copyright (C) 2017 Michael Geselbracht, mgeselbracht3@gmail.com
+    Copyright (C) 2019-2020 KiCad Developers, see AUTHORS.txt for contributors.
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/common/libeval_compiler/libeval_compiler.cpp b/common/libeval_compiler/libeval_compiler.cpp
index aea0dfe27a..134a21f4f8 100644
--- a/common/libeval_compiler/libeval_compiler.cpp
+++ b/common/libeval_compiler/libeval_compiler.cpp
@@ -2,6 +2,7 @@
     This file is part of libeval, a simple math expression evaluator
 
     Copyright (C) 2017 Michael Geselbracht, mgeselbracht3@gmail.com
+    Copyright (C) 2019-2020 KiCad Developers, see AUTHORS.txt for contributors.
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/include/libeval_compiler/libeval_compiler.h b/include/libeval_compiler/libeval_compiler.h
index 27b5e506ca..24a1358854 100644
--- a/include/libeval_compiler/libeval_compiler.h
+++ b/include/libeval_compiler/libeval_compiler.h
@@ -2,6 +2,7 @@
     This file is part of libeval, a simple math expression evaluator
 
     Copyright (C) 2007 Michael Geselbracht, mgeselbracht3@gmail.com
+    Copyright (C) 2019-2020 KiCad Developers, see AUTHORS.txt for contributors.
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/pcbnew/pcb_expr_evaluator.cpp b/pcbnew/pcb_expr_evaluator.cpp
index 848356f322..a99b43aed7 100644
--- a/pcbnew/pcb_expr_evaluator.cpp
+++ b/pcbnew/pcb_expr_evaluator.cpp
@@ -1,9 +1,32 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2019-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+
 #include <cstdio>
 
 #include "class_board.h"
 #include "pcb_expr_evaluator.h"
 
-
 class PCB_EXPR_BUILTIN_FUNCTIONS
 {
     public:
@@ -35,9 +58,6 @@ class PCB_EXPR_BUILTIN_FUNCTIONS
             if( it == m_funcs.end() )
                 return nullptr;
 
-            //printf("Cfc2\n");
-            //it->second(nullptr, nullptr, nullptr);
-
             return it->second;
         }
 
@@ -121,13 +141,8 @@ LIBEVAL::VALUE PCB_EXPR_VAR_REF::GetValue( LIBEVAL::UCODE* aUcode )
 LIBEVAL::UCODE::FUNC_PTR PCB_EXPR_UCODE::createFuncCall( LIBEVAL::COMPILER* aCompiler, const std::string& name )
 {
     auto registry = PCB_EXPR_BUILTIN_FUNCTIONS::Instance();
-
-    //printf("CreateFCall '%s' found %d\n", name.c_str(),  registry.Get(name) != nullptr ? 1 : 0 );
-
     auto f = registry.Get( name );
-    //printf("Cfc3\n");
-    //f(nullptr,nullptr,nullptr);
-            
+
     return f;
 }
 
@@ -164,8 +179,6 @@ LIBEVAL::VAR_REF* PCB_EXPR_UCODE::createVarRef( LIBEVAL::COMPILER *aCompiler,
                 else
                 {
                     (void) 0; // should we do anything here?
-                    //printf("unmatched type for prop '%s'\n", field.c_str() );
-                    //wxString msg;
                     //msg.Printf("Unrecognized type for property '%s'", field.c_str() );
                     //aCompiler->ReportError( (const char*) msg.c_str() );
                 }
diff --git a/pcbnew/pcb_expr_evaluator.h b/pcbnew/pcb_expr_evaluator.h
index edf4e48ddf..b124b35ab3 100644
--- a/pcbnew/pcb_expr_evaluator.h
+++ b/pcbnew/pcb_expr_evaluator.h
@@ -1,3 +1,27 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2019-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+
 #ifndef __PCB_EXPR_EVALUATOR_H
 #define __PCB_EXPR_EVALUATOR_H