diff --git a/src/mess/tools/castool/castool.mak b/src/mess/tools/castool/castool.mak
index f1ab2dca051..d1437d0ba7c 100644
--- a/src/mess/tools/castool/castool.mak
+++ b/src/mess/tools/castool/castool.mak
@@ -33,6 +33,7 @@ CASTOOL_OBJS = \
 # rules to build the castool executable
 #-------------------------------------------------
 
-$(CASTOOL): $(CASTOOL_OBJS) $(FORMATS_LIB) $(LIBUTIL) $(EXPAT) $(ZLIB) $(LIBOCORE)
+# TODO: Visual Studio wants $(FLAC_LIB) and $(7Z_LIB) during linking...
+$(CASTOOL): $(CASTOOL_OBJS) $(FORMATS_LIB) $(LIBUTIL) $(EXPAT) $(ZLIB) $(LIBOCORE) $(FLAC_LIB) $(7Z_LIB)
 	@echo Linking $@...
 	$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
diff --git a/src/mess/tools/floptool/floptool.mak b/src/mess/tools/floptool/floptool.mak
index 37fa0a82e04..21ee8cd17fd 100644
--- a/src/mess/tools/floptool/floptool.mak
+++ b/src/mess/tools/floptool/floptool.mak
@@ -33,6 +33,7 @@ FLOPTOOL_OBJS = \
 # rules to build the floptool executable
 #-------------------------------------------------
 
-$(FLOPTOOL): $(FLOPTOOL_OBJS) $(FORMATS_LIB) $(LIBEMU) $(LIBUTIL) $(EXPAT) $(ZLIB) $(LIBOCORE)
+# TODO: Visual Studio wants $(FLAC_LIB) and $(7Z_LIB) during linking...
+$(FLOPTOOL): $(FLOPTOOL_OBJS) $(FORMATS_LIB) $(LIBEMU) $(LIBUTIL) $(EXPAT) $(ZLIB) $(LIBOCORE) $(FLAC_LIB) $(7Z_LIB)
 	@echo Linking $@...
 	$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
diff --git a/src/tools/tools.mak b/src/tools/tools.mak
index c101ba0566b..f7cfbcefb38 100644
--- a/src/tools/tools.mak
+++ b/src/tools/tools.mak
@@ -113,7 +113,8 @@ jedutil$(EXE): $(JEDUTILOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT)
 UNIDASMOBJS = \
 	$(TOOLSOBJ)/unidasm.o \
 
-unidasm$(EXE): $(UNIDASMOBJS) $(LIBDASM) $(LIBEMU) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT)
+# TODO: Visual Studio wants $(FLAC_LIB) and $(7Z_LIB) during linking...
+unidasm$(EXE): $(UNIDASMOBJS) $(LIBDASM) $(LIBEMU) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT) $(FLAC_LIB) $(7Z_LIB)
 	@echo Linking $@...
 	$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
 
@@ -191,7 +192,8 @@ src2html$(EXE): $(SRC2HTMLOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT)
 SPLITOBJS = \
 	$(TOOLSOBJ)/split.o \
 
-split$(EXE): $(SPLITOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT)
+# TODO: Visual Studio wants $(FLAC_LIB) and $(7Z_LIB) during linking...
+split$(EXE): $(SPLITOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT) $(FLAC_LIB) $(7Z_LIB)
 	@echo Linking $@...
 	$(LD) $(LDFLAGS) $^ $(LIBS) -o $@