diff --git a/cwAudioBuf.cpp b/cwAudioBuf.cpp
index e8dfdee..905925f 100644
--- a/cwAudioBuf.cpp
+++ b/cwAudioBuf.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwTime.h"
 #include "cwTextBuf.h"
diff --git a/cwAudioDevice.cpp b/cwAudioDevice.cpp
index b46e81d..a1c40f5 100644
--- a/cwAudioDevice.cpp
+++ b/cwAudioDevice.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwTime.h"
 #include "cwAudioDevice.h"
diff --git a/cwAudioDeviceAlsa.cpp b/cwAudioDeviceAlsa.cpp
index c866342..cf070ee 100644
--- a/cwAudioDeviceAlsa.cpp
+++ b/cwAudioDeviceAlsa.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwTime.h"
 #include "cwTextBuf.h"
diff --git a/cwAudioDeviceFile.cpp b/cwAudioDeviceFile.cpp
index c64f7d4..24a0dc5 100644
--- a/cwAudioDeviceFile.cpp
+++ b/cwAudioDeviceFile.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwText.h"
 #include "cwFile.h"
diff --git a/cwAudioDeviceTest.cpp b/cwAudioDeviceTest.cpp
index cdc4dda..1c18429 100644
--- a/cwAudioDeviceTest.cpp
+++ b/cwAudioDeviceTest.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwTime.h"
 #include "cwTextBuf.h"
diff --git a/cwAudioFile.cpp b/cwAudioFile.cpp
index 02b6724..a303524 100644
--- a/cwAudioFile.cpp
+++ b/cwAudioFile.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwFile.h"
 #include "cwObject.h"
diff --git a/cwAudioFileOps.cpp b/cwAudioFileOps.cpp
index 03e71bd..93994f3 100644
--- a/cwAudioFileOps.cpp
+++ b/cwAudioFileOps.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwFile.h"
 #include "cwText.h"
diff --git a/cwAudioFileProc.cpp b/cwAudioFileProc.cpp
index 13c9c1b..88782cd 100644
--- a/cwAudioFileProc.cpp
+++ b/cwAudioFileProc.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwFile.h"
 #include "cwText.h"
diff --git a/cwAudioTransforms.cpp b/cwAudioTransforms.cpp
index d36022a..d85a253 100644
--- a/cwAudioTransforms.cpp
+++ b/cwAudioTransforms.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwFile.h"
 #include "cwText.h"
diff --git a/cwB23Tree.cpp b/cwB23Tree.cpp
index d028cf9..70e3bf9 100644
--- a/cwB23Tree.cpp
+++ b/cwB23Tree.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwObject.h"
 #include "cwB23Tree.h"
diff --git a/cwCsv.cpp b/cwCsv.cpp
index 3db4498..e42d9e1 100644
--- a/cwCsv.cpp
+++ b/cwCsv.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwText.h"
 #include "cwFile.h"
diff --git a/cwDataSets.cpp b/cwDataSets.cpp
index 127327b..8365665 100644
--- a/cwDataSets.cpp
+++ b/cwDataSets.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwObject.h"
 #include "cwFile.h"
diff --git a/cwDnsSd.cpp b/cwDnsSd.cpp
index cbff1d5..31525c5 100644
--- a/cwDnsSd.cpp
+++ b/cwDnsSd.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwTime.h"
 
diff --git a/cwDsp.cpp b/cwDsp.cpp
index 7962a69..4f4d513 100644
--- a/cwDsp.cpp
+++ b/cwDsp.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwUtility.h"
 #include "cwMath.h"
diff --git a/cwDspTransforms.cpp b/cwDspTransforms.cpp
index 2195964..29b1841 100644
--- a/cwDspTransforms.cpp
+++ b/cwDspTransforms.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwFile.h"
 #include "cwText.h"
diff --git a/cwDynRefTbl.cpp b/cwDynRefTbl.cpp
index 407c80d..a263c84 100644
--- a/cwDynRefTbl.cpp
+++ b/cwDynRefTbl.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwText.h"
 #include "cwObject.h"
diff --git a/cwEuCon.cpp b/cwEuCon.cpp
index f7b482f..55b19ce 100644
--- a/cwEuCon.cpp
+++ b/cwEuCon.cpp
@@ -2,6 +2,7 @@
 
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 
 #include "cwMem.h"
 #include "cwTime.h"
diff --git a/cwFile.cpp b/cwFile.cpp
index e8a35bd..dcb845a 100644
--- a/cwFile.cpp
+++ b/cwFile.cpp
@@ -1,6 +1,8 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
+#include "cwObject.h"
 #include "cwMem.h"
 #include "cwFileSys.h"
 #include "cwText.h"
diff --git a/cwFlow.cpp b/cwFlow.cpp
index a67bb5d..f85cf86 100644
--- a/cwFlow.cpp
+++ b/cwFlow.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwText.h"
 #include "cwNumericConvert.h"
diff --git a/cwFlowCross.cpp b/cwFlowCross.cpp
index 4589c94..de5c646 100644
--- a/cwFlowCross.cpp
+++ b/cwFlowCross.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwText.h"
 #include "cwObject.h"
diff --git a/cwFlowNet.cpp b/cwFlowNet.cpp
index a1b4223..4798a20 100644
--- a/cwFlowNet.cpp
+++ b/cwFlowNet.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwText.h"
 #include "cwNumericConvert.h"
diff --git a/cwFlowProc.cpp b/cwFlowProc.cpp
index 9d693d2..e6c7e8e 100644
--- a/cwFlowProc.cpp
+++ b/cwFlowProc.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwText.h"
 #include "cwObject.h"
diff --git a/cwFlowTypes.cpp b/cwFlowTypes.cpp
index 024a752..bfe8743 100644
--- a/cwFlowTypes.cpp
+++ b/cwFlowTypes.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwMath.h"
 #include "cwText.h"
diff --git a/cwGutimReg.cpp b/cwGutimReg.cpp
index 32e746c..dc28247 100644
--- a/cwGutimReg.cpp
+++ b/cwGutimReg.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwText.h"
 #include "cwObject.h"
diff --git a/cwIo.cpp b/cwIo.cpp
index fa2d66e..814aba1 100644
--- a/cwIo.cpp
+++ b/cwIo.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwObject.h"
 #include "cwText.h"
diff --git a/cwIoAudioMidi.cpp b/cwIoAudioMidi.cpp
index 0c60b5f..e13be74 100644
--- a/cwIoAudioMidi.cpp
+++ b/cwIoAudioMidi.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwObject.h"
 #include "cwFileSys.h"
diff --git a/cwIoAudioMidiApp.cpp b/cwIoAudioMidiApp.cpp
index a048411..9f45845 100644
--- a/cwIoAudioMidiApp.cpp
+++ b/cwIoAudioMidiApp.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwObject.h"
 #include "cwText.h"
diff --git a/cwIoAudioPanel.cpp b/cwIoAudioPanel.cpp
index 27d5b06..609f91b 100644
--- a/cwIoAudioPanel.cpp
+++ b/cwIoAudioPanel.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwTime.h"
 #include "cwObject.h"
diff --git a/cwIoAudioRecordPlay.cpp b/cwIoAudioRecordPlay.cpp
index 831ddb4..a8abc5b 100644
--- a/cwIoAudioRecordPlay.cpp
+++ b/cwIoAudioRecordPlay.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwObject.h"
 #include "cwFileSys.h"
diff --git a/cwIoFlow.cpp b/cwIoFlow.cpp
index 57402ec..3492127 100644
--- a/cwIoFlow.cpp
+++ b/cwIoFlow.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwObject.h"
 #include "cwFileSys.h"
diff --git a/cwIoMidiRecordPlay.cpp b/cwIoMidiRecordPlay.cpp
index 161e2ff..26c35b4 100644
--- a/cwIoMidiRecordPlay.cpp
+++ b/cwIoMidiRecordPlay.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwText.h"
 #include "cwObject.h"
diff --git a/cwIoMinTest.cpp b/cwIoMinTest.cpp
index 27597bd..fa05d69 100644
--- a/cwIoMinTest.cpp
+++ b/cwIoMinTest.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwKeyboard.h"
 #include "cwMem.h"
 #include "cwObject.h"
diff --git a/cwIoPresetSelApp.cpp b/cwIoPresetSelApp.cpp
index 64227e3..52ca530 100644
--- a/cwIoPresetSelApp.cpp
+++ b/cwIoPresetSelApp.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwText.h"
 #include "cwNumericConvert.h"
diff --git a/cwIoSocketChat.cpp b/cwIoSocketChat.cpp
index 6343804..8efe48a 100644
--- a/cwIoSocketChat.cpp
+++ b/cwIoSocketChat.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwObject.h"
 #include "cwTime.h"
diff --git a/cwIoTest.cpp b/cwIoTest.cpp
index 94c27ed..801e4b5 100644
--- a/cwIoTest.cpp
+++ b/cwIoTest.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwObject.h"
 #include "cwTime.h"
diff --git a/cwLib.cpp b/cwLib.cpp
index a66cd6d..eaf9747 100644
--- a/cwLib.cpp
+++ b/cwLib.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwFileSys.h"
 #include "cwLib.h"
diff --git a/cwLog.cpp b/cwLog.cpp
index 7fa533c..f37863f 100644
--- a/cwLog.cpp
+++ b/cwLog.cpp
@@ -2,6 +2,7 @@
 #include "cwLog.h"
 
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwTime.h"
 
diff --git a/cwMdns.cpp b/cwMdns.cpp
index 55d5760..8d1221a 100644
--- a/cwMdns.cpp
+++ b/cwMdns.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 
 #include "cwThread.h"
diff --git a/cwMidi.cpp b/cwMidi.cpp
index f73b9c4..3d19722 100644
--- a/cwMidi.cpp
+++ b/cwMidi.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwTime.h"
 #include "cwMidi.h"
diff --git a/cwMidiAlsa.cpp b/cwMidiAlsa.cpp
index bc33b7f..7b6c85c 100644
--- a/cwMidiAlsa.cpp
+++ b/cwMidiAlsa.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwTime.h"
 #include "cwText.h"
diff --git a/cwMidiDevice.cpp b/cwMidiDevice.cpp
index f36845d..fc290bf 100644
--- a/cwMidiDevice.cpp
+++ b/cwMidiDevice.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwTime.h"
 #include "cwObject.h"
diff --git a/cwMidiDeviceTest.cpp b/cwMidiDeviceTest.cpp
index 174dcd3..9f4df64 100644
--- a/cwMidiDeviceTest.cpp
+++ b/cwMidiDeviceTest.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwTime.h"
 #include "cwObject.h"
diff --git a/cwMidiFile.cpp b/cwMidiFile.cpp
index 9731650..95b8e27 100644
--- a/cwMidiFile.cpp
+++ b/cwMidiFile.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwFile.h"
 #include "cwObject.h"
diff --git a/cwMidiFileDev.cpp b/cwMidiFileDev.cpp
index 9978e87..42fd52f 100644
--- a/cwMidiFileDev.cpp
+++ b/cwMidiFileDev.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwTime.h"
 #include "cwFile.h"
diff --git a/cwMidiParser.cpp b/cwMidiParser.cpp
index 0ea317d..458ef27 100644
--- a/cwMidiParser.cpp
+++ b/cwMidiParser.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwTime.h"
 #include "cwMidi.h"
diff --git a/cwMidiState.cpp b/cwMidiState.cpp
index 197603f..8781d2a 100644
--- a/cwMidiState.cpp
+++ b/cwMidiState.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwFile.h"
 #include "cwText.h"
diff --git a/cwMtx.cpp b/cwMtx.cpp
index 30eb58e..27982d2 100644
--- a/cwMtx.cpp
+++ b/cwMtx.cpp
@@ -2,6 +2,7 @@
 #include "cwLog.h"
 #include "cwCommonImpl.h"
 #include "cwMem.h"
+#include "cwTest.h"
 #include "cwObject.h"
 #include "cwVectOps.h"
 #include "cwMtx.h"
diff --git a/cwMutex.cpp b/cwMutex.cpp
index 4b8df35..af98d46 100644
--- a/cwMutex.cpp
+++ b/cwMutex.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwMutex.h"
 #include "cwTime.h"
diff --git a/cwNbMpScQueue.cpp b/cwNbMpScQueue.cpp
index 2f21581..d64e698 100644
--- a/cwNbMpScQueue.cpp
+++ b/cwNbMpScQueue.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwTime.h"
 #include "cwObject.h"
diff --git a/cwPerfMeas.cpp b/cwPerfMeas.cpp
index 999a355..392d1b9 100644
--- a/cwPerfMeas.cpp
+++ b/cwPerfMeas.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwText.h"
 #include "cwFile.h"
diff --git a/cwPianoScore.cpp b/cwPianoScore.cpp
index 1fa8c24..9305f9e 100644
--- a/cwPianoScore.cpp
+++ b/cwPianoScore.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwText.h"
 #include "cwObject.h"
diff --git a/cwPresetSel.cpp b/cwPresetSel.cpp
index 2e07769..2ab9278 100644
--- a/cwPresetSel.cpp
+++ b/cwPresetSel.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwText.h"
 #include "cwObject.h"
diff --git a/cwPvAudioFileProc.cpp b/cwPvAudioFileProc.cpp
index ee37283..f4d54c3 100644
--- a/cwPvAudioFileProc.cpp
+++ b/cwPvAudioFileProc.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwFile.h"
 #include "cwText.h"
diff --git a/cwScoreFollowTest.cpp b/cwScoreFollowTest.cpp
index da158ca..f3de48b 100644
--- a/cwScoreFollowTest.cpp
+++ b/cwScoreFollowTest.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwText.h"
 #include "cwObject.h"
diff --git a/cwScoreFollower.cpp b/cwScoreFollower.cpp
index 7412a8e..975dbbe 100644
--- a/cwScoreFollower.cpp
+++ b/cwScoreFollower.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwText.h"
 #include "cwObject.h"
diff --git a/cwScoreParse.cpp b/cwScoreParse.cpp
index f4158fd..0956166 100644
--- a/cwScoreParse.cpp
+++ b/cwScoreParse.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwText.h"
 #include "cwObject.h"
diff --git a/cwScoreTest.cpp b/cwScoreTest.cpp
index 653cc25..e5964d2 100644
--- a/cwScoreTest.cpp
+++ b/cwScoreTest.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwText.h"
 #include "cwObject.h"
diff --git a/cwSfAnalysis.cpp b/cwSfAnalysis.cpp
index 26044e8..4cf3866 100644
--- a/cwSfAnalysis.cpp
+++ b/cwSfAnalysis.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwFile.h"
 #include "cwObject.h"
diff --git a/cwSfMatch.cpp b/cwSfMatch.cpp
index 89bf5b0..8428ec9 100644
--- a/cwSfMatch.cpp
+++ b/cwSfMatch.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwText.h"
 #include "cwObject.h"
diff --git a/cwSfScore.cpp b/cwSfScore.cpp
index bb9119c..b868e20 100644
--- a/cwSfScore.cpp
+++ b/cwSfScore.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwText.h"
 #include "cwObject.h"
diff --git a/cwSfTrack.cpp b/cwSfTrack.cpp
index f718de7..1004147 100644
--- a/cwSfTrack.cpp
+++ b/cwSfTrack.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwText.h"
 #include "cwObject.h"
diff --git a/cwSvgMidi.cpp b/cwSvgMidi.cpp
index 1c39877..33f5b83 100644
--- a/cwSvgMidi.cpp
+++ b/cwSvgMidi.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwObject.h"
 #include "cwText.h"
diff --git a/cwSvgScoreFollow.cpp b/cwSvgScoreFollow.cpp
index 880ea7d..4266187 100644
--- a/cwSvgScoreFollow.cpp
+++ b/cwSvgScoreFollow.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwObject.h"
 #include "cwText.h"
diff --git a/cwUi.cpp b/cwUi.cpp
index 722ca9f..d0020e6 100644
--- a/cwUi.cpp
+++ b/cwUi.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwTime.h"
 #include "cwFileSys.h"
diff --git a/cwUiTest.cpp b/cwUiTest.cpp
index 48054b9..b7da65c 100644
--- a/cwUiTest.cpp
+++ b/cwUiTest.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwThread.h"
 #include "cwWebSock.h"
diff --git a/cwVelTableTuner.cpp b/cwVelTableTuner.cpp
index 6df6938..cabe9af 100644
--- a/cwVelTableTuner.cpp
+++ b/cwVelTableTuner.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwText.h"
 #include "cwObject.h"
diff --git a/cwWebSock.cpp b/cwWebSock.cpp
index e8a682d..cb6eac7 100644
--- a/cwWebSock.cpp
+++ b/cwWebSock.cpp
@@ -1,7 +1,7 @@
-
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwFileSys.h"
 #include "cwObject.h"
diff --git a/cwWebSockSvr.cpp b/cwWebSockSvr.cpp
index 9c083c8..3267d43 100644
--- a/cwWebSockSvr.cpp
+++ b/cwWebSockSvr.cpp
@@ -1,6 +1,7 @@
 #include "cwCommon.h"
 #include "cwLog.h"
 #include "cwCommonImpl.h"
+#include "cwTest.h"
 #include "cwMem.h"
 #include "cwWebSock.h"
 #include "cwThread.h"