diff --git a/cwPresetSel.cpp b/cwPresetSel.cpp
index 02514e9..3f66d4e 100644
--- a/cwPresetSel.cpp
+++ b/cwPresetSel.cpp
@@ -9,11 +9,14 @@
 #include "cwFlowDecl.h"
 #include "cwPresetSel.h"
 #include "cwFile.h"
-#include "cwPianoScore.h"
+
 #include "cwMidi.h"
 #include "cwDynRefTbl.h"
 #include "cwScoreParse.h"
 #include "cwSfScore.h"
+#include "cwPerfMeas.h"
+
+#include "cwPianoScore.h"
 
 
 namespace cw
diff --git a/cwSvgMidi.cpp b/cwSvgMidi.cpp
index ee6d2d8..1c39877 100644
--- a/cwSvgMidi.cpp
+++ b/cwSvgMidi.cpp
@@ -7,6 +7,12 @@
 #include "cwTime.h"
 #include "cwMidi.h"
 #include "cwMidiFile.h"
+
+#include "cwDynRefTbl.h"
+#include "cwScoreParse.h"
+#include "cwSfScore.h"
+#include "cwPerfMeas.h"
+
 #include "cwPianoScore.h"
 #include "cwSvg.h"
 #include "cwMidiState.h"
diff --git a/cwSvgScoreFollow.cpp b/cwSvgScoreFollow.cpp
index fb73fbc..cbfd257 100644
--- a/cwSvgScoreFollow.cpp
+++ b/cwSvgScoreFollow.cpp
@@ -7,13 +7,14 @@
 #include "cwTime.h"
 #include "cwMidi.h"
 #include "cwMidiFile.h"
-#include "cwPianoScore.h"
 #include "cwSvg.h"
 #include "cwDynRefTbl.h"
 #include "cwScoreParse.h"
 #include "cwSfScore.h"
 #include "cwSfMatch.h"
 #include "cwSfTrack.h"
+#include "cwPerfMeas.h"
+#include "cwPianoScore.h"
 
 #include "cwScoreFollowerPerf.h"
 #include "cwScoreFollower.h"