diff --git a/app/cmOnset.c b/app/cmOnset.c
index 924a4a8..da2e4cc 100644
--- a/app/cmOnset.c
+++ b/app/cmOnset.c
@@ -9,6 +9,7 @@
 #include "cmLinkedHeap.h"
 #include "cmSymTbl.h"
 #include "cmAudioFile.h"
+#include "cmTime.h"
 #include "cmMidi.h"
 #include "cmFile.h"
 #include "cmMath.h"
diff --git a/app/cmPickup.c b/app/cmPickup.c
index 1f50ec3..8536d1d 100644
--- a/app/cmPickup.c
+++ b/app/cmPickup.c
@@ -10,6 +10,7 @@
 #include "cmLinkedHeap.h"
 #include "cmSymTbl.h"
 #include "cmJson.h"
+#include "cmTime.h"
 #include "cmMidi.h"
 #include "cmAudioFile.h"
 #include "cmFile.h"
diff --git a/app/cmScore.c b/app/cmScore.c
index 1348fe1..40be491 100644
--- a/app/cmScore.c
+++ b/app/cmScore.c
@@ -7,6 +7,7 @@
 #include "cmMem.h"
 #include "cmMallocDebug.h"
 #include "cmLinkedHeap.h"
+#include "cmTime.h"
 #include "cmMidi.h"
 #include "cmLex.h"
 #include "cmCsv.h"
diff --git a/app/cmScoreProc.c b/app/cmScoreProc.c
index 459ba6d..f12fcd5 100644
--- a/app/cmScoreProc.c
+++ b/app/cmScoreProc.c
@@ -9,6 +9,7 @@
 #include "cmSymTbl.h"
 #include "cmJson.h"
 #include "cmFile.h"
+#include "cmTime.h"
 #include "cmMidi.h"
 #include "cmMidiFile.h"
 #include "cmAudioFile.h"
diff --git a/app/cmTimeLine.c b/app/cmTimeLine.c
index 1f1282c..2b920f0 100644
--- a/app/cmTimeLine.c
+++ b/app/cmTimeLine.c
@@ -9,6 +9,7 @@
 #include "cmJson.h"
 #include "cmText.h"
 #include "cmAudioFile.h"
+#include "cmTime.h"
 #include "cmMidi.h"
 #include "cmMidiFile.h"
 #include "cmFileSys.h"
diff --git a/cmAudDsp.c b/cmAudDsp.c
index fdbff93..497783e 100644
--- a/cmAudDsp.c
+++ b/cmAudDsp.c
@@ -11,6 +11,7 @@
 #include "cmJson.h"
 #include "cmFileSys.h"
 #include "cmPrefs.h"
+#include "cmTime.h"
 #include "cmAudioPort.h"
 #include "cmAudioAggDev.h"
 #include "cmAudioNrtDev.h"
diff --git a/cmAudioAggDev.c b/cmAudioAggDev.c
index ff5dfa1..a446d0f 100644
--- a/cmAudioAggDev.c
+++ b/cmAudioAggDev.c
@@ -4,6 +4,7 @@
 #include "cmCtx.h"
 #include "cmMem.h"
 #include "cmMallocDebug.h"
+#include "cmTime.h"
 #include "cmAudioPort.h"
 #include "cmAudioAggDev.h"
 #include "cmThread.h" // cmThUIntIncr()
diff --git a/cmAudioFileDev.c b/cmAudioFileDev.c
index cad96f9..0e3dc85 100644
--- a/cmAudioFileDev.c
+++ b/cmAudioFileDev.c
@@ -6,6 +6,7 @@
 #include "cmMallocDebug.h"
 #include "cmAudioFile.h"
 #include "cmThread.h"
+#include "cmTime.h"
 #include "cmAudioPort.h"
 #include "cmAudioFileDev.h"
 #include "cmTime.h"
diff --git a/cmAudioNrtDev.c b/cmAudioNrtDev.c
index 1f3def4..c22f770 100644
--- a/cmAudioNrtDev.c
+++ b/cmAudioNrtDev.c
@@ -5,6 +5,7 @@
 #include "cmCtx.h"
 #include "cmMem.h"
 #include "cmMallocDebug.h"
+#include "cmTime.h"
 #include "cmAudioPort.h"
 #include "cmAudioNrtDev.h"
 #include "cmThread.h" 
diff --git a/cmAudioPort.c b/cmAudioPort.c
index 92987d4..c4bc94f 100644
--- a/cmAudioPort.c
+++ b/cmAudioPort.c
@@ -5,6 +5,7 @@
 #include "cmCtx.h"
 #include "cmMem.h"
 #include "cmMallocDebug.h"
+#include "cmTime.h"
 #include "cmAudioPort.h"
 #include "cmApBuf.h"  // only needed for cmApBufTest().
 #include "cmAudioPortFile.h"
diff --git a/cmAudioPortFile.c b/cmAudioPortFile.c
index 3b57e0e..c497c93 100644
--- a/cmAudioPortFile.c
+++ b/cmAudioPortFile.c
@@ -4,6 +4,7 @@
 #include "cmCtx.h"
 #include "cmMem.h"
 #include "cmMallocDebug.h"
+#include "cmTime.h"
 #include "cmAudioPort.h"
 #include "cmAudioPortFile.h"
 #include "cmAudioFileDev.h"
diff --git a/cmDevCfg.c b/cmDevCfg.c
index cf24638..8528b8d 100644
--- a/cmDevCfg.c
+++ b/cmDevCfg.c
@@ -10,6 +10,7 @@
 #include "cmJson.h"
 #include "cmText.h"
 #include "cmThread.h"
+#include "cmTime.h"
 #include "cmMidi.h"
 #include "cmMidiPort.h"
 #include "cmAudioPort.h"
diff --git a/cmFeatFile.c b/cmFeatFile.c
index 41230a8..0ceb58d 100644
--- a/cmFeatFile.c
+++ b/cmFeatFile.c
@@ -14,6 +14,7 @@
 #include "cmAudioFile.h"
 #include "cmJson.h"
 #include "cmFileSys.h"
+#include "cmTime.h"
 #include "cmMidi.h"
 #include "cmProcObj.h"
 #include "cmProcTemplateMain.h"
diff --git a/cmMidi.c b/cmMidi.c
index 4259247..1f666a1 100644
--- a/cmMidi.c
+++ b/cmMidi.c
@@ -1,5 +1,6 @@
 #include "cmPrefix.h"
 #include "cmGlobal.h"
+#include "cmTime.h"
 #include "cmMidi.h"
 
 
diff --git a/cmMidiFile.c b/cmMidiFile.c
index 13b51cb..a477d3d 100644
--- a/cmMidiFile.c
+++ b/cmMidiFile.c
@@ -7,6 +7,7 @@
 #include "cmMem.h"
 #include "cmMallocDebug.h"
 #include "cmLinkedHeap.h"
+#include "cmTime.h"
 #include "cmMidi.h"
 #include "cmMidiFile.h"
 
diff --git a/cmProc2.c b/cmProc2.c
index d695e74..ebda528 100644
--- a/cmProc2.c
+++ b/cmProc2.c
@@ -19,6 +19,7 @@
 #include "cmVectOps.h"
 #include "cmKeyboard.h"
 #include "cmGnuPlot.h"
+#include "cmTime.h"
 #include "cmMidi.h"
 #include "cmProc2.h"
 
diff --git a/cmProc3.c b/cmProc3.c
index 0108037..7aa56a9 100644
--- a/cmProc3.c
+++ b/cmProc3.c
@@ -18,6 +18,7 @@
 #include "cmProc.h"
 #include "cmVectOps.h"
 #include "cmProc3.h"
+#include "cmTime.h"
 #include "cmMidi.h"  // cmMidiToSciPitch();
 
 cmPitchShift* cmPitchShiftAlloc( cmCtx* c, cmPitchShift* p, unsigned procSmpCnt, cmReal_t srate )
diff --git a/cmProc4.c b/cmProc4.c
index b4da777..9a7e35e 100644
--- a/cmProc4.c
+++ b/cmProc4.c
@@ -18,6 +18,7 @@
 #include "cmMath.h"
 #include "cmProc.h"
 #include "cmVectOps.h"
+#include "cmTime.h"
 #include "cmMidi.h"
 #include "cmMidiFile.h"
 #include "cmTimeLine.h"
diff --git a/cmProcTest.c b/cmProcTest.c
index fe08a62..81da1e3 100644
--- a/cmProcTest.c
+++ b/cmProcTest.c
@@ -10,6 +10,7 @@
 #include "cmLinkedHeap.h"
 #include "cmSymTbl.h"
 #include "cmAudioFile.h"
+#include "cmTime.h"
 #include "cmMidi.h"
 #include "cmFile.h"
 #include "cmFileSys.h"
diff --git a/cmRbm.c b/cmRbm.c
index 1ccc556..5a1f2b5 100644
--- a/cmRbm.c
+++ b/cmRbm.c
@@ -11,6 +11,7 @@
 #include "cmMath.h"
 #include "cmFile.h"
 #include "cmSymTbl.h"
+#include "cmTime.h"
 #include "cmMidi.h"
 #include "cmAudioFile.h"
 #include "cmVectOpsTemplateMain.h"
diff --git a/cmUiRtSysMstr.c b/cmUiRtSysMstr.c
index c3071fc..6ad22aa 100644
--- a/cmUiRtSysMstr.c
+++ b/cmUiRtSysMstr.c
@@ -8,6 +8,7 @@
 #include "cmJson.h"
 #include "cmThread.h"
 #include "cmUdpPort.h"
+#include "cmTime.h"
 #include "cmRtSysMsg.h"
 #include "cmRtNet.h"
 #include "cmRtSys.h"
diff --git a/dsp/cmDspClass.c b/dsp/cmDspClass.c
index 2d52c92..1fffb6f 100644
--- a/dsp/cmDspClass.c
+++ b/dsp/cmDspClass.c
@@ -15,6 +15,7 @@
 #include "cmThread.h"
 #include "cmUdpPort.h"
 #include "cmUdpNet.h"
+#include "cmTime.h"
 #include "cmAudioSys.h"
 #include "cmProcObj.h"
 #include "cmDspCtx.h"
diff --git a/dsp/cmDspFx.c b/dsp/cmDspFx.c
index 361a3f3..46d4e5f 100644
--- a/dsp/cmDspFx.c
+++ b/dsp/cmDspFx.c
@@ -20,6 +20,7 @@
 #include "cmThread.h" 
 #include "cmUdpPort.h"
 #include "cmUdpNet.h"
+#include "cmTime.h"
 #include "cmAudioSys.h"
 #include "cmProcObj.h"
 #include "cmDspCtx.h"
diff --git a/dsp/cmDspNet.c b/dsp/cmDspNet.c
index de6742c..a3fc466 100644
--- a/dsp/cmDspNet.c
+++ b/dsp/cmDspNet.c
@@ -16,6 +16,7 @@
 #include "cmThread.h"
 #include "cmUdpPort.h"
 #include "cmUdpNet.h"
+#include "cmTime.h"
 #include "cmAudioSys.h"
 #include "cmProcObj.h"
 #include "cmDspCtx.h"
diff --git a/dsp/cmDspPgmKr.c b/dsp/cmDspPgmKr.c
index 33ba2f6..8d0bb87 100644
--- a/dsp/cmDspPgmKr.c
+++ b/dsp/cmDspPgmKr.c
@@ -17,6 +17,7 @@
 #include "cmThread.h"
 #include "cmUdpPort.h"
 #include "cmUdpNet.h"
+#include "cmTime.h"
 #include "cmAudioSys.h"
 #include "cmProcObj.h"
 #include "cmDspCtx.h"
diff --git a/dsp/cmDspPgmPP.c b/dsp/cmDspPgmPP.c
index 32290f5..db1b651 100644
--- a/dsp/cmDspPgmPP.c
+++ b/dsp/cmDspPgmPP.c
@@ -17,6 +17,7 @@
 #include "cmThread.h"
 #include "cmUdpPort.h"
 #include "cmUdpNet.h"
+#include "cmTime.h"
 #include "cmAudioSys.h"
 #include "cmProcObj.h"
 #include "cmDspCtx.h"
diff --git a/dsp/cmDspPgmPPMain.c b/dsp/cmDspPgmPPMain.c
index e85b83b..0be9642 100644
--- a/dsp/cmDspPgmPPMain.c
+++ b/dsp/cmDspPgmPPMain.c
@@ -17,6 +17,7 @@
 #include "cmThread.h"
 #include "cmUdpPort.h"
 #include "cmUdpNet.h"
+#include "cmTime.h"
 #include "cmAudioSys.h"
 #include "cmProcObj.h"
 #include "cmDspCtx.h"
diff --git a/dsp/cmDspSys.c b/dsp/cmDspSys.c
index b457d33..2f88e2f 100644
--- a/dsp/cmDspSys.c
+++ b/dsp/cmDspSys.c
@@ -10,6 +10,7 @@
 #include "cmText.h"
 #include "cmFileSys.h"
 #include "cmSymTbl.h"
+#include "cmTime.h"
 #include "cmMidi.h"
 #include "cmJson.h"
 #include "cmPrefs.h"
diff --git a/dsp/cmDspUi.c b/dsp/cmDspUi.c
index c92ecb1..806f2e5 100644
--- a/dsp/cmDspUi.c
+++ b/dsp/cmDspUi.c
@@ -19,6 +19,7 @@
 #include "cmThread.h"
 #include "cmUdpPort.h"
 #include "cmUdpNet.h"
+#include "cmTime.h"
 #include "cmAudioSys.h"
 
 /*