diff --git a/libmscore/articulation.cpp b/libmscore/articulation.cpp
index f8dd1f5f34..15e4870fcd 100644
--- a/libmscore/articulation.cpp
+++ b/libmscore/articulation.cpp
@@ -20,6 +20,7 @@
 #include "undo.h"
 #include "page.h"
 #include "barline.h"
+#include "sym.h"
 
 namespace Ms {
 
diff --git a/libmscore/articulation.h b/libmscore/articulation.h
index ff8ba81b56..d0cb479db4 100644
--- a/libmscore/articulation.h
+++ b/libmscore/articulation.h
@@ -14,14 +14,14 @@
 #define __ARTICULATION_H__
 
 #include "mscore.h"
-#include "symbol.h"
-#include "sym.h"
+#include "element.h"
 
 class QPainter;
 
 namespace Ms {
 
 class ChordRest;
+enum class SymId;
 
 //---------------------------------------------------------
 //   ArticulationInfo
diff --git a/libmscore/bagpembell.cpp b/libmscore/bagpembell.cpp
index d0c188b45c..69189b4474 100644
--- a/libmscore/bagpembell.cpp
+++ b/libmscore/bagpembell.cpp
@@ -13,6 +13,7 @@
 #include "score.h"
 #include "xml.h"
 #include "bagpembell.h"
+#include "sym.h"
 
 namespace Ms {
 
diff --git a/libmscore/chord.cpp b/libmscore/chord.cpp
index 5eeecfcdba..1f167bc6ae 100644
--- a/libmscore/chord.cpp
+++ b/libmscore/chord.cpp
@@ -48,6 +48,7 @@
 #include "ledgerline.h"
 #include "drumset.h"
 #include "key.h"
+#include "sym.h"
 
 namespace Ms {
 
diff --git a/libmscore/figuredbass.cpp b/libmscore/figuredbass.cpp
index 7bdae04e26..e695e4884f 100644
--- a/libmscore/figuredbass.cpp
+++ b/libmscore/figuredbass.cpp
@@ -19,6 +19,7 @@
 #include "chord.h"
 #include "rest.h"
 #include "score.h"
+#include "sym.h"
 
 namespace Ms {
 
diff --git a/libmscore/marker.cpp b/libmscore/marker.cpp
index 699b7fa179..97e56b4611 100644
--- a/libmscore/marker.cpp
+++ b/libmscore/marker.cpp
@@ -12,6 +12,7 @@
 
 #include "marker.h"
 #include "score.h"
+#include "sym.h"
 
 namespace Ms {
 
diff --git a/libmscore/mscore.cpp b/libmscore/mscore.cpp
index 77e075f991..8991ea66c6 100644
--- a/libmscore/mscore.cpp
+++ b/libmscore/mscore.cpp
@@ -66,6 +66,7 @@ Sequencer* MScore::seq = 0;
 
 extern void initStaffTypes();
 extern void initDrumset();
+extern void initScoreFonts();
 
 //---------------------------------------------------------
 //   init
diff --git a/libmscore/notedot.cpp b/libmscore/notedot.cpp
index e0ed942ae3..b037a2bee4 100644
--- a/libmscore/notedot.cpp
+++ b/libmscore/notedot.cpp
@@ -13,6 +13,7 @@
 #include "notedot.h"
 #include "score.h"
 #include "staff.h"
+#include "sym.h"
 
 namespace Ms {
 
diff --git a/libmscore/ottava.cpp b/libmscore/ottava.cpp
index 01d7929b81..5e5da64856 100644
--- a/libmscore/ottava.cpp
+++ b/libmscore/ottava.cpp
@@ -20,6 +20,7 @@
 #include "text.h"
 #include "staff.h"
 #include "segment.h"
+#include "sym.h"
 
 namespace Ms {
 
diff --git a/libmscore/part.cpp b/libmscore/part.cpp
index af9dde2857..f6231c1971 100644
--- a/libmscore/part.cpp
+++ b/libmscore/part.cpp
@@ -22,6 +22,7 @@
 #include "measure.h"
 #include "tablature.h"
 #include "stafftype.h"
+#include "sym.h"
 
 namespace Ms {
 
diff --git a/libmscore/read114.cpp b/libmscore/read114.cpp
index b9cb8711e8..63fab84649 100644
--- a/libmscore/read114.cpp
+++ b/libmscore/read114.cpp
@@ -31,6 +31,7 @@
 #include "dynamic.h"
 #include "drumset.h"
 #include "style.h"
+#include "sym.h"
 
 namespace Ms {
 
diff --git a/libmscore/score.cpp b/libmscore/score.cpp
index 7f08a5978b..390aff1c33 100644
--- a/libmscore/score.cpp
+++ b/libmscore/score.cpp
@@ -66,6 +66,7 @@
 #include "audio.h"
 #include "instrtemplate.h"
 #include "cursor.h"
+#include "sym.h"
 
 namespace Ms {
 
diff --git a/libmscore/score.h b/libmscore/score.h
index 9d8df98189..3706ed8485 100644
--- a/libmscore/score.h
+++ b/libmscore/score.h
@@ -96,6 +96,7 @@ struct PageContext;
 class BarLine;
 class Bracket;
 class KeyList;
+class ScoreFont;
 
 enum class OttavaType;
 enum class ClefType : signed char;
@@ -958,7 +959,6 @@ class Score : public QObject {
       ScoreFont* scoreFont() const    { return _scoreFont; }
       void setScoreFont(ScoreFont* f) { _scoreFont = f;    }
       qreal noteHeadWidth() const            { return _noteHeadWidth; }
-//      const Sym& sym(SymId id) const;
 
       friend class ChangeSynthesizerState;
       friend class Chord;
diff --git a/libmscore/symbol.cpp b/libmscore/symbol.cpp
index 2ee3d17d27..77cb7f7e9c 100644
--- a/libmscore/symbol.cpp
+++ b/libmscore/symbol.cpp
@@ -139,7 +139,6 @@ void Symbol::read(XmlReader& e)
                   e.unknown();
             }
       setPos(pos);
-      setSym(s);
       }
 
 //---------------------------------------------------------
diff --git a/libmscore/symbol.h b/libmscore/symbol.h
index 4cb019f330..a8c15c930d 100644
--- a/libmscore/symbol.h
+++ b/libmscore/symbol.h
@@ -14,13 +14,13 @@
 #define __SYMBOL_H__
 
 #include "bsymbol.h"
-#include "sym.h"
 
 class QPainter;
 
 namespace Ms {
 
 class Segment;
+enum class SymId;
 
 //---------------------------------------------------------
 //   @@ Symbol
diff --git a/libmscore/undo.cpp b/libmscore/undo.cpp
index d3f188203b..ec88a2ce6d 100644
--- a/libmscore/undo.cpp
+++ b/libmscore/undo.cpp
@@ -71,6 +71,7 @@
 #include "stafftext.h"
 #include "chordline.h"
 #include "tremolo.h"
+#include "sym.h"
 
 namespace Ms {