Fix (ICE-3792) - dependencies in the repository are very crappy

For now removed Unix dependencies from repository, we keep Windows
dependencies in repository but now are generated from Windows.

5 files changed, 216 insertions, 57 deletions

diff --git a/cpp/src/Slice/.depend b/cpp/src/Slice/.depend
deleted file mode 100644
index fcd7bc140d1..00000000000
--- a/cpp/src/Slice/.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-Checksum$(OBJEXT): Checksum.cpp $(includedir)/Slice/Checksum.h $(includedir)/Slice/Parser.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h ../Slice/MD5.h $(includedir)/IceUtil/OutputUtil.h
-CPlusPlusUtil$(OBJEXT): CPlusPlusUtil.cpp $(includedir)/Slice/CPlusPlusUtil.h $(includedir)/Slice/Parser.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/OutputUtil.h $(includedir)/Slice/Util.h
-CsUtil$(OBJEXT): CsUtil.cpp $(includedir)/Slice/CsUtil.h $(includedir)/Slice/Parser.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/OutputUtil.h $(includedir)/Slice/DotNetNames.h $(includedir)/Slice/Util.h $(includedir)/IceUtil/Functional.h
-DotNetNames$(OBJEXT): DotNetNames.cpp $(includedir)/Slice/DotNetNames.h
-FileTracker$(OBJEXT): FileTracker.cpp $(includedir)/Slice/FileTracker.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Slice/Parser.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h
-JavaUtil$(OBJEXT): JavaUtil.cpp $(includedir)/IceUtil/DisableWarnings.h $(includedir)/Slice/JavaUtil.h $(includedir)/Slice/Parser.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/OutputUtil.h $(includedir)/Slice/FileTracker.h $(includedir)/Slice/Util.h ../Slice/MD5.h $(includedir)/IceUtil/Functional.h
-MD5$(OBJEXT): MD5.cpp ../Slice/MD5.h $(includedir)/IceUtil/Config.h ../Slice/MD5I.h
-MD5I$(OBJEXT): MD5I.cpp ../Slice/MD5I.h
-Parser$(OBJEXT): Parser.cpp $(includedir)/IceUtil/Functional.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/InputUtil.h $(includedir)/IceUtil/StringUtil.h $(includedir)/Slice/Parser.h $(includedir)/IceUtil/Shared.h ../Slice/GrammarUtil.h $(includedir)/Slice/Util.h $(includedir)/IceUtil/OutputUtil.h
-PHPUtil$(OBJEXT): PHPUtil.cpp $(includedir)/Slice/PHPUtil.h $(includedir)/Slice/Parser.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h
-Preprocessor$(OBJEXT): Preprocessor.cpp $(includedir)/IceUtil/DisableWarnings.h $(includedir)/Slice/Preprocessor.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Slice/Util.h $(includedir)/Slice/Parser.h $(includedir)/IceUtil/OutputUtil.h $(includedir)/IceUtil/StringUtil.h $(includedir)/IceUtil/StringConverter.h ../IceUtil/FileUtil.h $(includedir)/IceUtil/UUID.h
-PythonUtil$(OBJEXT): PythonUtil.cpp $(includedir)/Slice/PythonUtil.h $(includedir)/Slice/Parser.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/OutputUtil.h $(includedir)/Slice/Checksum.h $(includedir)/Slice/Util.h $(includedir)/IceUtil/IceUtil.h $(includedir)/IceUtil/AbstractMutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/Cache.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/MutexProtocol.h $(includedir)/IceUtil/CountDownLatch.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/CtrlCHandler.h $(includedir)/IceUtil/Functional.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/MutexPtrLock.h $(includedir)/IceUtil/RecMutex.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/IceUtil/StringConverter.h $(includedir)/IceUtil/Thread.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/UUID.h $(includedir)/IceUtil/UniquePtr.h $(includedir)/IceUtil/IconvStringConverter.h $(includedir)/IceUtil/UndefSysMacros.h $(includedir)/IceUtil/StringUtil.h $(includedir)/IceUtil/InputUtil.h
-RubyUtil$(OBJEXT): RubyUtil.cpp $(includedir)/Slice/RubyUtil.h $(includedir)/Slice/Parser.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/OutputUtil.h $(includedir)/Slice/Checksum.h $(includedir)/Slice/Util.h $(includedir)/IceUtil/Functional.h $(includedir)/IceUtil/InputUtil.h
-Scanner$(OBJEXT): Scanner.cpp $(includedir)/IceUtil/ScannerConfig.h $(includedir)/IceUtil/Config.h ../Slice/GrammarUtil.h $(includedir)/Slice/Parser.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h ../Slice/Grammar.h $(includedir)/IceUtil/InputUtil.h
-Util$(OBJEXT): Util.cpp $(includedir)/Slice/Util.h $(includedir)/Slice/Parser.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/OutputUtil.h ../IceUtil/FileUtil.h $(includedir)/IceUtil/StringUtil.h
-Grammar$(OBJEXT): ../Slice/Grammar.cpp ../Slice/GrammarUtil.h $(includedir)/Slice/Parser.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/InputUtil.h $(includedir)/IceUtil/UUID.h
diff --git a/cpp/src/Slice/.depend.mak b/cpp/src/Slice/.depend.mak
index 1a154d98326..c64605330d4 100644
--- a/cpp/src/Slice/.depend.mak
+++ b/cpp/src/Slice/.depend.mak
@@ -1,16 +1,196 @@
-Checksum$(OBJEXT): Checksum.cpp "$(includedir)/Slice/Checksum.h" "$(includedir)/Slice/Parser.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Exception.h" ../Slice/MD5.h "$(includedir)/IceUtil/OutputUtil.h"
-CPlusPlusUtil$(OBJEXT): CPlusPlusUtil.cpp "$(includedir)/Slice/CPlusPlusUtil.h" "$(includedir)/Slice/Parser.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/IceUtil/OutputUtil.h" "$(includedir)/Slice/Util.h"
-CsUtil$(OBJEXT): CsUtil.cpp "$(includedir)/Slice/CsUtil.h" "$(includedir)/Slice/Parser.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/IceUtil/OutputUtil.h" "$(includedir)/Slice/DotNetNames.h" "$(includedir)/Slice/Util.h" "$(includedir)/IceUtil/Functional.h"
-DotNetNames$(OBJEXT): DotNetNames.cpp "$(includedir)/Slice/DotNetNames.h"
-FileTracker$(OBJEXT): FileTracker.cpp "$(includedir)/Slice/FileTracker.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/Slice/Parser.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Exception.h"
-JavaUtil$(OBJEXT): JavaUtil.cpp "$(includedir)/IceUtil/DisableWarnings.h" "$(includedir)/Slice/JavaUtil.h" "$(includedir)/Slice/Parser.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/IceUtil/OutputUtil.h" "$(includedir)/Slice/FileTracker.h" "$(includedir)/Slice/Util.h" ../Slice/MD5.h "$(includedir)/IceUtil/Functional.h"
-MD5$(OBJEXT): MD5.cpp ../Slice/MD5.h "$(includedir)/IceUtil/Config.h" ../Slice/MD5I.h
-MD5I$(OBJEXT): MD5I.cpp ../Slice/MD5I.h
-Parser$(OBJEXT): Parser.cpp "$(includedir)/IceUtil/Functional.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/IceUtil/InputUtil.h" "$(includedir)/IceUtil/StringUtil.h" "$(includedir)/Slice/Parser.h" "$(includedir)/IceUtil/Shared.h" ../Slice/GrammarUtil.h "$(includedir)/Slice/Util.h" "$(includedir)/IceUtil/OutputUtil.h"
-PHPUtil$(OBJEXT): PHPUtil.cpp "$(includedir)/Slice/PHPUtil.h" "$(includedir)/Slice/Parser.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Exception.h"
-Preprocessor$(OBJEXT): Preprocessor.cpp "$(includedir)/IceUtil/DisableWarnings.h" "$(includedir)/Slice/Preprocessor.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/Slice/Util.h" "$(includedir)/Slice/Parser.h" "$(includedir)/IceUtil/OutputUtil.h" "$(includedir)/IceUtil/StringUtil.h" "$(includedir)/IceUtil/StringConverter.h" ../IceUtil/FileUtil.h "$(includedir)/IceUtil/UUID.h"
-PythonUtil$(OBJEXT): PythonUtil.cpp "$(includedir)/Slice/PythonUtil.h" "$(includedir)/Slice/Parser.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/IceUtil/OutputUtil.h" "$(includedir)/Slice/Checksum.h" "$(includedir)/Slice/Util.h" "$(includedir)/IceUtil/IceUtil.h" "$(includedir)/IceUtil/AbstractMutex.h" "$(includedir)/IceUtil/Lock.h" "$(includedir)/IceUtil/ThreadException.h" "$(includedir)/IceUtil/Time.h" "$(includedir)/IceUtil/Cache.h" "$(includedir)/IceUtil/Mutex.h" "$(includedir)/IceUtil/MutexProtocol.h" "$(includedir)/IceUtil/CountDownLatch.h" "$(includedir)/IceUtil/Cond.h" "$(includedir)/IceUtil/CtrlCHandler.h" "$(includedir)/IceUtil/Functional.h" "$(includedir)/IceUtil/Monitor.h" "$(includedir)/IceUtil/MutexPtrLock.h" "$(includedir)/IceUtil/RecMutex.h" "$(includedir)/IceUtil/ScopedArray.h" "$(includedir)/IceUtil/StringConverter.h" "$(includedir)/IceUtil/Thread.h" "$(includedir)/IceUtil/Timer.h" "$(includedir)/IceUtil/UUID.h" "$(includedir)/IceUtil/UniquePtr.h" "$(includedir)/IceUtil/IconvStringConverter.h" "$(includedir)/IceUtil/UndefSysMacros.h" "$(includedir)/IceUtil/StringUtil.h" "$(includedir)/IceUtil/InputUtil.h"
-RubyUtil$(OBJEXT): RubyUtil.cpp "$(includedir)/Slice/RubyUtil.h" "$(includedir)/Slice/Parser.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/IceUtil/OutputUtil.h" "$(includedir)/Slice/Checksum.h" "$(includedir)/Slice/Util.h" "$(includedir)/IceUtil/Functional.h" "$(includedir)/IceUtil/InputUtil.h"
-Scanner$(OBJEXT): Scanner.cpp "$(includedir)/IceUtil/ScannerConfig.h" "$(includedir)/IceUtil/Config.h" ../Slice/GrammarUtil.h "$(includedir)/Slice/Parser.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Exception.h" ../Slice/Grammar.h "$(includedir)/IceUtil/InputUtil.h"
-Util$(OBJEXT): Util.cpp "$(includedir)/Slice/Util.h" "$(includedir)/Slice/Parser.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/IceUtil/OutputUtil.h" ../IceUtil/FileUtil.h "$(includedir)/IceUtil/StringUtil.h"
-Grammar$(OBJEXT): ../Slice/Grammar.cpp ../Slice/GrammarUtil.h "$(includedir)/Slice/Parser.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/IceUtil/InputUtil.h" "$(includedir)/IceUtil/UUID.h"
+
+Checksum.obj: \
+	Checksum.cpp \
+    "$(includedir)\Slice\Checksum.h" \
+    "$(includedir)\Slice\Parser.h" \
+    "$(includedir)\IceUtil\Shared.h" \
+    "$(includedir)\IceUtil\Config.h" \
+    "$(includedir)\IceUtil\Handle.h" \
+    "$(includedir)\IceUtil\Exception.h" \
+    "..\..\src\Slice\MD5.h" \
+    "$(includedir)\IceUtil\OutputUtil.h" \
+
+CPlusPlusUtil.obj: \
+	CPlusPlusUtil.cpp \
+    "$(includedir)\Slice\CPlusPlusUtil.h" \
+    "$(includedir)\Slice\Parser.h" \
+    "$(includedir)\IceUtil\Shared.h" \
+    "$(includedir)\IceUtil\Config.h" \
+    "$(includedir)\IceUtil\Handle.h" \
+    "$(includedir)\IceUtil\Exception.h" \
+    "$(includedir)\IceUtil\OutputUtil.h" \
+    "$(includedir)\Slice\Util.h" \
+
+CsUtil.obj: \
+	CsUtil.cpp \
+    "$(includedir)\Slice\CsUtil.h" \
+    "$(includedir)\Slice\Parser.h" \
+    "$(includedir)\IceUtil\Shared.h" \
+    "$(includedir)\IceUtil\Config.h" \
+    "$(includedir)\IceUtil\Handle.h" \
+    "$(includedir)\IceUtil\Exception.h" \
+    "$(includedir)\IceUtil\OutputUtil.h" \
+    "$(includedir)\Slice\DotNetNames.h" \
+    "$(includedir)\Slice\Util.h" \
+    "$(includedir)\IceUtil\Functional.h" \
+
+DotNetNames.obj: \
+	DotNetNames.cpp \
+    "$(includedir)\Slice\DotNetNames.h" \
+
+FileTracker.obj: \
+	FileTracker.cpp \
+    "$(includedir)\Slice\FileTracker.h" \
+    "$(includedir)\IceUtil\Shared.h" \
+    "$(includedir)\IceUtil\Config.h" \
+    "$(includedir)\Slice\Parser.h" \
+    "$(includedir)\IceUtil\Handle.h" \
+    "$(includedir)\IceUtil\Exception.h" \
+
+Grammar.obj: \
+	Grammar.cpp \
+    "..\..\src\Slice\GrammarUtil.h" \
+    "$(includedir)\Slice\Parser.h" \
+    "$(includedir)\IceUtil\Shared.h" \
+    "$(includedir)\IceUtil\Config.h" \
+    "$(includedir)\IceUtil\Handle.h" \
+    "$(includedir)\IceUtil\Exception.h" \
+    "$(includedir)\IceUtil\InputUtil.h" \
+    "$(includedir)\IceUtil\UUID.h" \
+
+JavaUtil.obj: \
+	JavaUtil.cpp \
+    "$(includedir)\IceUtil\DisableWarnings.h" \
+    "$(includedir)\Slice\JavaUtil.h" \
+    "$(includedir)\Slice\Parser.h" \
+    "$(includedir)\IceUtil\Shared.h" \
+    "$(includedir)\IceUtil\Config.h" \
+    "$(includedir)\IceUtil\Handle.h" \
+    "$(includedir)\IceUtil\Exception.h" \
+    "$(includedir)\IceUtil\OutputUtil.h" \
+    "$(includedir)\Slice\FileTracker.h" \
+    "$(includedir)\Slice\Util.h" \
+    "..\..\src\Slice\MD5.h" \
+    "$(includedir)\IceUtil\Functional.h" \
+
+MD5.obj: \
+	MD5.cpp \
+    "..\..\src\Slice\MD5.h" \
+    "$(includedir)\IceUtil\Config.h" \
+    "..\..\src\Slice\MD5I.h" \
+
+MD5I.obj: \
+	MD5I.cpp \
+    "..\..\src\Slice\MD5I.h" \
+
+Parser.obj: \
+	Parser.cpp \
+    "$(includedir)\IceUtil\Functional.h" \
+    "$(includedir)\IceUtil\Handle.h" \
+    "$(includedir)\IceUtil\Exception.h" \
+    "$(includedir)\IceUtil\Config.h" \
+    "$(includedir)\IceUtil\InputUtil.h" \
+    "$(includedir)\IceUtil\StringUtil.h" \
+    "$(includedir)\Slice\Parser.h" \
+    "$(includedir)\IceUtil\Shared.h" \
+    "..\..\src\Slice\GrammarUtil.h" \
+    "$(includedir)\Slice\Util.h" \
+    "$(includedir)\IceUtil\OutputUtil.h" \
+
+PHPUtil.obj: \
+	PHPUtil.cpp \
+    "$(includedir)\Slice\PHPUtil.h" \
+    "$(includedir)\Slice\Parser.h" \
+    "$(includedir)\IceUtil\Shared.h" \
+    "$(includedir)\IceUtil\Config.h" \
+    "$(includedir)\IceUtil\Handle.h" \
+    "$(includedir)\IceUtil\Exception.h" \
+
+Preprocessor.obj: \
+	Preprocessor.cpp \
+    "$(includedir)\IceUtil\DisableWarnings.h" \
+    "$(includedir)\Slice\Preprocessor.h" \
+    "$(includedir)\IceUtil\Shared.h" \
+    "$(includedir)\IceUtil\Config.h" \
+    "$(includedir)\IceUtil\Handle.h" \
+    "$(includedir)\IceUtil\Exception.h" \
+    "$(includedir)\Slice\Util.h" \
+    "$(includedir)\Slice\Parser.h" \
+    "$(includedir)\IceUtil\OutputUtil.h" \
+    "$(includedir)\IceUtil\StringUtil.h" \
+    "$(includedir)\IceUtil\StringConverter.h" \
+    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\UUID.h" \
+
+PythonUtil.obj: \
+	PythonUtil.cpp \
+    "$(includedir)\Slice\PythonUtil.h" \
+    "$(includedir)\Slice\Parser.h" \
+    "$(includedir)\IceUtil\Shared.h" \
+    "$(includedir)\IceUtil\Config.h" \
+    "$(includedir)\IceUtil\Handle.h" \
+    "$(includedir)\IceUtil\Exception.h" \
+    "$(includedir)\IceUtil\OutputUtil.h" \
+    "$(includedir)\Slice\Checksum.h" \
+    "$(includedir)\Slice\Util.h" \
+    "$(includedir)\IceUtil\IceUtil.h" \
+    "$(includedir)\IceUtil\AbstractMutex.h" \
+    "$(includedir)\IceUtil\Lock.h" \
+    "$(includedir)\IceUtil\ThreadException.h" \
+    "$(includedir)\IceUtil\Time.h" \
+    "$(includedir)\IceUtil\Cache.h" \
+    "$(includedir)\IceUtil\Mutex.h" \
+    "$(includedir)\IceUtil\MutexProtocol.h" \
+    "$(includedir)\IceUtil\CountDownLatch.h" \
+    "$(includedir)\IceUtil\Cond.h" \
+    "$(includedir)\IceUtil\CtrlCHandler.h" \
+    "$(includedir)\IceUtil\Functional.h" \
+    "$(includedir)\IceUtil\Monitor.h" \
+    "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\IceUtil\RecMutex.h" \
+    "$(includedir)\IceUtil\ScopedArray.h" \
+    "$(includedir)\IceUtil\StringConverter.h" \
+    "$(includedir)\IceUtil\Thread.h" \
+    "$(includedir)\IceUtil\Timer.h" \
+    "$(includedir)\IceUtil\UUID.h" \
+    "$(includedir)\IceUtil\UniquePtr.h" \
+    "$(includedir)\IceUtil\StringUtil.h" \
+    "$(includedir)\IceUtil\InputUtil.h" \
+
+RubyUtil.obj: \
+	RubyUtil.cpp \
+    "$(includedir)\Slice\RubyUtil.h" \
+    "$(includedir)\Slice\Parser.h" \
+    "$(includedir)\IceUtil\Shared.h" \
+    "$(includedir)\IceUtil\Config.h" \
+    "$(includedir)\IceUtil\Handle.h" \
+    "$(includedir)\IceUtil\Exception.h" \
+    "$(includedir)\IceUtil\OutputUtil.h" \
+    "$(includedir)\Slice\Checksum.h" \
+    "$(includedir)\Slice\Util.h" \
+    "$(includedir)\IceUtil\Functional.h" \
+    "$(includedir)\IceUtil\InputUtil.h" \
+
+Scanner.obj: \
+	Scanner.cpp \
+    "$(includedir)\IceUtil\ScannerConfig.h" \
+    "$(includedir)\IceUtil\Config.h" \
+    "..\..\src\Slice\GrammarUtil.h" \
+    "$(includedir)\Slice\Parser.h" \
+    "$(includedir)\IceUtil\Shared.h" \
+    "$(includedir)\IceUtil\Handle.h" \
+    "$(includedir)\IceUtil\Exception.h" \
+    "..\..\src\Slice\Grammar.h" \
+    "$(includedir)\IceUtil\InputUtil.h" \
+
+Util.obj: \
+	Util.cpp \
+    "$(includedir)\Slice\Util.h" \
+    "$(includedir)\Slice\Parser.h" \
+    "$(includedir)\IceUtil\Shared.h" \
+    "$(includedir)\IceUtil\Config.h" \
+    "$(includedir)\IceUtil\Handle.h" \
+    "$(includedir)\IceUtil\Exception.h" \
+    "$(includedir)\IceUtil\OutputUtil.h" \
+    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\StringUtil.h" \
diff --git a/cpp/src/Slice/Makefile b/cpp/src/Slice/Makefile
index 9524d52b0de..106a8b988d4 100644
--- a/cpp/src/Slice/Makefile
+++ b/cpp/src/Slice/Makefile
@@ -31,8 +31,6 @@ OBJS		= Checksum.o \
 		  Util.o \
 		  ../Slice/Grammar.o
 
-SRCS		= $(OBJS:.o=.cpp)
-
 include $(top_srcdir)/config/Make.rules
 
 
@@ -60,5 +58,3 @@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME)
 install:: all
 	$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
 endif
-
-include .depend
diff --git a/cpp/src/Slice/Makefile.mak b/cpp/src/Slice/Makefile.mak
index 6873150b3c3..f1d229c2dfe 100644
--- a/cpp/src/Slice/Makefile.mak
+++ b/cpp/src/Slice/Makefile.mak
@@ -14,24 +14,22 @@ DLLNAME		= $(top_srcdir)\bin\slice$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
 
 TARGETS		= $(LIBNAME) $(DLLNAME)
 
-OBJS		= Checksum.obj \
-		  CPlusPlusUtil.obj \
-		  CsUtil.obj \
-		  DotNetNames.obj \
-		  FileTracker.obj \
-		  Grammar.obj \
-		  JavaUtil.obj \
-		  MD5.obj \
-		  MD5I.obj \
-		  Parser.obj \
-		  PHPUtil.obj \
-		  Preprocessor.obj \
-		  PythonUtil.obj \
-		  RubyUtil.obj \
-		  Scanner.obj \
-		  Util.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
+OBJS		= .\Checksum.obj \
+		  .\CPlusPlusUtil.obj \
+		  .\CsUtil.obj \
+		  .\DotNetNames.obj \
+		  .\FileTracker.obj \
+		  .\Grammar.obj \
+		  .\JavaUtil.obj \
+		  .\MD5.obj \
+		  .\MD5I.obj \
+		  .\Parser.obj \
+		  .\PHPUtil.obj \
+		  .\Preprocessor.obj \
+		  .\PythonUtil.obj \
+		  .\RubyUtil.obj \
+		  .\Scanner.obj \
+		  .\Util.obj
 
 !include $(top_srcdir)/config/Make.rules.mak
 
@@ -92,5 +90,3 @@ install:: all
 	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"
 
 !endif
-
-!include .depend.mak
diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp
index 07519ca2c34..ca90a8ce85c 100644
--- a/cpp/src/Slice/Preprocessor.cpp
+++ b/cpp/src/Slice/Preprocessor.cpp
@@ -497,7 +497,10 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin
             if(pos != string::npos)
             {
                 string name = result.substr(0, pos);
-                result.replace(0, pos + suffix.size() - 1, name + "." + cppHeaderExt + " " + name + "." + cppSourceExt);
+                result.replace(0, pos + suffix.size() - 1, name + "." + cppSourceExt);
+
+                result += "\n";
+                result += name + "." + cppHeaderExt + ": " + name + "." + cppSourceExt;
             }
             break;
         }