--- src5.1.3/YACS_SRC_5.1.3/src/runtime_swig/Makefile.am.orig	2010-02-26 21:02:44.829641058 -0300
+++ src5.1.3/YACS_SRC_5.1.3/src/runtime_swig/Makefile.am	2010-02-26 21:02:57.543640429 -0300
@@ -45,15 +45,15 @@
 SALOMERuntime.py : SALOMERuntimeWRAP.cxx
 
 _SALOMERuntime_la_CXXFLAGS = \
+	-I$(srcdir)/../bases \
+	-I$(srcdir)/../engine \
+	-I$(srcdir)/../runtime \
+	-I../../idl \
 	$(THREAD_DEF) \
 	$(PYTHON_CPPFLAGS) \
 	$(OMNIORB_INCLUDES) \
 	$(OMNIORB_CXXFLAGS) \
 	-I$(KERNEL_ROOT_DIR)/include/salome \
-	-I$(srcdir)/../bases \
-	-I$(srcdir)/../engine \
-	-I$(srcdir)/../runtime \
-	-I../../idl \
 	$(LIBXML_INCLUDES)
 
 _SALOMERuntime_la_LDFLAGS  = -module
--- src5.1.3/YACS_SRC_5.1.3/src/yacsloader_swig/Makefile.am.orig	2010-03-10 20:18:44.079096817 -0300
+++ src5.1.3/YACS_SRC_5.1.3/src/yacsloader_swig/Makefile.am	2010-03-10 20:20:31.078098830 -0300
@@ -47,14 +47,14 @@
 	loaderWRAP.cxx
 
 _loader_la_CXXFLAGS = \
+	-I$(srcdir)/../bases \
+	-I$(srcdir)/../engine \
+	-I$(srcdir)/../yacsloader \
 	$(THREAD_DEF) \
 	$(PYTHON_CPPFLAGS) \
 	$(OMNIORB_INCLUDES) \
 	$(OMNIORB_CXXFLAGS) \
-        $(EXPAT_INCLUDES) \
-	-I$(srcdir)/../bases \
-	-I$(srcdir)/../engine \
-	-I$(srcdir)/../yacsloader
+        $(EXPAT_INCLUDES)
 
 _loader_la_LDFLAGS  = -module 
 
--- src5.1.3/YACS_SRC_5.1.3/src/hmi/Makefile.am.orig	2010-02-26 21:37:41.168643832 -0300
+++ src5.1.3/YACS_SRC_5.1.3/src/hmi/Makefile.am	2010-02-26 21:37:54.628852365 -0300
@@ -41,17 +41,17 @@
 	$(EXPAT_LIBS) $(LIBXML_LIBS)
 
 libHMI_la_CXXFLAGS = \
-	$(THREAD_DEF) \
-	$(PYTHON_CPPFLAGS) \
-	$(OMNIORB_CXXFLAGS) $(OMNIORB_INCLUDES) \
-	$(LIBXML_INCLUDES) \
-	-I$(KERNEL_ROOT_DIR)/include/salome \
 	-I$(srcdir)/../bases \
 	-I$(srcdir)/../engine \
 	-I$(srcdir)/../runtime \
 	-I$(srcdir)/../yacsloader \
 	-I../../idl \
-	-I../yacsorb 
+	-I../yacsorb \
+	$(THREAD_DEF) \
+	$(PYTHON_CPPFLAGS) \
+	$(OMNIORB_CXXFLAGS) $(OMNIORB_INCLUDES) \
+	$(LIBXML_INCLUDES) \
+	-I$(KERNEL_ROOT_DIR)/include/salome
 
 EXTRA_DIST = \
 HMIExport.hxx \
--- src5.1.3/YACS_SRC_5.1.3/src/genericgui/Makefile.am.orig	2010-03-01 17:02:55.539483901 -0300
+++ src5.1.3/YACS_SRC_5.1.3/src/genericgui/Makefile.am	2010-03-01 17:03:48.563481478 -0300
@@ -306,7 +306,6 @@
 	$(OMNIORB_INCLUDES) \
 	$(LIBXML_INCLUDES) \
 	$(EXPAT_INCLUDES) \
-	-I$(KERNEL_ROOT_DIR)/include/salome \
 	-I$(builddir) \
 	-I$(srcdir) \
 	-I$(srcdir)/../bases \
@@ -315,7 +314,8 @@
 	-I$(srcdir)/../yacsloader \
 	-I$(srcdir)/../hmi \
 	-I../../idl \
-	-I../yacsorb 
+	-I../yacsorb \
+	-I$(KERNEL_ROOT_DIR)/include/salome
 
 libGenericGui_la_LDFLAGS   = $(qt4_ldflags) $(qsci4_ldflags) $(GRAPHVIZ_LDFLAGS)
 
--- src5.1.3/YACS_SRC_5.1.3/src/yacsloader/Makefile.am.orig	2010-04-28 22:21:47.000000000 +0000
+++ src5.1.3/YACS_SRC_5.1.3/src/yacsloader/Makefile.am	2010-04-28 22:24:31.000000000 +0000
@@ -48,14 +48,14 @@
 libYACSloader_la_LDFLAGS = $(OMNIORB_LIBS) $(EXPAT_LIBS)
 
 AM_CXXFLAGS = \
+              -I$(srcdir) \
+              -I$(srcdir)/../bases \
+              -I$(srcdir)/../engine \
 							$(THREAD_DEF) \
               $(PYTHON_CPPFLAGS) \
               $(OMNIORB_INCLUDES) \
               $(OMNIORB_CXXFLAGS) \
-							$(EXPAT_INCLUDES) \
-              -I$(srcdir) \
-              -I$(srcdir)/../bases \
-              -I$(srcdir)/../engine
+							$(EXPAT_INCLUDES)
 
 if SALOME_KERNEL
 SALOME_LIBS=$(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeHDFPersist \
@@ -68,14 +68,14 @@
 driver_SOURCES = driver.cxx 
 
 driver_CXXFLAGS = -g -DYACS_PTHREAD \
+              -I$(srcdir)/../bases \
+              -I$(srcdir)/../engine \
+              -I$(srcdir)/../runtime \
               $(PYTHON_CPPFLAGS) \
 							$(SALOME_INCL_PATH) \
               $(OMNIORB_INCLUDES) \
               $(OMNIORB_CXXFLAGS) \
-              $(EXPAT_INCLUDES) \
-              -I$(srcdir)/../bases \
-              -I$(srcdir)/../engine \
-              -I$(srcdir)/../runtime
+              $(EXPAT_INCLUDES)
 
 driver_LDADD = libYACSloader.la \
                ../runtime/libYACSRuntimeSALOME.la \
@@ -91,13 +91,13 @@
 resume_SOURCES = resume.cxx
 
 resume_CXXFLAGS = -g -DYACS_PTHREAD \
+              -I$(srcdir)/../bases \
+              -I$(srcdir)/../engine \
+              -I$(srcdir)/../runtime \
               $(PYTHON_CPPFLAGS) \
               $(OMNIORB_INCLUDES) \
               $(OMNIORB_CXXFLAGS) \
-              $(EXPAT_INCLUDES) \
-              -I$(srcdir)/../bases \
-              -I$(srcdir)/../engine \
-              -I$(srcdir)/../runtime
+              $(EXPAT_INCLUDES)
 
 resume_LDADD = libYACSloader.la \
                ../runtime/libYACSRuntimeSALOME.la \
@@ -113,13 +113,13 @@
 debugger_SOURCES = debugger.cxx 
 
 debugger_CXXFLAGS = -g -DYACS_PTHREAD \
+              -I$(srcdir)/../bases \
+              -I$(srcdir)/../engine \
+              -I$(srcdir)/../runtime \
               $(PYTHON_CPPFLAGS) \
               $(OMNIORB_INCLUDES) \
               $(OMNIORB_CXXFLAGS) \
-              $(EXPAT_INCLUDES) \
-              -I$(srcdir)/../bases \
-              -I$(srcdir)/../engine \
-              -I$(srcdir)/../runtime
+              $(EXPAT_INCLUDES)
 
 debugger_LDADD = libYACSloader.la \
                ../runtime/libYACSRuntimeSALOME.la \
--- src5.1.3/YACS_SRC_5.1.3/src/salomewrap/Makefile.am.orig	2010-04-28 22:29:08.000000000 +0000
+++ src5.1.3/YACS_SRC_5.1.3/src/salomewrap/Makefile.am	2010-04-28 23:03:52.000000000 +0000
@@ -38,19 +38,19 @@
 nodist_libSalomeWrap_la_SOURCES = $(MOC_FILES)
 
 libSalomeWrap_la_CXXFLAGS = \
+	-I$(srcdir)/../bases \
+	-I$(srcdir)/../engine \
+	-I$(srcdir)/../runtime \
+	-I$(srcdir)/../yacsloader \
 	$(THREAD_DEF) \
 	$(PYTHON_CPPFLAGS) \
 	$(OMNIORB_CXXFLAGS) $(OMNIORB_INCLUDES) \
 	$(BOOST_CPPFLAGS) \
 	-I$(KERNEL_ROOT_DIR)/include/salome \
 	-I$(GUI_ROOT_DIR)/include/salome \
-	-I$(srcdir)/../bases \
-	-I$(srcdir)/../engine \
-	-I$(srcdir)/../runtime \
-	-I$(srcdir)/../yacsloader \
+	$(qt4_cppflags) \
 	-I$(srcdir)/../hmi \
-	-I$(srcdir)/../genericgui \
-	$(qt4_cppflags)
+	-I$(srcdir)/../genericgui
 
 #	$(THREAD_DEF) \
 #	$(PYTHON_CPPFLAGS) \