diff --git a/tests/Makefile.in b/tests/Makefile.in
index 0f692c4cce..ecf4db0ce4 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -62,6 +62,7 @@ TEST_OBJECTS =  \
 	test_cmdlinetest.o \
 	test_fileconf.o \
 	test_datetimetest.o \
+	test_evthandler.o \
 	test_timertest.o \
 	test_filekind.o \
 	test_filenametest.o \
@@ -132,7 +133,6 @@ TEST_GUI_OBJECTS =  \
 	test_gui_textentrytest.o \
 	test_gui_treectrltest.o \
 	test_gui_propagation.o \
-	test_gui_evthandler.o \
 	test_gui_rawbmp.o \
 	test_gui_htmlwindow.o \
 	test_gui_guifuncs.o \
@@ -385,6 +385,9 @@ test_fileconf.o: $(srcdir)/config/fileconf.cpp $(TEST_ODEP)
 test_datetimetest.o: $(srcdir)/datetime/datetimetest.cpp $(TEST_ODEP)
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/datetime/datetimetest.cpp
 
+test_evthandler.o: $(srcdir)/events/evthandler.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/events/evthandler.cpp
+
 test_timertest.o: $(srcdir)/events/timertest.cpp $(TEST_ODEP)
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/events/timertest.cpp
 
@@ -574,9 +577,6 @@ test_gui_treectrltest.o: $(srcdir)/controls/treectrltest.cpp $(TEST_GUI_ODEP)
 test_gui_propagation.o: $(srcdir)/events/propagation.cpp $(TEST_GUI_ODEP)
 	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/events/propagation.cpp
 
-test_gui_evthandler.o: $(srcdir)/events/evthandler.cpp $(TEST_GUI_ODEP)
-	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/events/evthandler.cpp
-
 test_gui_rawbmp.o: $(srcdir)/image/rawbmp.cpp $(TEST_GUI_ODEP)
 	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/image/rawbmp.cpp
 
diff --git a/tests/makefile.bcc b/tests/makefile.bcc
index bf331edec9..84cbf38be4 100644
--- a/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@ -46,6 +46,7 @@ TEST_OBJECTS =  \
 	$(OBJS)\test_cmdlinetest.obj \
 	$(OBJS)\test_fileconf.obj \
 	$(OBJS)\test_datetimetest.obj \
+	$(OBJS)\test_evthandler.obj \
 	$(OBJS)\test_timertest.obj \
 	$(OBJS)\test_filekind.obj \
 	$(OBJS)\test_filenametest.obj \
@@ -117,7 +118,6 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_textentrytest.obj \
 	$(OBJS)\test_gui_treectrltest.obj \
 	$(OBJS)\test_gui_propagation.obj \
-	$(OBJS)\test_gui_evthandler.obj \
 	$(OBJS)\test_gui_rawbmp.obj \
 	$(OBJS)\test_gui_htmlwindow.obj \
 	$(OBJS)\test_gui_guifuncs.obj \
@@ -422,6 +422,9 @@ $(OBJS)\test_fileconf.obj: .\config\fileconf.cpp
 $(OBJS)\test_datetimetest.obj: .\datetime\datetimetest.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\datetime\datetimetest.cpp
 
+$(OBJS)\test_evthandler.obj: .\events\evthandler.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\events\evthandler.cpp
+
 $(OBJS)\test_timertest.obj: .\events\timertest.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\events\timertest.cpp
 
@@ -614,9 +617,6 @@ $(OBJS)\test_gui_treectrltest.obj: .\controls\treectrltest.cpp
 $(OBJS)\test_gui_propagation.obj: .\events\propagation.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\events\propagation.cpp
 
-$(OBJS)\test_gui_evthandler.obj: .\events\evthandler.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\events\evthandler.cpp
-
 $(OBJS)\test_gui_rawbmp.obj: .\image\rawbmp.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\image\rawbmp.cpp
 
diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index d7095870ef..78543f77e0 100644
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -38,6 +38,7 @@ TEST_OBJECTS =  \
 	$(OBJS)\test_cmdlinetest.o \
 	$(OBJS)\test_fileconf.o \
 	$(OBJS)\test_datetimetest.o \
+	$(OBJS)\test_evthandler.o \
 	$(OBJS)\test_timertest.o \
 	$(OBJS)\test_filekind.o \
 	$(OBJS)\test_filenametest.o \
@@ -110,7 +111,6 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_textentrytest.o \
 	$(OBJS)\test_gui_treectrltest.o \
 	$(OBJS)\test_gui_propagation.o \
-	$(OBJS)\test_gui_evthandler.o \
 	$(OBJS)\test_gui_rawbmp.o \
 	$(OBJS)\test_gui_htmlwindow.o \
 	$(OBJS)\test_gui_guifuncs.o \
@@ -402,6 +402,9 @@ $(OBJS)\test_fileconf.o: ./config/fileconf.cpp
 $(OBJS)\test_datetimetest.o: ./datetime/datetimetest.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\test_evthandler.o: ./events/evthandler.cpp
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\test_timertest.o: ./events/timertest.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
@@ -594,9 +597,6 @@ $(OBJS)\test_gui_treectrltest.o: ./controls/treectrltest.cpp
 $(OBJS)\test_gui_propagation.o: ./events/propagation.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\test_gui_evthandler.o: ./events/evthandler.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\test_gui_rawbmp.o: ./image/rawbmp.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 
diff --git a/tests/makefile.vc b/tests/makefile.vc
index 8d529d7ee1..faabb91a9e 100644
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -29,6 +29,11 @@ TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
 	$(CPPUNIT_CFLAGS) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"testprec.h" \
 	/Fp"$(OBJS)\testprec_test.pch" $(CPPFLAGS) $(CXXFLAGS)
 TEST_OBJECTS =  \
+	$(OBJS)\test_dummy.obj \
+	$(OBJS)\test_test.obj \
+	$(OBJS)\test_evthandler.obj \
+
+TEST_OBJECTS_ =  \
 	$(OBJS)\test_dummy.obj \
 	$(OBJS)\test_test.obj \
 	$(OBJS)\test_archivetest.obj \
@@ -39,6 +44,7 @@ TEST_OBJECTS =  \
 	$(OBJS)\test_cmdlinetest.obj \
 	$(OBJS)\test_fileconf.obj \
 	$(OBJS)\test_datetimetest.obj \
+	$(OBJS)\test_evthandler.obj \
 	$(OBJS)\test_timertest.obj \
 	$(OBJS)\test_filekind.obj \
 	$(OBJS)\test_filenametest.obj \
@@ -113,7 +119,6 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_textentrytest.obj \
 	$(OBJS)\test_gui_treectrltest.obj \
 	$(OBJS)\test_gui_propagation.obj \
-	$(OBJS)\test_gui_evthandler.obj \
 	$(OBJS)\test_gui_rawbmp.obj \
 	$(OBJS)\test_gui_htmlwindow.obj \
 	$(OBJS)\test_gui_guifuncs.obj \
@@ -507,6 +512,9 @@ $(OBJS)\test_fileconf.obj: .\config\fileconf.cpp
 $(OBJS)\test_datetimetest.obj: .\datetime\datetimetest.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\datetime\datetimetest.cpp
 
+$(OBJS)\test_evthandler.obj: .\events\evthandler.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\events\evthandler.cpp
+
 $(OBJS)\test_timertest.obj: .\events\timertest.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\events\timertest.cpp
 
@@ -699,9 +707,6 @@ $(OBJS)\test_gui_treectrltest.obj: .\controls\treectrltest.cpp
 $(OBJS)\test_gui_propagation.obj: .\events\propagation.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\propagation.cpp
 
-$(OBJS)\test_gui_evthandler.obj: .\events\evthandler.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\evthandler.cpp
-
 $(OBJS)\test_gui_rawbmp.obj: .\image\rawbmp.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\image\rawbmp.cpp
 
diff --git a/tests/makefile.wat b/tests/makefile.wat
index c5ca2d09ec..c2df59bd00 100644
--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -273,6 +273,7 @@ TEST_OBJECTS =  &
 	$(OBJS)\test_cmdlinetest.obj &
 	$(OBJS)\test_fileconf.obj &
 	$(OBJS)\test_datetimetest.obj &
+	$(OBJS)\test_evthandler.obj &
 	$(OBJS)\test_timertest.obj &
 	$(OBJS)\test_filekind.obj &
 	$(OBJS)\test_filenametest.obj &
@@ -344,7 +345,6 @@ TEST_GUI_OBJECTS =  &
 	$(OBJS)\test_gui_textentrytest.obj &
 	$(OBJS)\test_gui_treectrltest.obj &
 	$(OBJS)\test_gui_propagation.obj &
-	$(OBJS)\test_gui_evthandler.obj &
 	$(OBJS)\test_gui_rawbmp.obj &
 	$(OBJS)\test_gui_htmlwindow.obj &
 	$(OBJS)\test_gui_guifuncs.obj &
@@ -459,6 +459,9 @@ $(OBJS)\test_fileconf.obj :  .AUTODEPEND .\config\fileconf.cpp
 $(OBJS)\test_datetimetest.obj :  .AUTODEPEND .\datetime\datetimetest.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
+$(OBJS)\test_evthandler.obj :  .AUTODEPEND .\events\evthandler.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
 $(OBJS)\test_timertest.obj :  .AUTODEPEND .\events\timertest.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
@@ -651,9 +654,6 @@ $(OBJS)\test_gui_treectrltest.obj :  .AUTODEPEND .\controls\treectrltest.cpp
 $(OBJS)\test_gui_propagation.obj :  .AUTODEPEND .\events\propagation.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
 
-$(OBJS)\test_gui_evthandler.obj :  .AUTODEPEND .\events\evthandler.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
 $(OBJS)\test_gui_rawbmp.obj :  .AUTODEPEND .\image\rawbmp.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
 
diff --git a/tests/test.bkl b/tests/test.bkl
index 6c3f46c55c..e5de212e0a 100644
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -37,6 +37,7 @@
             cmdline/cmdlinetest.cpp
             config/fileconf.cpp
             datetime/datetimetest.cpp
+            events/evthandler.cpp
             events/timertest.cpp
             filekind/filekind.cpp
             filename/filenametest.cpp
@@ -114,7 +115,6 @@
             controls/textentrytest.cpp
             controls/treectrltest.cpp
             events/propagation.cpp
-            events/evthandler.cpp
             image/rawbmp.cpp
             html/htmlwindow.cpp
             misc/guifuncs.cpp
diff --git a/tests/test_test.dsp b/tests/test_test.dsp
index de6db917f7..1b620a7a24 100644
--- a/tests/test_test.dsp
+++ b/tests/test_test.dsp
@@ -285,6 +285,10 @@ SOURCE=.\weakref\evtconnection.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\events\evthandler.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\streams\ffilestream.cpp
 # End Source File
 # Begin Source File
diff --git a/tests/test_test_gui.dsp b/tests/test_test_gui.dsp
index 00e7d760d0..28eb179fe3 100644
--- a/tests/test_test_gui.dsp
+++ b/tests/test_test_gui.dsp
@@ -253,10 +253,6 @@ SOURCE=.\dummy.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\events\evthandler.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\misc\garbage.cpp
 # End Source File
 # Begin Source File
diff --git a/tests/test_vc7_test.vcproj b/tests/test_vc7_test.vcproj
index 352147d93e..aa0bfc57a5 100644
--- a/tests/test_vc7_test.vcproj
+++ b/tests/test_vc7_test.vcproj
@@ -633,6 +633,9 @@
 			<File
 				RelativePath=".\weakref\evtconnection.cpp">
 			</File>
+			<File
+				RelativePath=".\events\evthandler.cpp">
+			</File>
 			<File
 				RelativePath=".\streams\ffilestream.cpp">
 			</File>
diff --git a/tests/test_vc7_test_gui.vcproj b/tests/test_vc7_test_gui.vcproj
index 6cb498beb8..ea1232cfab 100644
--- a/tests/test_vc7_test_gui.vcproj
+++ b/tests/test_vc7_test_gui.vcproj
@@ -609,9 +609,6 @@
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath=".\events\evthandler.cpp">
-			</File>
 			<File
 				RelativePath=".\misc\garbage.cpp">
 			</File>
diff --git a/tests/test_vc8_test.vcproj b/tests/test_vc8_test.vcproj
index be50f8bf7d..109894c1fa 100644
--- a/tests/test_vc8_test.vcproj
+++ b/tests/test_vc8_test.vcproj
@@ -923,6 +923,10 @@
 				RelativePath=".\weakref\evtconnection.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\events\evthandler.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\streams\ffilestream.cpp"
 				>
diff --git a/tests/test_vc8_test_gui.vcproj b/tests/test_vc8_test_gui.vcproj
index 913db73e77..f5a15dd0f4 100644
--- a/tests/test_vc8_test_gui.vcproj
+++ b/tests/test_vc8_test_gui.vcproj
@@ -891,10 +891,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath=".\events\evthandler.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\misc\garbage.cpp"
 				>
diff --git a/tests/test_vc9_test.vcproj b/tests/test_vc9_test.vcproj
index c547379979..012c2db301 100644
--- a/tests/test_vc9_test.vcproj
+++ b/tests/test_vc9_test.vcproj
@@ -895,6 +895,10 @@
 				RelativePath=".\weakref\evtconnection.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\events\evthandler.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\streams\ffilestream.cpp"
 				>
diff --git a/tests/test_vc9_test_gui.vcproj b/tests/test_vc9_test_gui.vcproj
index 3a677d5af8..31c7de222e 100644
--- a/tests/test_vc9_test_gui.vcproj
+++ b/tests/test_vc9_test_gui.vcproj
@@ -863,10 +863,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath=".\events\evthandler.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\misc\garbage.cpp"
 				>