diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 9d99b2672f..c9b9087a4a 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -815,7 +815,7 @@ add_dependencies( pcbcommon delaunator )
 
 # The lemon grammar for the numeric evaluator
 generate_lemon_grammar(
-    common
+    kicommon
     libeval
     libeval/numeric_evaluator.cpp
     libeval/grammar.lemon
@@ -823,7 +823,7 @@ generate_lemon_grammar(
 
 # The lemon grammar for the expression compiler
 generate_lemon_grammar(
-    common
+    kicommon
     libeval_compiler
     libeval_compiler/libeval_compiler.cpp
     libeval_compiler/grammar.lemon
diff --git a/include/libeval/numeric_evaluator.h b/include/libeval/numeric_evaluator.h
index 23cd15a86b..a35b9b412a 100644
--- a/include/libeval/numeric_evaluator.h
+++ b/include/libeval/numeric_evaluator.h
@@ -90,7 +90,7 @@ namespace numEval
 
 } // namespace numEval
 
-class NUMERIC_EVALUATOR
+class KICOMMON_API NUMERIC_EVALUATOR
 {
     enum class Unit { Invalid, UM, MM, CM, Inch, Mil, Degrees, SI };
 
diff --git a/include/libeval_compiler/libeval_compiler.h b/include/libeval_compiler/libeval_compiler.h
index db80ccb0c9..d9e24b82fe 100644
--- a/include/libeval_compiler/libeval_compiler.h
+++ b/include/libeval_compiler/libeval_compiler.h
@@ -27,6 +27,7 @@
 #include <string>
 #include <stack>
 
+#include <kicommon.h>
 #include <base_units.h>
 #include <wx/intl.h>
 
@@ -69,7 +70,7 @@ enum COMPILATION_STAGE
     CST_RUNTIME
 };
 
-struct ERROR_STATUS
+struct KICOMMON_API  ERROR_STATUS
 {
     bool pendingError = false;
 
@@ -107,7 +108,7 @@ class VAR_REF;
 
 typedef std::function<void( CONTEXT*, void* )> FUNC_CALL_REF;
 
-struct T_TOKEN_VALUE
+struct KICOMMON_API  T_TOKEN_VALUE
 {
     wxString* str;
     double    num;
@@ -118,7 +119,7 @@ struct T_TOKEN_VALUE
 constexpr T_TOKEN_VALUE defaultTokenValue = { nullptr, 0.0, 0 };
 
 
-struct T_TOKEN
+struct KICOMMON_API  T_TOKEN
 {
     int           token;
     T_TOKEN_VALUE value;
@@ -128,7 +129,7 @@ struct T_TOKEN
 constexpr T_TOKEN defaultToken = { TR_UNDEFINED, defaultTokenValue };
 
 
-class TREE_NODE
+class KICOMMON_API TREE_NODE
 {
 public:
     T_TOKEN_VALUE value;
@@ -151,7 +152,7 @@ public:
 TREE_NODE* newNode( LIBEVAL::COMPILER* compiler, int op,
                     const T_TOKEN_VALUE& value = defaultTokenValue );
 
-class UNIT_RESOLVER
+class KICOMMON_API UNIT_RESOLVER
 {
 public:
     UNIT_RESOLVER()
@@ -181,7 +182,7 @@ public:
 };
 
 
-class VALUE
+class KICOMMON_API VALUE
 {
 public:
     VALUE() :
@@ -289,7 +290,7 @@ private:
     std::function<wxString()> m_lambdaStr;
 };
 
-class VAR_REF
+class KICOMMON_API VAR_REF
 {
 public:
     VAR_REF() {};
@@ -300,7 +301,7 @@ public:
 };
 
 
-class CONTEXT
+class KICOMMON_API CONTEXT
 {
 public:
     CONTEXT() :
@@ -369,7 +370,7 @@ private:
 };
 
 
-class UCODE
+class KICOMMON_API UCODE
 {
 public:
     virtual ~UCODE();
@@ -398,7 +399,7 @@ protected:
 };
 
 
-class UOP
+class KICOMMON_API UOP
 {
 public:
     UOP( int op, std::unique_ptr<VALUE> value ) :
@@ -436,7 +437,7 @@ private:
     std::unique_ptr<VALUE>   m_value;
 };
 
-class TOKENIZER
+class KICOMMON_API TOKENIZER
 {
 public:
     void Restart( const wxString& aStr )
@@ -487,7 +488,7 @@ private:
 };
 
 
-class COMPILER
+class KICOMMON_API COMPILER
 {
 public:
     COMPILER();