Index: /issm/trunk/src/c/Makefile.am
===================================================================
--- /issm/trunk/src/c/Makefile.am	(revision 8284)
+++ /issm/trunk/src/c/Makefile.am	(revision 8285)
@@ -375,5 +375,4 @@
 					./toolkits/petsc/patches/MatMultPatch.cpp\
 					./toolkits/petsc/petscincludes.h\
-					./toolkits/tao/taoincludes.h\
 					./toolkits/mpi/mpiincludes.h\
 					./toolkits/mpi/patches/mpipatches.h\
@@ -1016,5 +1015,4 @@
 					./toolkits/petsc/patches/MatMultPatch.cpp\
 					./toolkits/petsc/petscincludes.h\
-					./toolkits/tao/taoincludes.h\
 					./toolkits/mpi/mpiincludes.h\
 					./toolkits/mpi/patches/mpipatches.h\
Index: /issm/trunk/src/c/shared/Matlab/ModuleBoot.cpp
===================================================================
--- /issm/trunk/src/c/shared/Matlab/ModuleBoot.cpp	(revision 8284)
+++ /issm/trunk/src/c/shared/Matlab/ModuleBoot.cpp	(revision 8285)
@@ -3,10 +3,4 @@
  * at the beginning of a module
  */
-
-#ifdef HAVE_CONFIG_H
-	#include "config.h"
-#else
-#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
-#endif
 
 #include "../../toolkits/toolkits.h"
@@ -24,9 +18,4 @@
 	PetscInitializeNoArguments();
 
-	/*Initialize Tao*/
-	#ifdef _HAVE_TAO_
-	TaoInitialize(0,0,0,0);
-	#endif
-
 	return 1;
 }
Index: /issm/trunk/src/c/solutions/controltao_core.cpp
===================================================================
--- /issm/trunk/src/c/solutions/controltao_core.cpp	(revision 8284)
+++ /issm/trunk/src/c/solutions/controltao_core.cpp	(revision 8285)
@@ -2,4 +2,9 @@
  * \brief: core of the control solution 
  */ 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#else
+#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
+#endif
 
 #include "../toolkits/toolkits.h"
@@ -12,4 +17,7 @@
 #include "../solvers/solvers.h"
 
+#ifdef _HAVE_TAO_
+#include "tao.h"
+#endif
 
 void controltao_core(FemModel* femmodel){
@@ -48,4 +56,5 @@
 
 	printf("I am in TAO!!\n");
+	TaoInitialize(0,0,0,0);
 
 	/*Recover parameters used throughout the solution:{{{1*/
Index: /issm/trunk/src/c/toolkits/toolkits.h
===================================================================
--- /issm/trunk/src/c/toolkits/toolkits.h	(revision 8284)
+++ /issm/trunk/src/c/toolkits/toolkits.h	(revision 8285)
@@ -10,5 +10,4 @@
 #include "./metis/metisincludes.h"
 #include "./triangle/triangleincludes.h"
-#include "./tao/taoincludes.h"
 
 #endif