diff --git a/base/Module.mk b/base/Module.mk
index 0359567afa077f8385a39f951f9d97b5cee2eb2e..cb398635e740ea96e58fa0cf6d910b0bbc255ce4 100644
--- a/base/Module.mk
+++ b/base/Module.mk
@@ -27,7 +27,7 @@ BASEH        := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 BASES        := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 BASEO        := $(BASES:.cxx=.o)
 
-BASEDEP      := $(BASEO:.o=.d)
+BASEDEP      := $(BASEO:.o=.d) $(BASEDO:.o=.d)
 
 # used in the main Makefile
 ALLHDRS     += $(patsubst $(MODDIRI)/%.h,include/%.h,$(BASEH))
diff --git a/build/Module.mk b/build/Module.mk
index f88d2a59dff4acdf57f57b3fcecdc5d7a867b6a0..80f5ccd24c6be095f74f72f621c295137ac6062b 100644
--- a/build/Module.mk
+++ b/build/Module.mk
@@ -1,4 +1,4 @@
-# Module.mk for rootx module
+# Module.mk for build module
 # Copyright (c) 2000 Rene Brun and Fons Rademakers
 #
 # Author: Fons Rademakers, 29/2/2000
diff --git a/clib/Module.mk b/clib/Module.mk
index bcdccbbe0b521d847fbcbb75e5f321ddf1df4aa0..e409d12de8d41b55a093c9548de82921adc5bdf3 100644
--- a/clib/Module.mk
+++ b/clib/Module.mk
@@ -21,7 +21,7 @@ CLIBH        := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 CLIBS        := $(wildcard $(MODDIRS)/*.c)
 CLIBO        := $(CLIBS:.c=.o)
 
-CLIBDEP      := $(CLIBO:.o=.d)
+CLIBDEP      := $(CLIBO:.o=.d) $(CLIBDO:.o=.d)
 
 # used in the main Makefile
 ALLHDRS     += $(patsubst $(MODDIRI)/%.h,include/%.h,$(CLIBH))
diff --git a/cont/Module.mk b/cont/Module.mk
index 95a5bcf1312fa9a25cbdf36b025ac0f72ed94cc2..481ec1872a27c9fdec7782ad7ce9762a15fb1a94 100644
--- a/cont/Module.mk
+++ b/cont/Module.mk
@@ -21,7 +21,7 @@ CONTH        := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 CONTS        := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 CONTO        := $(CONTS:.cxx=.o)
 
-CONTDEP      := $(CONTO:.o=.d)
+CONTDEP      := $(CONTO:.o=.d) $(CONTDO:.o=.d)
 
 # used in the main Makefile
 ALLHDRS     += $(patsubst $(MODDIRI)/%.h,include/%.h,$(CONTH))
diff --git a/eg/Module.mk b/eg/Module.mk
index 740c129b14477eafd49330e623136dd5d917a553..b591496199c2337666bcf6987ad96c3220662261 100644
--- a/eg/Module.mk
+++ b/eg/Module.mk
@@ -22,7 +22,7 @@ EGH          := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 EGS          := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 EGO          := $(EGS:.cxx=.o)
 
-EGDEP        := $(EGO:.o=.d)
+EGDEP        := $(EGO:.o=.d) $(EGDO:.o=.d)
 
 EGLIB        := $(LPATH)/libEG.$(SOEXT)
 
diff --git a/g3d/Module.mk b/g3d/Module.mk
index df7d452d73d08ed7e679c7d50410e9e608229430..afd381bea3c12a16ee534ef02698da601d2b7aeb 100644
--- a/g3d/Module.mk
+++ b/g3d/Module.mk
@@ -25,7 +25,7 @@ G3DS1        := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 G3DS2        := $(wildcard $(MODDIRS)/*.c)
 G3DO         := $(G3DS1:.cxx=.o) $(G3DS2:.c=.o)
 
-G3DDEP       := $(G3DO:.o=.d)
+G3DDEP       := $(G3DO:.o=.d) $(G3DDO:.o=.d)
 
 G3DLIB       := $(LPATH)/libGraf3d.$(SOEXT)
 
diff --git a/gpad/Module.mk b/gpad/Module.mk
index a2ac064b010a997343c929df8962e35a9f1487b5..e009904fc19a5b02a1d45298b65604ce62d46f51 100644
--- a/gpad/Module.mk
+++ b/gpad/Module.mk
@@ -21,7 +21,7 @@ GPADH        := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 GPADS        := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 GPADO        := $(GPADS:.cxx=.o)
 
-GPADDEP      := $(GPADO:.o=.d)
+GPADDEP      := $(GPADO:.o=.d) $(GPADDO:.o=.d)
 
 GPADLIB      := $(LPATH)/libGpad.$(SOEXT)
 
diff --git a/graf/Module.mk b/graf/Module.mk
index 060a3384c67a35430fd3884192bc3907a0316889..d6e0027d91bca76000e820cef3ef80e2695c8e9d 100644
--- a/graf/Module.mk
+++ b/graf/Module.mk
@@ -26,7 +26,7 @@ GRAFH        := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 GRAFS        := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 GRAFO        := $(GRAFS:.cxx=.o)
 
-GRAFDEP      := $(GRAFO:.o=.d)
+GRAFDEP      := $(GRAFO:.o=.d) $(GRAFDO:.o=.d)
 
 GRAFLIB      := $(LPATH)/libGraf.$(SOEXT)
 
diff --git a/gui/Module.mk b/gui/Module.mk
index c5907493e4541230a5af622d761f264de6af090c..e75cd300972cdc3a70ee3cec136175647ca7b083 100644
--- a/gui/Module.mk
+++ b/gui/Module.mk
@@ -46,7 +46,7 @@ GUIH         := $(GUIH1) $(GUIH2) $(GUIH3) $(GUIH4)
 GUIS         := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 GUIO         := $(GUIS:.cxx=.o)
 
-GUIDEP       := $(GUIO:.o=.d)
+GUIDEP       := $(GUIO:.o=.d) $(GUIDO:.o=.d)
 
 GUILIB       := $(LPATH)/libGui.$(SOEXT)
 
diff --git a/hist/Module.mk b/hist/Module.mk
index bb011a805c2e7d621320f02642ffcd68a6fa5a29..3efeebc0f29ffa56bcd869a15ffd588d7406530f 100644
--- a/hist/Module.mk
+++ b/hist/Module.mk
@@ -21,7 +21,7 @@ HISTH        := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 HISTS        := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 HISTO        := $(HISTS:.cxx=.o)
 
-HISTDEP      := $(HISTO:.o=.d)
+HISTDEP      := $(HISTO:.o=.d) $(HISTDO:.o=.d)
 
 HISTLIB      := $(LPATH)/libHist.$(SOEXT)
 
diff --git a/histpainter/Module.mk b/histpainter/Module.mk
index c56f6209bce3776fec607251650464970fbcfcb1..eb30c78f69a020b06f9a5d6296ef70934b47565a 100644
--- a/histpainter/Module.mk
+++ b/histpainter/Module.mk
@@ -22,7 +22,7 @@ HISTPAINTERH  := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 HISTPAINTERS  := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 HISTPAINTERO  := $(HISTPAINTERS:.cxx=.o)
 
-HISTPAINTERDEP := $(HISTPAINTERO:.o=.d)
+HISTPAINTERDEP := $(HISTPAINTERO:.o=.d) $(HISTPAINTERDO:.o=.d)
 
 HISTPAINTERLIB := $(LPATH)/libHistPainter.$(SOEXT)
 
diff --git a/html/Module.mk b/html/Module.mk
index 0169214d2d99ea7cc213b4083ea3cf9548456da6..b84ccb577c367f0cf5719d07c831a91ac0f34567 100644
--- a/html/Module.mk
+++ b/html/Module.mk
@@ -21,7 +21,7 @@ HTMLH        := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 HTMLS        := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 HTMLO        := $(HTMLS:.cxx=.o)
 
-HTMLDEP      := $(HTMLO:.o=.d)
+HTMLDEP      := $(HTMLO:.o=.d) $(HTMLDO:.o=.d)
 
 HTMLLIB      := $(LPATH)/libHtml.$(SOEXT)
 
diff --git a/matrix/Module.mk b/matrix/Module.mk
index eca698ee68a7478606eae6a42c41769dd1f4707b..04243cb0e486119025caf770b1a22dae1e825eac 100644
--- a/matrix/Module.mk
+++ b/matrix/Module.mk
@@ -21,7 +21,7 @@ MATRIXH      := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 MATRIXS      := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 MATRIXO      := $(MATRIXS:.cxx=.o)
 
-MATRIXDEP    := $(MATRIXO:.o=.d)
+MATRIXDEP    := $(MATRIXO:.o=.d) $(MATRIXDO:.o=.d)
 
 MATRIXLIB    := $(LPATH)/libMatrix.$(SOEXT)
 
diff --git a/meta/Module.mk b/meta/Module.mk
index 76d7da5586545861589623e689ec8c43f23398aa..4c6e9af970b01278f105bd797d8750173aa5497b 100644
--- a/meta/Module.mk
+++ b/meta/Module.mk
@@ -21,7 +21,7 @@ METAH        := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 METAS        := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 METAO        := $(METAS:.cxx=.o)
 
-METADEP      := $(METAO:.o=.d)
+METADEP      := $(METAO:.o=.d) $(METADO:.o=.d)
 
 # used in the main Makefile
 ALLHDRS     += $(patsubst $(MODDIRI)/%.h,include/%.h,$(METAH))
diff --git a/minuit/Module.mk b/minuit/Module.mk
index 328ff6832606d415951fcae5e0d7796697ff1f38..82c9aab5d35c115619f6ae2573fb9876f7c6dc22 100644
--- a/minuit/Module.mk
+++ b/minuit/Module.mk
@@ -21,7 +21,7 @@ MINUITH      := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 MINUITS      := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 MINUITO      := $(MINUITS:.cxx=.o)
 
-MINUITDEP    := $(MINUITO:.o=.d)
+MINUITDEP    := $(MINUITO:.o=.d) $(MINUITDO:.o=.d)
 
 MINUITLIB    := $(LPATH)/libMinuit.$(SOEXT)
 
diff --git a/mysql/Module.mk b/mysql/Module.mk
index f6e53ada563222a667d2f68ea199b93fbb694bec..32eeedb7d08e2758928ff6d1dff4a16a313ec2e9 100644
--- a/mysql/Module.mk
+++ b/mysql/Module.mk
@@ -21,7 +21,7 @@ MYSQLH       := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 MYSQLS       := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 MYSQLO       := $(MYSQLS:.cxx=.o)
 
-MYSQLDEP     := $(MYSQLO:.o=.d)
+MYSQLDEP     := $(MYSQLO:.o=.d) $(MYSQLDO:.o=.d)
 
 MYSQLLIB     := $(LPATH)/libMySQL.$(SOEXT)
 
diff --git a/net/Module.mk b/net/Module.mk
index 2e63ef1d0591616a3161052037bc0b83701f493a..cf4bcd76fc8b30179df885d842f24809a0afa63f 100644
--- a/net/Module.mk
+++ b/net/Module.mk
@@ -21,7 +21,7 @@ NETH         := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 NETS         := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 NETO         := $(NETS:.cxx=.o)
 
-NETDEP       := $(NETO:.o=.d)
+NETDEP       := $(NETO:.o=.d) $(NETDO:.o=.d)
 
 # used in the main Makefile
 ALLHDRS     += $(patsubst $(MODDIRI)/%.h,include/%.h,$(NETH))
diff --git a/physics/Module.mk b/physics/Module.mk
index 7551d298a205fef31d42393407434bedb00bcfad..6d6a19b79c5373f518f35ae46ec709c0447dbf04 100644
--- a/physics/Module.mk
+++ b/physics/Module.mk
@@ -21,7 +21,7 @@ PHYSICSH     := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 PHYSICSS     := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 PHYSICSO     := $(PHYSICSS:.cxx=.o)
 
-PHYSICSDEP   := $(PHYSICSO:.o=.d)
+PHYSICSDEP   := $(PHYSICSO:.o=.d) $(PHYSICSDO:.o=.d)
 
 PHYSICSLIB   := $(LPATH)/libPhysics.$(SOEXT)
 
diff --git a/postscript/Module.mk b/postscript/Module.mk
index d31f3a655cb453f6f1432307e1fca76c2515cc21..b354612df6443e55961a37d3b7ccfb996e48480f 100644
--- a/postscript/Module.mk
+++ b/postscript/Module.mk
@@ -21,7 +21,7 @@ POSTSCRIPTH  := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 POSTSCRIPTS  := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 POSTSCRIPTO  := $(POSTSCRIPTS:.cxx=.o)
 
-POSTSCRIPTDEP := $(POSTSCRIPTO:.o=.d)
+POSTSCRIPTDEP := $(POSTSCRIPTO:.o=.d) $(POSTSCRIPTDO:.o=.d)
 
 POSTSCRIPTLIB := $(LPATH)/libPostscript.$(SOEXT)
 
diff --git a/proof/Module.mk b/proof/Module.mk
index 4ac8daa3df6ea6ba82c7fd093a85d96f75db7c21..781b96aaa8d2f908e8b86688b8c9b1fcbc17758c 100644
--- a/proof/Module.mk
+++ b/proof/Module.mk
@@ -21,7 +21,7 @@ PROOFH       := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 PROOFS       := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 PROOFO       := $(PROOFS:.cxx=.o)
 
-PROOFDEP     := $(PROOFO:.o=.d)
+PROOFDEP     := $(PROOFO:.o=.d) $(PROOFDO:.o=.d)
 
 PROOFLIB     := $(LPATH)/libProof.$(SOEXT)
 
diff --git a/pythia/Module.mk b/pythia/Module.mk
index 726da8b4ff05745c26852c39f4e86731ba3b8389..bd623a1799c11dd6c0f8a594948bd853390bcbea 100644
--- a/pythia/Module.mk
+++ b/pythia/Module.mk
@@ -22,7 +22,7 @@ PYTHIAH      := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 PYTHIAS      := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 PYTHIAO      := $(PYTHIAS:.cxx=.o)
 
-PYTHIADEP    := $(PYTHIAO:.o=.d)
+PYTHIADEP    := $(PYTHIAO:.o=.d) $(PYTHIADO:.o=.d)
 
 PYTHIALIB    := $(LPATH)/libEGPythia.$(SOEXT)
 
diff --git a/pythia6/Module.mk b/pythia6/Module.mk
index 36614c69ea3f5365c453cc2d27c0346c27bf1014..aba5a8b131f2060019ee4e537eb77c9c8cb71588 100644
--- a/pythia6/Module.mk
+++ b/pythia6/Module.mk
@@ -21,7 +21,7 @@ PYTHIA6H     := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 PYTHIA6S     := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 PYTHIA6O     := $(PYTHIA6S:.cxx=.o)
 
-PYTHIA6DEP   := $(PYTHIA6O:.o=.d)
+PYTHIA6DEP   := $(PYTHIA6O:.o=.d) $(PYTHIA6DO:.o=.d)
 
 PYTHIA6LIB   := $(LPATH)/libEGPythia6.$(SOEXT)
 
diff --git a/rfio/Module.mk b/rfio/Module.mk
index 4df4102c23807b4063c6a1b6edf950aec9b70565..b1d89e7b86942a515fa8324a6d995a05f2fa9ca2 100644
--- a/rfio/Module.mk
+++ b/rfio/Module.mk
@@ -21,7 +21,7 @@ RFIOH        := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 RFIOS        := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 RFIOO        := $(RFIOS:.cxx=.o)
 
-RFIODEP      := $(RFIOO:.o=.d)
+RFIODEP      := $(RFIOO:.o=.d) $(RFIODO:.o=.d)
 
 RFIOLIB      := $(LPATH)/libRFIO.$(SOEXT)
 
diff --git a/rint/Module.mk b/rint/Module.mk
index b0470a9219322550a9def2e6398e0d378c3fb028..a1052b1b111a166332088ea0e59b59b3d1c22f1b 100644
--- a/rint/Module.mk
+++ b/rint/Module.mk
@@ -21,7 +21,7 @@ RINTH        := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 RINTS        := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 RINTO        := $(RINTS:.cxx=.o)
 
-RINTDEP      := $(RINTO:.o=.d)
+RINTDEP      := $(RINTO:.o=.d) $(RINTDO:.o=.d)
 
 RINTLIB      := $(LPATH)/libRint.$(SOEXT)
 
diff --git a/star/Module.mk b/star/Module.mk
index 84dea466b752bed948706718595917cce07e1f83..bbb101ac0970a6acaa8adc5f72f43eb612e9de0e 100644
--- a/star/Module.mk
+++ b/star/Module.mk
@@ -21,7 +21,7 @@ STARH        := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 STARS        := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 STARO        := $(STARS:.cxx=.o)
 
-STARDEP      := $(STARO:.o=.d)
+STARDEP      := $(STARO:.o=.d) $(STARDO:.o=.d)
 
 STARLIB      := $(LPATH)/libStar.$(SOEXT)
 
diff --git a/thread/Module.mk b/thread/Module.mk
index fd412631df58d11b3caa96a01b7fe7b58e4c900b..7cde4c1d26cdd13abdce1d5f0bcc264a085c8183 100644
--- a/thread/Module.mk
+++ b/thread/Module.mk
@@ -21,7 +21,7 @@ THREADH      := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 THREADS      := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 THREADO      := $(THREADS:.cxx=.o)
 
-THREADDEP    := $(THREADO:.o=.d)
+THREADDEP    := $(THREADO:.o=.d) $(THREADDO:.o=.d)
 
 THREADLIB    := $(LPATH)/libThread.$(SOEXT)
 
diff --git a/tree/Module.mk b/tree/Module.mk
index c449c27a2aaeab48c7545e7e1afc240e7132cba3..11aeeca4f681945e3208a1b8e5b8276c60e69ef5 100644
--- a/tree/Module.mk
+++ b/tree/Module.mk
@@ -21,7 +21,7 @@ TREEH        := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 TREES        := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 TREEO        := $(TREES:.cxx=.o)
 
-TREEDEP      := $(TREEO:.o=.d)
+TREEDEP      := $(TREEO:.o=.d) $(TREEDO:.o=.d)
 
 TREELIB      := $(LPATH)/libTree.$(SOEXT)
 
diff --git a/treeplayer/Module.mk b/treeplayer/Module.mk
index 4001af45f3fc3961d6798802792f1bc6ff564f86..e4ce190cab70ea65c1e484600a111effdd034f4c 100644
--- a/treeplayer/Module.mk
+++ b/treeplayer/Module.mk
@@ -21,7 +21,7 @@ TREEPLAYERH  := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 TREEPLAYERS  := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 TREEPLAYERO  := $(TREEPLAYERS:.cxx=.o)
 
-TREEPLAYERDEP := $(TREEPLAYERO:.o=.d)
+TREEPLAYERDEP := $(TREEPLAYERO:.o=.d) $(TREEPLAYERDO:.o=.d)
 
 TREEPLAYERLIB := $(LPATH)/libTreePlayer.$(SOEXT)
 
diff --git a/treeviewer/Module.mk b/treeviewer/Module.mk
index 01a4321a57d00c9bf9a1842c939d11fbc2448ac8..51d68bedc81ee62f9f29c76fa087048fd2ab7377 100644
--- a/treeviewer/Module.mk
+++ b/treeviewer/Module.mk
@@ -21,7 +21,7 @@ TREEVIEWERH  := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 TREEVIEWERS  := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 TREEVIEWERO  := $(TREEVIEWERS:.cxx=.o)
 
-TREEVIEWERDEP := $(TREEVIEWERO:.o=.d)
+TREEVIEWERDEP := $(TREEVIEWERO:.o=.d) $(TREEVIEWERDO:.o=.d)
 
 TREEVIEWERLIB := $(LPATH)/libTreeViewer.$(SOEXT)
 
diff --git a/unix/Module.mk b/unix/Module.mk
index 164e113a4c05bab65ce6782fa06a429e68ae5b9f..7d987eb9f58b84023a8794bb6e07e35cf12cf120 100644
--- a/unix/Module.mk
+++ b/unix/Module.mk
@@ -21,7 +21,7 @@ UNIXH        := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 UNIXS        := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 UNIXO        := $(UNIXS:.cxx=.o)
 
-UNIXDEP      := $(UNIXO:.o=.d)
+UNIXDEP      := $(UNIXO:.o=.d) $(UNIXDO:.o=.d)
 
 # used in the main Makefile
 ALLHDRS     += $(patsubst $(MODDIRI)/%.h,include/%.h,$(UNIXH))
diff --git a/venus/Module.mk b/venus/Module.mk
index 70e4c896428b5039a043d1251b28b174c9a51fc4..593d6bc4f01c4f1b343935403e0063dc0b473a1f 100644
--- a/venus/Module.mk
+++ b/venus/Module.mk
@@ -22,7 +22,7 @@ VENUSH       := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 VENUSS       := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 VENUSO       := $(VENUSS:.cxx=.o)
 
-VENUSDEP     := $(VENUSO:.o=.d)
+VENUSDEP     := $(VENUSO:.o=.d) $(VENUSDO:.o=.d)
 
 VENUSLIB     := $(LPATH)/libEGVenus.$(SOEXT)
 
diff --git a/win32/Module.mk b/win32/Module.mk
index f89939f2efeba5b6a48712a1e6727105124d28d2..8c2997eda871a3f4838a960a4aa1c6db7c0fe85d 100644
--- a/win32/Module.mk
+++ b/win32/Module.mk
@@ -22,7 +22,7 @@ WIN32H       := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 WIN32S       := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 WIN32O       := $(WIN32S:.cxx=.o)
 
-WIN32DEP     := $(WIN32O:.o=.d)
+WIN32DEP     := $(WIN32O:.o=.d) $(WIN32DO:.o=.d)
 
 WIN32LIB     := $(LPATH)/libWin32.$(SOEXT)
 
diff --git a/winnt/Module.mk b/winnt/Module.mk
index 9546a2dc206d72217fcc878062c5bdfd189649b7..2d2a3008bd7511b3bbe0d6cd1b3412ba975bf2a8 100644
--- a/winnt/Module.mk
+++ b/winnt/Module.mk
@@ -22,7 +22,7 @@ WINNTH       := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 WINNTS       := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 WINNTO       := $(WINNTS:.cxx=.o)
 
-WINNTDEP     := $(WINNTO:.o=.d)
+WINNTDEP     := $(WINNTO:.o=.d) $(WINNTDO:.o=.d)
 
 # used in the main Makefile
 ALLHDRS     += $(patsubst $(MODDIRI)/%.h,include/%.h,$(WINNTH))
diff --git a/x11/Module.mk b/x11/Module.mk
index 5a2b164b131257921143ec8d9a589167ad39bd30..5b099c872b38194975872541c61f6183e3433651 100644
--- a/x11/Module.mk
+++ b/x11/Module.mk
@@ -23,7 +23,7 @@ X11S1        := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 X11S2        := $(wildcard $(MODDIRS)/*.c)
 X11O         := $(X11S1:.cxx=.o) $(X11S2:.c=.o)
 
-X11DEP       := $(X11O:.o=.d)
+X11DEP       := $(X11O:.o=.d) $(X11DO:.o=.d)
 
 X11LIB       := $(LPATH)/libGX11.$(SOEXT)
 
diff --git a/x11ttf/Module.mk b/x11ttf/Module.mk
index 2aa06212226d9a639f30b019256cb89d409de65e..8d83914d5d9920994b209f4dedf1aba1dde706d0 100644
--- a/x11ttf/Module.mk
+++ b/x11ttf/Module.mk
@@ -21,7 +21,7 @@ X11TTFH      := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
 X11TTFS      := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 X11TTFO      := $(X11TTFS:.cxx=.o)
 
-X11TTFDEP    := $(X11TTFO:.o=.d)
+X11TTFDEP    := $(X11TTFO:.o=.d) $(X11TTFDO:.o=.d)
 
 X11TTFLIB    := $(LPATH)/libGX11TTF.$(SOEXT)
 
diff --git a/x3d/Module.mk b/x3d/Module.mk
index dff8059c2bea02a8ab34d514e9ac4c3806384795..41764a97b5bcf6dc1590bad7a1cbbc153f934ba2 100644
--- a/x3d/Module.mk
+++ b/x3d/Module.mk
@@ -24,7 +24,7 @@ X3DS1        := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
 X3DS2        := $(wildcard $(MODDIRS)/*.c)
 X3DO         := $(X3DS1:.cxx=.o) $(X3DS2:.c=.o)
 
-X3DDEP       := $(X3DO:.o=.d)
+X3DDEP       := $(X3DO:.o=.d) $(X3DDO:.o=.d)
 
 X3DLIB       := $(LPATH)/libX3d.$(SOEXT)