diff --git a/PETScMat_linear_solvers/pilut/PETScMatPilutSolver.h b/PETScMat_linear_solvers/pilut/PETScMatPilutSolver.h
index 74d58ef18..84ab0e9c5 100644
--- a/PETScMat_linear_solvers/pilut/PETScMatPilutSolver.h
+++ b/PETScMat_linear_solvers/pilut/PETScMatPilutSolver.h
@@ -15,7 +15,7 @@
 #ifndef hypre_PETSC_MAT_PILUT_SOLVER_HEADER
 #define hypre_PETSC_MAT_PILUT_SOLVER_HEADER
 
-#include "../../includes/general.h"
+#include "../../utilities/general.h"
 #include "../../utilities/memory.h"
 #ifdef HYPRE_DEBUG
 #include <gmalloc.h>
@@ -27,7 +27,7 @@
 #include "mat.h"
 #include "vec.h"
 
-#include "../../includes/HYPRE.h"
+#include "../../HYPRE.h"
 
 /*--------------------------------------------------------------------------
  * hypre_PETScMatPilutSolver
diff --git a/PETScMat_ls/pilut/PETScMatPilutSolver.h b/PETScMat_ls/pilut/PETScMatPilutSolver.h
index 74d58ef18..84ab0e9c5 100644
--- a/PETScMat_ls/pilut/PETScMatPilutSolver.h
+++ b/PETScMat_ls/pilut/PETScMatPilutSolver.h
@@ -15,7 +15,7 @@
 #ifndef hypre_PETSC_MAT_PILUT_SOLVER_HEADER
 #define hypre_PETSC_MAT_PILUT_SOLVER_HEADER
 
-#include "../../includes/general.h"
+#include "../../utilities/general.h"
 #include "../../utilities/memory.h"
 #ifdef HYPRE_DEBUG
 #include <gmalloc.h>
@@ -27,7 +27,7 @@
 #include "mat.h"
 #include "vec.h"
 
-#include "../../includes/HYPRE.h"
+#include "../../HYPRE.h"
 
 /*--------------------------------------------------------------------------
  * hypre_PETScMatPilutSolver
diff --git a/PETSc_linear_solvers/Block_Preconditioned/makefile b/PETSc_linear_solvers/Block_Preconditioned/makefile
index a2a1f3199..2cd756ac1 100755
--- a/PETSc_linear_solvers/Block_Preconditioned/makefile
+++ b/PETSc_linear_solvers/Block_Preconditioned/makefile
@@ -27,7 +27,7 @@
             -I/usr/local/include -I/home/casc/include
   ILU_INC = -I../../seq_linear_solvers/ilut
   IC_INC = -I../../seq_linear_solvers/ict
-  LIN_SOLVE_INC = -I../../includes
+  LIN_SOLVE_INC = -I../.. -I../../utilities
 
   INC = $(PETSC_INC) $(PETSC_PRIV_INC) $(MPI_INC) $($(LOCAL_SOLVER)_INC) \
         $(LIN_SOLVE_INC) -I/home/casc/include
diff --git a/PETSc_linear_solvers/ParILUT/PETScSolverParILUT.h b/PETSc_linear_solvers/ParILUT/PETScSolverParILUT.h
index 0fcb7ad2d..c17624f39 100644
--- a/PETSc_linear_solvers/ParILUT/PETScSolverParILUT.h
+++ b/PETSc_linear_solvers/ParILUT/PETScSolverParILUT.h
@@ -15,7 +15,7 @@
 #ifndef hypre_PETScSolverParILUT_HEADER
 #define hypre_PETScSolverParILUT_HEADER
 
-#include "../../includes/general.h"
+#include "../../utilities/general.h"
 #include "../../utilities/memory.h"
 #ifdef HYPRE_DEBUG
 #include <gmalloc.h>
diff --git a/PETSc_ls/Block_Preconditioned/makefile b/PETSc_ls/Block_Preconditioned/makefile
index a2a1f3199..2cd756ac1 100644
--- a/PETSc_ls/Block_Preconditioned/makefile
+++ b/PETSc_ls/Block_Preconditioned/makefile
@@ -27,7 +27,7 @@
             -I/usr/local/include -I/home/casc/include
   ILU_INC = -I../../seq_linear_solvers/ilut
   IC_INC = -I../../seq_linear_solvers/ict
-  LIN_SOLVE_INC = -I../../includes
+  LIN_SOLVE_INC = -I../.. -I../../utilities
 
   INC = $(PETSC_INC) $(PETSC_PRIV_INC) $(MPI_INC) $($(LOCAL_SOLVER)_INC) \
         $(LIN_SOLVE_INC) -I/home/casc/include
diff --git a/PETSc_ls/ParILUT/PETScSolverParILUT.h b/PETSc_ls/ParILUT/PETScSolverParILUT.h
index 0fcb7ad2d..c17624f39 100644
--- a/PETSc_ls/ParILUT/PETScSolverParILUT.h
+++ b/PETSc_ls/ParILUT/PETScSolverParILUT.h
@@ -15,7 +15,7 @@
 #ifndef hypre_PETScSolverParILUT_HEADER
 #define hypre_PETScSolverParILUT_HEADER
 
-#include "../../includes/general.h"
+#include "../../utilities/general.h"
 #include "../../utilities/memory.h"
 #ifdef HYPRE_DEBUG
 #include <gmalloc.h>
diff --git a/bmakes/base.alpha.andy b/bmakes/base.alpha.andy
index b5cfc0c3e..1896e47ea 100644
--- a/bmakes/base.alpha.andy
+++ b/bmakes/base.alpha.andy
@@ -31,7 +31,8 @@ CFLAGS =\
  ${PETSC_CFLAGS}\
  ${ISIS_FLAGS}\
  -I/usr/local/include\
- -I${HYPRE_DIR}/includes\
+ -I${HYPRE_DIR}\
+ -I${HYPRE_DIR}/utilities\
  -DPETSC_AVAILABLE\
  -DISIS_AVAILABLE\
  -DHYPRE_MEMORY_CHECK\
diff --git a/bmakes/base.solaris.andy b/bmakes/base.solaris.andy
index 4105e5e0f..1bed94ae7 100644
--- a/bmakes/base.solaris.andy
+++ b/bmakes/base.solaris.andy
@@ -34,7 +34,8 @@ CFLAGS =\
  ${ISIS_FLAGS}\
  -I/usr/local/include\
  -I/home/casc/include\
- -I${HYPRE_DIR}/includes\
+ -I${HYPRE_DIR}\
+ -I${HYPRE_DIR}/utilities\
  -DPETSC_AVAILABLE\
  -DISIS_AVAILABLE\
  -DHYPRE_MEMORY_CHECK\
diff --git a/distributed_linear_solvers/pilut/DistributedMatrixPilutSolver.h b/distributed_linear_solvers/pilut/DistributedMatrixPilutSolver.h
index c6e3221b5..9c3f0b5a4 100644
--- a/distributed_linear_solvers/pilut/DistributedMatrixPilutSolver.h
+++ b/distributed_linear_solvers/pilut/DistributedMatrixPilutSolver.h
@@ -3,7 +3,7 @@
 #define _DISTRIBUTED_MATRIX_PILUT_SOLVER_HEADER
 
 
-#include "../../includes/general.h"
+#include "../../utilities/general.h"
 #include "../../utilities/memory.h"
 #ifdef HYPRE_DEBUG
 #include <gmalloc.h>
diff --git a/distributed_linear_solvers/pilut/Makefile b/distributed_linear_solvers/pilut/Makefile
index e8b8bbde8..45a851934 100644
--- a/distributed_linear_solvers/pilut/Makefile
+++ b/distributed_linear_solvers/pilut/Makefile
@@ -25,7 +25,7 @@ MPIRUN       = mpirun -np 4
 #PETSc; not used here, but used by objects called from here 
 PETSC_INCLUDES = -I${PETSC_DIR}/include
 # General
-HYPRE_INCLUDES = -I../../includes -I/home/casc/include
+HYPRE_INCLUDES = -I../.. -I../../utilities -I/home/casc/include
 INCLUDES = $(HYPRE_INCLUDES) $(MPI_INCLUDES) $(PETSC_INCLUDES)
 LIBDIR   = $(MPI_LIBDIR)
 LIBS     = -L. -lHYPREpilut -lm $(MPI_LIBS) $(OTHER_LIBS)
diff --git a/distributed_linear_solvers/pilut/Makefile.alpha b/distributed_linear_solvers/pilut/Makefile.alpha
index 5ea1bf245..d04abca3d 100644
--- a/distributed_linear_solvers/pilut/Makefile.alpha
+++ b/distributed_linear_solvers/pilut/Makefile.alpha
@@ -29,7 +29,7 @@ MPIRUN       = mpirun -np 4
 #PETSc; not used here, but used by objects called from here 
 PETSC_INCLUDES = -I${PETSC_DIR}/include
 # General
-HYPRE_INCLUDES = -I../../includes -I/home/casc/include
+HYPRE_INCLUDES = -I../.. -I../../utilities -I/home/casc/include
 INCLUDES = $(HYPRE_INCLUDES) $(MPI_INCLUDES) $(PETSC_INCLUDES)
 LIBDIR   = $(MPI_LIBDIR)
 LIBS     = -L. -lHYPREpilut -lm $(MPI_LIBS) $(OTHER_LIBS)
diff --git a/distributed_linear_solvers/pilut/macros.h b/distributed_linear_solvers/pilut/macros.h
index ddbde829a..353931df4 100644
--- a/distributed_linear_solvers/pilut/macros.h
+++ b/distributed_linear_solvers/pilut/macros.h
@@ -1,7 +1,7 @@
 #ifndef MACROS_H
 #define MACROS_H
 
-#include "../../includes/general.h"
+#include "../../utilities/general.h"
 
 /*
  * macros.h
diff --git a/distributed_ls/pilut/DistributedMatrixPilutSolver.h b/distributed_ls/pilut/DistributedMatrixPilutSolver.h
index c6e3221b5..9c3f0b5a4 100644
--- a/distributed_ls/pilut/DistributedMatrixPilutSolver.h
+++ b/distributed_ls/pilut/DistributedMatrixPilutSolver.h
@@ -3,7 +3,7 @@
 #define _DISTRIBUTED_MATRIX_PILUT_SOLVER_HEADER
 
 
-#include "../../includes/general.h"
+#include "../../utilities/general.h"
 #include "../../utilities/memory.h"
 #ifdef HYPRE_DEBUG
 #include <gmalloc.h>
diff --git a/distributed_ls/pilut/Makefile b/distributed_ls/pilut/Makefile
index e8b8bbde8..45a851934 100644
--- a/distributed_ls/pilut/Makefile
+++ b/distributed_ls/pilut/Makefile
@@ -25,7 +25,7 @@ MPIRUN       = mpirun -np 4
 #PETSc; not used here, but used by objects called from here 
 PETSC_INCLUDES = -I${PETSC_DIR}/include
 # General
-HYPRE_INCLUDES = -I../../includes -I/home/casc/include
+HYPRE_INCLUDES = -I../.. -I../../utilities -I/home/casc/include
 INCLUDES = $(HYPRE_INCLUDES) $(MPI_INCLUDES) $(PETSC_INCLUDES)
 LIBDIR   = $(MPI_LIBDIR)
 LIBS     = -L. -lHYPREpilut -lm $(MPI_LIBS) $(OTHER_LIBS)
diff --git a/distributed_ls/pilut/Makefile.alpha b/distributed_ls/pilut/Makefile.alpha
index 5ea1bf245..d04abca3d 100644
--- a/distributed_ls/pilut/Makefile.alpha
+++ b/distributed_ls/pilut/Makefile.alpha
@@ -29,7 +29,7 @@ MPIRUN       = mpirun -np 4
 #PETSc; not used here, but used by objects called from here 
 PETSC_INCLUDES = -I${PETSC_DIR}/include
 # General
-HYPRE_INCLUDES = -I../../includes -I/home/casc/include
+HYPRE_INCLUDES = -I../.. -I../../utilities -I/home/casc/include
 INCLUDES = $(HYPRE_INCLUDES) $(MPI_INCLUDES) $(PETSC_INCLUDES)
 LIBDIR   = $(MPI_LIBDIR)
 LIBS     = -L. -lHYPREpilut -lm $(MPI_LIBS) $(OTHER_LIBS)
diff --git a/distributed_ls/pilut/macros.h b/distributed_ls/pilut/macros.h
index ddbde829a..353931df4 100644
--- a/distributed_ls/pilut/macros.h
+++ b/distributed_ls/pilut/macros.h
@@ -1,7 +1,7 @@
 #ifndef MACROS_H
 #define MACROS_H
 
-#include "../../includes/general.h"
+#include "../../utilities/general.h"
 
 /*
  * macros.h
diff --git a/distributed_matrix/Makefile.alpha b/distributed_matrix/Makefile.alpha
index 2fb9d5bb5..a987e8862 100644
--- a/distributed_matrix/Makefile.alpha
+++ b/distributed_matrix/Makefile.alpha
@@ -47,7 +47,8 @@ CFLAGS =\
  ${SEQ_SOLVER_FLAGS}\
  -I/usr/local/include\
  -I/home/casc/include\
- -I../includes\
+ -I..\
+ -I../utilities\
  -DHYPRE_MEMORY_CHECK\
  -DHYPRE_DEBUG\
  -I/g/g90/chow/ale3d/isis/include\
diff --git a/distributed_matrix/distributed_matrix.h b/distributed_matrix/distributed_matrix.h
index 5934cb193..01a215dbb 100644
--- a/distributed_matrix/distributed_matrix.h
+++ b/distributed_matrix/distributed_matrix.h
@@ -15,7 +15,7 @@
 #ifndef hypre_DISTRIBUTED_MATRIX_HEADER
 #define hypre_DISTRIBUTED_MATRIX_HEADER
 
-#include "../includes/general.h"
+#include "../utilities/general.h"
 #include "../utilities/memory.h"
 
 #include "mpi.h"
diff --git a/seq_linear_solvers/ict/makefile b/seq_linear_solvers/ict/makefile
index d2e5f570e..4a391f39e 100755
--- a/seq_linear_solvers/ict/makefile
+++ b/seq_linear_solvers/ict/makefile
@@ -3,7 +3,7 @@ OBJS=cg_driver.o ict_driver.o \
 
 HEADERS = ic_data.h ict_facsol_f.h
 
-INC = -I.. -I/home/casc/include -I../../includes
+INC = -I.. -I/home/casc/include -I../.. -I../../utilities
 
 SPARSKIT_DIR = ../dsparskit
 LIB = -L$(SPARSKIT_DIR) -ldsparskit
diff --git a/seq_linear_solvers/ilut/makefile b/seq_linear_solvers/ilut/makefile
index 39e15ef50..a16791cc7 100755
--- a/seq_linear_solvers/ilut/makefile
+++ b/seq_linear_solvers/ilut/makefile
@@ -3,7 +3,7 @@ OBJS=gmres_driver.o ilut_driver.o ilu_setup.o ilu_Initialize.o \
 
 HEADERS = ilu_data.h ilut_facsol_f.h
 
-INC = -I.. -I/home/casc/include -I../../includes
+INC = -I.. -I/home/casc/include -I../.. -I../../utilities
 
 SPARSKIT_DIR = ../dsparskit
 LIB = -L$(SPARSKIT_DIR) -ldsparskit
diff --git a/seq_ls/ict/makefile b/seq_ls/ict/makefile
index d2e5f570e..4a391f39e 100644
--- a/seq_ls/ict/makefile
+++ b/seq_ls/ict/makefile
@@ -3,7 +3,7 @@ OBJS=cg_driver.o ict_driver.o \
 
 HEADERS = ic_data.h ict_facsol_f.h
 
-INC = -I.. -I/home/casc/include -I../../includes
+INC = -I.. -I/home/casc/include -I../.. -I../../utilities
 
 SPARSKIT_DIR = ../dsparskit
 LIB = -L$(SPARSKIT_DIR) -ldsparskit
diff --git a/seq_ls/ilut/makefile b/seq_ls/ilut/makefile
index 39e15ef50..a16791cc7 100644
--- a/seq_ls/ilut/makefile
+++ b/seq_ls/ilut/makefile
@@ -3,7 +3,7 @@ OBJS=gmres_driver.o ilut_driver.o ilu_setup.o ilu_Initialize.o \
 
 HEADERS = ilu_data.h ilut_facsol_f.h
 
-INC = -I.. -I/home/casc/include -I../../includes
+INC = -I.. -I/home/casc/include -I../.. -I../../utilities
 
 SPARSKIT_DIR = ../dsparskit
 LIB = -L$(SPARSKIT_DIR) -ldsparskit