diff --git a/src/Controls/Makefile.am b/src/Controls/Makefile.am
index 0dd516e94..90707cadb 100644
--- a/src/Controls/Makefile.am
+++ b/src/Controls/Makefile.am
@@ -53,7 +53,7 @@ libSMESHControls_la_CPPFLAGS = \
 libSMESHControls_la_LDFLAGS = \
 	../SMDS/libSMDS.la \
 	../SMESHDS/libSMESHDS.la \
-	$(CAS_LDPATH) -lTKernel -lTKBRep -lTKG3d
+	$(CAS_LDPATH) -lTKernel -lTKBRep -lTKG3d -lTKTopAlgo -lTKGeomBase -lTKGeomAlgo
 
 SMESHControls_CPPFLAGS = \
 	$(libSMESHControls_la_CPPFLAGS)
diff --git a/src/Driver/Makefile.am b/src/Driver/Makefile.am
index 0534f2a57..70b7a2bc0 100644
--- a/src/Driver/Makefile.am
+++ b/src/Driver/Makefile.am
@@ -53,4 +53,4 @@ libMeshDriver_la_CPPFLAGS = \
 libMeshDriver_la_LDFLAGS  = \
 	../SMESHDS/libSMESHDS.la \
 	$(KERNEL_LDFLAGS) -lOpUtil \
-	$(CAS_LDPATH) -TKernel -lTKTopAlgo
+	$(CAS_LDPATH) -lTKernel -lTKTopAlgo
diff --git a/src/MEFISTO2/Makefile.am b/src/MEFISTO2/Makefile.am
index 1f0e49696..b4e94a840 100644
--- a/src/MEFISTO2/Makefile.am
+++ b/src/MEFISTO2/Makefile.am
@@ -43,6 +43,7 @@ libMEFISTO2D_la_CPPFLAGS = \
 	@PLATFORM_INCLUDES@
 
 libMEFISTO2D_la_LDFLAGS = \
+	$(CAS_LDFLAGS) -lTKernel -lTKMath \
 	$(KERNEL_LDFLAGS) -lSALOMELocalTrace \
 	$(FCLIBS)
 
diff --git a/src/OBJECT/Makefile.am b/src/OBJECT/Makefile.am
index 3bc3907c9..bd233661a 100644
--- a/src/OBJECT/Makefile.am
+++ b/src/OBJECT/Makefile.am
@@ -57,6 +57,7 @@ libSMESHObject_la_CPPFLAGS = \
 	$(CAS_CPPFLAGS) \
         $(VTK_INCLUDES) \
 	$(CORBA_INCLUDES) \
+	$(CORBA_CXXFLAGS) \
         $(BOOST_CPPFLAGS) \
         $(QT_INCLUDES) \
 	-I$(srcdir)/../Controls \
@@ -73,6 +74,6 @@ libSMESHObject_la_LDFLAGS  = \
         ../SMESHClient/libSMESHClient.la \
         ../SMDS/libSMDS.la \
         ../Controls/libSMESHControls.la \
-        $(GUI_LDFLAGS) -lSalomeApp lSalomeObject \
+        $(GUI_LDFLAGS) -lSalomeApp -lSalomeObject -lSVTK -lVTKViewer -lqtx -lsuit \
 	$(CAS_KERNEL) \
-        $(VTK_LIBS)
+        $(VTK_LIBS) $(QT_MT_LIBS)
diff --git a/src/SMESH/Makefile.am b/src/SMESH/Makefile.am
index 2905cc92b..ce65291a3 100644
--- a/src/SMESH/Makefile.am
+++ b/src/SMESH/Makefile.am
@@ -106,4 +106,4 @@ libSMESHimpl_la_LDFLAGS = \
 	../DriverMED/libMeshDriverMED.la \
 	../DriverUNV/libMeshDriverUNV.la \
 	$(GEOM_LDFLAGS) -lNMTTools \
-	$(CAS_LDPATH) -lTKShHealing
+	$(CAS_LDPATH) -lTKShHealing -lTKPrim -lTKG2d
diff --git a/src/SMESHClient/Makefile.am b/src/SMESHClient/Makefile.am
index ebb0d97f7..e44db75f2 100644
--- a/src/SMESHClient/Makefile.am
+++ b/src/SMESHClient/Makefile.am
@@ -68,7 +68,7 @@ libSMESHClient_la_LDFLAGS  = \
 	../SMESH/libSMESHimpl.la \
 	../SMESHDS/libSMESHDS.la \
 	../Controls/libSMESHControls.la \
-	$(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA \
+	$(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lOpUtil -lSALOMEBasics \
 	$(GEOM_LDFLAGS) -lNMTDS \
 	$(MED_LDFLAGS) -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 \
 	$(CAS_KERNEL)
diff --git a/src/SMESHFiltersSelection/Makefile.am b/src/SMESHFiltersSelection/Makefile.am
index 183083cc7..a0d49e885 100644
--- a/src/SMESHFiltersSelection/Makefile.am
+++ b/src/SMESHFiltersSelection/Makefile.am
@@ -63,6 +63,7 @@ libSMESHFiltersSelection_la_CPPFLAGS = \
 libSMESHFiltersSelection_la_LDFLAGS  = \
 	../../idl/libSalomeIDLSMESH.la \
 	$(KERNEL_LDFLAGS) -lSalomeDSClient -lSalomeDS \
-	$(GUI_LDFLAGS) -lSalomeApp -lsuit \
-	$(GEOM_LDFLAGS) -lGEOM \
-	$(CAS_LDPATH) -lTKernel
+	$(GUI_LDFLAGS) -lSalomeApp -lsuit -lLightApp \
+	$(GEOM_LDFLAGS) -lGEOM -lGEOMClient \
+	$(CAS_LDPATH) -lTKernel -lTKMath -lTKBRep \
+	$(QT_MT_LIBS)
diff --git a/src/SMESHGUI/Makefile.am b/src/SMESHGUI/Makefile.am
index db288673a..bd8db3b6b 100644
--- a/src/SMESHGUI/Makefile.am
+++ b/src/SMESHGUI/Makefile.am
@@ -246,8 +246,9 @@ libSMESH_la_LDFLAGS  = \
 	../SMDS/libSMDS.la \
 	../Controls/libSMESHControls.la \
 	../OBJECT/libSMESHObject.la \
-	$(GEOM_LDFLAGS) \
-	-lGEOMBase
+	$(CAS_LDFLAGS) -lTKV3d \
+	$(GUI_LDFLAGS) -lSalomePrs -lsuit -lSUITApp -lCAM -lstd \
+	$(GEOM_LDFLAGS) -lGEOMBase -lGEOMFiltersSelection -lGEOMObject
 
 # resources files
 nodist_salomeres_DATA= \
diff --git a/src/SMESH_SWIG_WITHIHM/Makefile.am b/src/SMESH_SWIG_WITHIHM/Makefile.am
index 69ae00da9..e540dd1ab 100644
--- a/src/SMESH_SWIG_WITHIHM/Makefile.am
+++ b/src/SMESH_SWIG_WITHIHM/Makefile.am
@@ -71,6 +71,7 @@ _libSMESH_Swig_la_CPPFLAGS =	\
 	$(CORBA_CXXFLAGS)	\
 	$(CORBA_INCLUDES)	\
 	$(BOOST_CPPFLAGS)	\
+	-I$(srcdir)             \
 	-I$(srcdir)/../SMESHGUI	\
 	-I$(top_builddir)/idl	\
 	-I$(top_builddir)/salome_adm/unix