diff --git a/fastlib/u/nvasil/tpie/ami.h b/fastlib/u/nvasil/tpie/ami.h
index 32450fc35d..c754f73c30 100644
--- a/fastlib/u/nvasil/tpie/ami.h
+++ b/fastlib/u/nvasil/tpie/ami.h
@@ -10,33 +10,33 @@
 #define _AMI_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 // Get a stream implementation.
-#include <ami_stream.h>
+#include "u/nvasil/tpie/ami_stream.h"
 
 // Get templates for ami_scan().
-#include <ami_scan.h>
+#include "u/nvasil/tpie/ami_scan.h"
 
 // Get templates for ami_merge().
-#include <ami_merge.h>
+#include "u/nvasil/tpie/ami_merge.h"
 
 // Get templates for ami_sort().
-#include <ami_sort.h>
+#include "u/nvasil/tpie/ami_sort.h"
 
 // Get templates for general permutation.
-#include <ami_gen_perm.h>
+#include "u/nvasil/tpie/ami_gen_perm.h"
 
 // Get templates for bit permuting.
-#include <ami_bit_permute.h>
+#include "u/nvasil/tpie/ami_bit_permute.h"
 
 // Get a collection implementation.
-#include <ami_coll.h>
+#include "u/nvasil/tpie/ami_coll.h"
 
 // Get a block implementation.
-#include <ami_block.h>
+#include "u/nvasil/tpie/ami_block.h"
 
 // Get templates for AMI_btree.
-#include <ami_btree.h>
+#include "u/nvasil/tpie/ami_btree.h"
 
 #endif // _AMI_H 
diff --git a/fastlib/u/nvasil/tpie/ami_bit_permute.h b/fastlib/u/nvasil/tpie/ami_bit_permute.h
index ab7647c48e..204e18eb81 100644
--- a/fastlib/u/nvasil/tpie/ami_bit_permute.h
+++ b/fastlib/u/nvasil/tpie/ami_bit_permute.h
@@ -13,15 +13,15 @@
 #define _AMI_BIT_PERMUTE_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 // Get bit_matrix.
-#include <bit_matrix.h>
+#include "u/nvasil/tpie/bit_matrix.h"
 
 // Get AMI_gen_perm_object.
-#include <ami_gen_perm_object.h>
+#include "u/nvasil/tpie/ami_gen_perm_object.h"
 // Get the AMI_general_permute().
-#include <ami_gen_perm.h>
+#include "u/nvasil/tpie/ami_gen_perm.h"
 
 class AMI_bit_perm_object {
 private:
diff --git a/fastlib/u/nvasil/tpie/ami_block.h b/fastlib/u/nvasil/tpie/ami_block.h
index a04d68aeaf..0b7614d61d 100644
--- a/fastlib/u/nvasil/tpie/ami_block.h
+++ b/fastlib/u/nvasil/tpie/ami_block.h
@@ -12,13 +12,13 @@
 #define _AMI_BLOCK_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 // The AMI_block_base class.
-#include <ami_block_base.h>
+#include "u/nvasil/tpie/ami_block_base.h"
 
 // The b_vector class.
-#include <b_vector.h>
+#include "u/nvasil/tpie/b_vector.h"
  
 template<class E, class I, class BTECOLL = BTE_COLLECTION >
 class AMI_block: public AMI_block_base<BTECOLL> {
diff --git a/fastlib/u/nvasil/tpie/ami_block_base.h b/fastlib/u/nvasil/tpie/ami_block_base.h
index b251938af5..5a0910ae8f 100644
--- a/fastlib/u/nvasil/tpie/ami_block_base.h
+++ b/fastlib/u/nvasil/tpie/ami_block_base.h
@@ -13,12 +13,12 @@
 #define _AMI_BLOCK_BASE_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 // The AMI error codes.
-#include <ami_err.h>
+#include "u/nvasil/tpie/ami_err.h"
 // The AMI_COLLECTION class.
-#include <ami_coll.h>
+#include "u/nvasil/tpie/ami_coll.h"
 
 // AMI block id type.
 typedef TPIE_BLOCK_ID_TYPE AMI_bid;
diff --git a/fastlib/u/nvasil/tpie/ami_btree.h b/fastlib/u/nvasil/tpie/ami_btree.h
index 1a5f480986..95a4778d9a 100644
--- a/fastlib/u/nvasil/tpie/ami_btree.h
+++ b/fastlib/u/nvasil/tpie/ami_btree.h
@@ -25,19 +25,19 @@
 #include <string>
 
 // Get a stream implementation.
-#include <ami_stream.h>
+#include "u/nvasil/tpie/ami_stream.h"
 // Get templates for AMI_sort.
-#include <ami_sort.h>
+#include "u/nvasil/tpie/ami_sort.h"
 // Get a collection implementation.
-#include <ami_coll.h>
+#include "u/nvasil/tpie/ami_coll.h"
 // Get a block implementation.
-#include <ami_block.h>
+#include "u/nvasil/tpie/ami_block.h"
 // The cache manager.
-#include <ami_cache.h>
+#include "u/nvasil/tpie/ami_cache.h"
 // The tpie_stats_tree class for tree statistics.
-#include <tpie_stats_tree.h>
+#include "u/nvasil/tpie/tpie_stats_tree.h"
 // The tpie_tempnam() function
-#include <tpie_tempnam.h>
+#include "u/nvasil/tpie/tpie_tempnam.h"
 
 /// Determines how elements are stored in a leaf. If set to 0, elements are
 /// stored in the order in which they are inserted, which may results in
@@ -1554,7 +1554,7 @@ AMI_err AMI_btree<Key, Value, Compare, KeyOfValue, BTECOLL>::load(AMI_BTREE* bt,
   AMI_btree_params params_saved = params_;
   AMI_err err = AMI_ERROR_NO_ERROR;
   params_.leaf_size_max = std::min(params_.leaf_size_max, size_t(leaf_fill*params_.leaf_size_max));
-  params_.node_size_max = min(params_.leaf_size_max, size_t(node_fill*params_.node_size_max));
+  params_.node_size_max = std::min(params_.leaf_size_max, size_t(node_fill*params_.node_size_max));
   AMI_BTREE_LEAF* lcl = NULL; // locally cached leaf.
 
   // Get the bid of the min leaf in bt.
diff --git a/fastlib/u/nvasil/tpie/ami_cache.h b/fastlib/u/nvasil/tpie/ami_cache.h
index 473e81c88b..ca5c131616 100644
--- a/fastlib/u/nvasil/tpie/ami_cache.h
+++ b/fastlib/u/nvasil/tpie/ami_cache.h
@@ -15,9 +15,9 @@
 // Get the STL pair class.
 #include <utility>
 // Get the logging macros.
-#include <tpie_log.h>
+#include "u/nvasil/tpie/tpie_log.h"
 // Get the b_vector class.
-#include <b_vector.h>
+#include "u/nvasil/tpie/b_vector.h"
 
 // The only implementation is AMI_cache_manager_lru.
 #define AMI_CACHE_MANAGER AMI_cache_manager_lru
diff --git a/fastlib/u/nvasil/tpie/ami_coll.h b/fastlib/u/nvasil/tpie/ami_coll.h
index 09f178abe0..d5889d9fe9 100644
--- a/fastlib/u/nvasil/tpie/ami_coll.h
+++ b/fastlib/u/nvasil/tpie/ami_coll.h
@@ -10,10 +10,10 @@
 #define _AMI_COLL_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
-#include <ami_coll_base.h>
-#include <ami_coll_single.h>
+#include "u/nvasil/tpie/ami_coll_base.h"
+#include "u/nvasil/tpie/ami_coll_single.h"
 
 // AMI_collection_single is the only implementation, so make it easy
 // to get to.
diff --git a/fastlib/u/nvasil/tpie/ami_coll_base.h b/fastlib/u/nvasil/tpie/ami_coll_base.h
index 1c2acadae7..67e5fe10ce 100644
--- a/fastlib/u/nvasil/tpie/ami_coll_base.h
+++ b/fastlib/u/nvasil/tpie/ami_coll_base.h
@@ -11,7 +11,7 @@
 #define _AMI_COLL_BASE_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 // AMI collection types passed to constructors
 enum AMI_collection_type {
diff --git a/fastlib/u/nvasil/tpie/ami_coll_single.h b/fastlib/u/nvasil/tpie/ami_coll_single.h
index 5874d056d6..c5902ba603 100644
--- a/fastlib/u/nvasil/tpie/ami_coll_single.h
+++ b/fastlib/u/nvasil/tpie/ami_coll_single.h
@@ -11,18 +11,18 @@
 #define _AMI_COLL_SINGLE_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 // For persist type.
-#include <persist.h>
+#include "u/nvasil/tpie/persist.h"
 // Get an appropriate BTE collection.
-#include <bte_coll.h>
+#include "u/nvasil/tpie/bte_coll.h"
 // For AMI_collection_type and AMI_collection_status.
-#include <ami_coll_base.h>
+#include "u/nvasil/tpie/ami_coll_base.h"
 // The tpie_tempnam() function.
-#include <tpie_tempnam.h>
+#include "u/nvasil/tpie/tpie_tempnam.h"
 // Get the tpie_stats_coll class for collection statistics.
-#include <tpie_stats_coll.h>
+#include "u/nvasil/tpie/tpie_stats_coll.h"
 
 template < class BTECOLL = BTE_COLLECTION >
 class AMI_collection_single {
diff --git a/fastlib/u/nvasil/tpie/ami_device.h b/fastlib/u/nvasil/tpie/ami_device.h
index 0f9a1e30bd..fc1224f14e 100644
--- a/fastlib/u/nvasil/tpie/ami_device.h
+++ b/fastlib/u/nvasil/tpie/ami_device.h
@@ -10,7 +10,7 @@
 #define _AMI_DEVICE_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 #include <iostream>
 
diff --git a/fastlib/u/nvasil/tpie/ami_gen_perm.h b/fastlib/u/nvasil/tpie/ami_gen_perm.h
index fb7b543950..390ebe23c0 100644
--- a/fastlib/u/nvasil/tpie/ami_gen_perm.h
+++ b/fastlib/u/nvasil/tpie/ami_gen_perm.h
@@ -12,13 +12,13 @@
 #define _AMI_GEN_PERM_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 // Get AMI_scan_object.
-#include <ami_scan.h>
+#include "u/nvasil/tpie/ami_scan.h"
 // Get AMI_sort
-#include <ami_sort.h>
+#include "u/nvasil/tpie/ami_sort.h"
 
-#include <ami_gen_perm_object.h>
+#include "u/nvasil/tpie/ami_gen_perm_object.h"
 
 // (tavi) moved dest_obj definition down due to error in gcc 2.8.1
 template<class T> class dest_obj;
diff --git a/fastlib/u/nvasil/tpie/ami_gen_perm_object.h b/fastlib/u/nvasil/tpie/ami_gen_perm_object.h
index a5b118167e..b85af8077a 100644
--- a/fastlib/u/nvasil/tpie/ami_gen_perm_object.h
+++ b/fastlib/u/nvasil/tpie/ami_gen_perm_object.h
@@ -9,10 +9,10 @@
 #define _AMI_GEN_PERM_OBJECT_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 // For AMI_err.
-#include <ami_err.h>
+#include "u/nvasil/tpie/ami_err.h"
 
 // A class of object that computes permutation destinations.
 class AMI_gen_perm_object {
diff --git a/fastlib/u/nvasil/tpie/ami_kb_dist.h b/fastlib/u/nvasil/tpie/ami_kb_dist.h
index 47a04af1ec..5243e7e1ba 100644
--- a/fastlib/u/nvasil/tpie/ami_kb_dist.h
+++ b/fastlib/u/nvasil/tpie/ami_kb_dist.h
@@ -10,7 +10,7 @@
 //
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 // If we have not already seen this file with KB_KEY undefined or
 // KB_KEY is defined, we will process the file.
diff --git a/fastlib/u/nvasil/tpie/ami_kb_sort.h b/fastlib/u/nvasil/tpie/ami_kb_sort.h
index 19ae5d6ae0..522b5698c4 100644
--- a/fastlib/u/nvasil/tpie/ami_kb_sort.h
+++ b/fastlib/u/nvasil/tpie/ami_kb_sort.h
@@ -25,8 +25,8 @@
 // Get definitions for working with Unix and Windows
 #include <portability.h>
 
-#include <ami_key.h>
-#include <ami_kb_dist.h>
+#include "u/nvasil/tpie/ami_key.h"
+#include "u/nvasil/tpie/ami_kb_dist.h"
 
 #ifdef KB_KEY
 
diff --git a/fastlib/u/nvasil/tpie/ami_kd_base.h b/fastlib/u/nvasil/tpie/ami_kd_base.h
index f0ff61dea1..2165b68996 100644
--- a/fastlib/u/nvasil/tpie/ami_kd_base.h
+++ b/fastlib/u/nvasil/tpie/ami_kd_base.h
@@ -19,8 +19,8 @@
 #include <iostream>
 // For min, max.
 #include <algorithm>
-#include <ami_block_base.h>
-#include <ami_point.h>
+#include "u/nvasil/tpie/ami_block_base.h"
+#include "u/nvasil/tpie/ami_point.h"
 
 // AMI_KDTREE_STORE_WEIGHTS determines whether weights are stored in all
 // binary kd-tree nodes (when set to 1), or just in block nodes (when set
diff --git a/fastlib/u/nvasil/tpie/ami_kdbtree.h b/fastlib/u/nvasil/tpie/ami_kdbtree.h
index c2e13e1e26..ba75b61ad6 100644
--- a/fastlib/u/nvasil/tpie/ami_kdbtree.h
+++ b/fastlib/u/nvasil/tpie/ami_kdbtree.h
@@ -12,10 +12,10 @@
 #define _AMI_KDBTREE_H
 
 #include <iostream>
-#include <portability.h>
-#include <ami_point.h>
-#include <ami_kdtree.h>
-#include <ami_kd_base.h>
+#include "u/nvasil/tpie/portability.h"
+#include "u/nvasil/tpie/ami_point.h"
+#include "u/nvasil/tpie/ami_kdtree.h"
+#include "u/nvasil/tpie/ami_kd_base.h"
 #include <string> // STL string.
 
 #define AMI_KDBTREE_HEADER_MAGIC_NUMBER 0xA9542F
diff --git a/fastlib/u/nvasil/tpie/ami_kdtree.h b/fastlib/u/nvasil/tpie/ami_kdtree.h
index 8804d350e2..b5066d516a 100644
--- a/fastlib/u/nvasil/tpie/ami_kdtree.h
+++ b/fastlib/u/nvasil/tpie/ami_kdtree.h
@@ -12,7 +12,7 @@
 #define _AMI_KDTREE_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 // For pair.
 #include <utility>
 // For stack.
@@ -27,19 +27,19 @@
 #include <string>
 
 // TPIE stuff.
-#include <ami_stream.h>
-#include <ami_scan.h>
-#include <ami_sort.h>
-#include <ami_coll.h>
-#include <ami_block.h>
+#include "u/nvasil/tpie/ami_stream.h"
+#include "u/nvasil/tpie/ami_scan.h"
+#include "u/nvasil/tpie/ami_sort.h"
+#include "u/nvasil/tpie/ami_coll.h"
+#include "u/nvasil/tpie/ami_block.h"
 // The tpie_stats_tree class.
-#include <tpie_stats_tree.h>
+#include "u/nvasil/tpie/tpie_stats_tree.h"
 // The cache manager.
-#include <ami_cache.h>
+#include "u/nvasil/tpie/ami_cache.h"
 // The AMI_point/AMI_record classes.
 #include <ami_point.h>
 // Supporting types: AMI_kdtree_status, AMI_kdtree_params, etc.
-#include <ami_kd_base.h>
+#include "u/nvasil/tpie/ami_kd_base.h"
 
 // Forward references.
 template<class coord_t, TPIE_OS_SIZE_T dim, class BTECOLL> class AMI_kdtree_leaf;
diff --git a/fastlib/u/nvasil/tpie/ami_key.h b/fastlib/u/nvasil/tpie/ami_key.h
index 799ac08917..f0d28ed4bb 100644
--- a/fastlib/u/nvasil/tpie/ami_key.h
+++ b/fastlib/u/nvasil/tpie/ami_key.h
@@ -10,7 +10,7 @@
 #define _AMI_KEY_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 // Temporary until the configuration script is edited to determine word
 // size.
diff --git a/fastlib/u/nvasil/tpie/ami_logmethod.h b/fastlib/u/nvasil/tpie/ami_logmethod.h
index 454b6899e8..fa30a8fbc4 100644
--- a/fastlib/u/nvasil/tpie/ami_logmethod.h
+++ b/fastlib/u/nvasil/tpie/ami_logmethod.h
@@ -12,17 +12,17 @@
 #ifndef _LOGMETHOD_H
 #define _LOGMETHOD_H
 
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 // For vector
 #include <vector>
 // For pair
 #include <utility>
 // TPIE stuff.
-#include <ami_stream.h>
-#include <ami_coll.h>
+#include "u/nvasil/tpie/ami_stream.h"
+#include "u/nvasil/tpie/ami_coll.h"
 
-#include <tpie_stats_tree.h>
+#include "u/nvasil/tpie/tpie_stats_tree.h"
 
 #define LM_PATH_NAME_LENGTH 128
 
diff --git a/fastlib/u/nvasil/tpie/ami_matrix.h b/fastlib/u/nvasil/tpie/ami_matrix.h
index 713b5229a0..264c5cff61 100644
--- a/fastlib/u/nvasil/tpie/ami_matrix.h
+++ b/fastlib/u/nvasil/tpie/ami_matrix.h
@@ -18,17 +18,17 @@
 #define INTERNAL_TIMING 1
 
 #ifdef INTERNAL_TIMING
-#  include <cpu_timer.h>
+#  include "u/nvasil/tpie/cpu_timer.h"
 #  include <iostream>
 #endif
 
 #include <matrix.h>
 
-#include <ami_matrix_pad.h>
-#include <ami_matrix_blocks.h>
-#include <ami_stream_arith.h>
+#include "u/nvasil/tpie/ami_matrix_pad.h"
+#include "u/nvasil/tpie/ami_matrix_blocks.h"
+#include "u/nvasil/tpie/ami_stream_arith.h"
 
-#include <ami_gen_perm.h>
+#include "u/nvasil/tpie/ami_gen_perm.h"
 
 template<class T>
 class AMI_matrix : public AMI_STREAM<T> {
diff --git a/fastlib/u/nvasil/tpie/ami_matrix_blocks.h b/fastlib/u/nvasil/tpie/ami_matrix_blocks.h
index a2e8ef5e5b..ecf330afda 100644
--- a/fastlib/u/nvasil/tpie/ami_matrix_blocks.h
+++ b/fastlib/u/nvasil/tpie/ami_matrix_blocks.h
@@ -10,9 +10,9 @@
 #define _AMI_MATRIX_BLOCKS_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 // Get AMI_gen_perm_object.
-#include <ami_gen_perm_object.h>
+#include "u/nvasil/tpie/ami_gen_perm_object.h"
 
 class perm_matrix_into_blocks : public AMI_gen_perm_object {
 private:
diff --git a/fastlib/u/nvasil/tpie/ami_matrix_fill.h b/fastlib/u/nvasil/tpie/ami_matrix_fill.h
index 36a3a09f0d..5f3f237a2b 100644
--- a/fastlib/u/nvasil/tpie/ami_matrix_fill.h
+++ b/fastlib/u/nvasil/tpie/ami_matrix_fill.h
@@ -10,9 +10,9 @@
 #define _AMI_MATRIX_FILL_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 // Get the AMI_scan_object definition.
-#include <ami_scan.h>
+#include "u/nvasil/tpie/ami_scan.h"
 
 template<class T>
 class AMI_matrix_filler {
diff --git a/fastlib/u/nvasil/tpie/ami_matrix_pad.h b/fastlib/u/nvasil/tpie/ami_matrix_pad.h
index d3d4837b44..140dca6148 100644
--- a/fastlib/u/nvasil/tpie/ami_matrix_pad.h
+++ b/fastlib/u/nvasil/tpie/ami_matrix_pad.h
@@ -10,9 +10,9 @@
 #define _AMI_MATRIX_PAD_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 // Get definition of AMI_scan_object class.
-#include <ami_scan.h>
+#include "u/nvasil/tpie/ami_scan.h"
 
 // This is a scan management object designed to pad a rows by cols
 // matrix with zeroes so that is becomes an (i * block_extent) by (j *
diff --git a/fastlib/u/nvasil/tpie/ami_merge.h b/fastlib/u/nvasil/tpie/ami_merge.h
index 9aadf56d82..f693b2f0f0 100644
--- a/fastlib/u/nvasil/tpie/ami_merge.h
+++ b/fastlib/u/nvasil/tpie/ami_merge.h
@@ -13,12 +13,12 @@
 #define _AMI_MERGE_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 // For log() and such as needed to compute tree heights.
 #include <math.h>
 
-#include <ami_stream.h>
+#include "u/nvasil/tpie/ami_stream.h"
 
 enum AMI_merge_output_type {
     AMI_MERGE_OUTPUT_OVERWRITE = 1,
diff --git a/fastlib/u/nvasil/tpie/ami_optimized_merge.h b/fastlib/u/nvasil/tpie/ami_optimized_merge.h
index f403049ba2..b73b619c98 100644
--- a/fastlib/u/nvasil/tpie/ami_optimized_merge.h
+++ b/fastlib/u/nvasil/tpie/ami_optimized_merge.h
@@ -37,18 +37,17 @@
 #define _AMI_OPTIMIZED_MERGE_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
-
+#include "u/nvasil/tpie/portability.h"
 // For log() and such as needed to compute tree heights.
 #include <math.h>
 
 #include <assert.h>
 #include <fstream>
 
-#include <ami_stream.h>
-#include <mergeheap.h>		//For templated heaps
-#include <quicksort.h>		//For templated qsort_items
-#include <tpie_tempnam.h>
+#include "u/nvasil/tpie/ami_stream.h"
+#include "u/nvasil/tpie/mergeheap.h"		//For templated heaps
+#include "u/nvasil/tpie/quicksort.h"		//For templated qsort_items
+#include "u/nvasil/tpie/tpie_tempnam.h"
 
 typedef int AMI_merge_flag;
 typedef int arity_t;
diff --git a/fastlib/u/nvasil/tpie/ami_optimized_sort.h b/fastlib/u/nvasil/tpie/ami_optimized_sort.h
index 388a74534f..459b051287 100644
--- a/fastlib/u/nvasil/tpie/ami_optimized_sort.h
+++ b/fastlib/u/nvasil/tpie/ami_optimized_sort.h
@@ -8,14 +8,14 @@
 #define _AMI_SORT_OPTIMIZED_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 #ifndef AMI_STREAM_IMP_SINGLE
 #  warning Including __FILE__ when AMI_STREAM_IMP_SINGLE undefined.
 #endif
 
-#include <ami_merge.h>
-#include <ami_optimized_merge.h>
+#include "u/nvasil/tpie/ami_merge.h"
+#include "u/nvasil/tpie/ami_optimized_merge.h"
 
 //------------------------------------------------------------
 template<class T>
diff --git a/fastlib/u/nvasil/tpie/ami_queue.h b/fastlib/u/nvasil/tpie/ami_queue.h
index 3011e25992..a7d028d1ad 100644
--- a/fastlib/u/nvasil/tpie/ami_queue.h
+++ b/fastlib/u/nvasil/tpie/ami_queue.h
@@ -10,10 +10,10 @@
 #define _AMI_QUEUE_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 // Get the AMI_STREAM definition.
-#include <ami_stream.h>
-#include <ami_stack.h> 
+#include "u/nvasil/tpie/ami_stream.h"
+#include "u/nvasil/tpie/ami_stack.h"
 
 // Basic Implementation of I/O Efficient FIFO queue. 
 // Uses two stacks
diff --git a/fastlib/u/nvasil/tpie/ami_scan.h b/fastlib/u/nvasil/tpie/ami_scan.h
index 42a637fe80..8575c8b8f0 100644
--- a/fastlib/u/nvasil/tpie/ami_scan.h
+++ b/fastlib/u/nvasil/tpie/ami_scan.h
@@ -17,8 +17,8 @@
 #ifndef _AMI_SCAN_H
 #define _AMI_SCAN_H
 
-#include <ami_err.h>
-#include <ami_stream.h>
+#include "u/nvasil/tpie/ami_err.h"
+#include "u/nvasil/tpie/ami_stream.h"
 
 typedef int AMI_SCAN_FLAG;
 
diff --git a/fastlib/u/nvasil/tpie/ami_scan_utils.h b/fastlib/u/nvasil/tpie/ami_scan_utils.h
index c68761cc5e..57376c201f 100644
--- a/fastlib/u/nvasil/tpie/ami_scan_utils.h
+++ b/fastlib/u/nvasil/tpie/ami_scan_utils.h
@@ -12,9 +12,9 @@
 #include <iostream>
 
 // Get definitions for working with Unix and Windows.
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 // Get the AMI_scan_object definition.
-#include <ami_scan.h>
+#include "u/nvasil/tpie/ami_scan.h"
 
 // A scan object class template for reading the contents of an
 // ordinary C++ input stream into a TPIE stream.  It works with
diff --git a/fastlib/u/nvasil/tpie/ami_sort.h b/fastlib/u/nvasil/tpie/ami_sort.h
index 8e7dbf0f96..ea13e18366 100644
--- a/fastlib/u/nvasil/tpie/ami_sort.h
+++ b/fastlib/u/nvasil/tpie/ami_sort.h
@@ -9,16 +9,16 @@
 #define _AMI_SORT_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 #define CONST const
 
-#include <ami_stream.h>
+#include "u/nvasil/tpie/ami_stream.h"
 
 #ifdef AMI_STREAM_IMP_SINGLE
-#include <ami_sort_single.h>
-#include <ami_optimized_sort.h>
-#include <ami_sort_single_dh.h>
+#include "u/nvasil/tpie/ami_sort_single.h"
+#include "u/nvasil/tpie/ami_optimized_sort.h"
+#include "u/nvasil/tpie/ami_sort_single_dh.h"
 #endif
 
 #endif // _AMI_SORT_H 
diff --git a/fastlib/u/nvasil/tpie/ami_sort_single.h b/fastlib/u/nvasil/tpie/ami_sort_single.h
index b1e552bd1c..762fa9ab6a 100644
--- a/fastlib/u/nvasil/tpie/ami_sort_single.h
+++ b/fastlib/u/nvasil/tpie/ami_sort_single.h
@@ -11,18 +11,18 @@
 #define _AMI_SORT_SINGLE_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 #ifndef AMI_STREAM_IMP_SINGLE
 #  warning Including __FILE__ when AMI_STREAM_IMP_SINGLE undefined.
 #endif
 
 // For use in core by main_mem_operate().
-#include <quicksort.h>
-#include <pqueue_heap.h>
+#include "u/nvasil/tpie/quicksort.h"
+#include "u/nvasil/tpie/pqueue_heap.h"
 
-#include <ami_merge.h>
-#include <ami_optimized_merge.h>
+#include "u/nvasil/tpie/ami_merge.h"
+#include "u/nvasil/tpie/ami_optimized_merge.h"
 
 
 // A class of merge objects for merge sorting objects of type T.  We
diff --git a/fastlib/u/nvasil/tpie/ami_sort_single_dh.h b/fastlib/u/nvasil/tpie/ami_sort_single_dh.h
index 2980a93ab0..c499569401 100644
--- a/fastlib/u/nvasil/tpie/ami_sort_single_dh.h
+++ b/fastlib/u/nvasil/tpie/ami_sort_single_dh.h
@@ -39,11 +39,11 @@
 #define _AMI_SORT_SINGLE_DH_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
-#include <ami_stream.h> 
-#include <tpie_tempnam.h>
-#include <mergeheap_dh.h>  //For templated heaps
-#include <internal_sort.h> // Contains classes for sorting internal runs
+#include "u/nvasil/tpie/portability.h"
+#include "u/nvasil/tpie/ami_stream.h" 
+#include "u/nvasil/tpie/tpie_tempnam.h"
+#include "u/nvasil/tpie/mergeheap_dh.h"  //For templated heaps
+#include "u/nvasil/tpie/internal_sort.h" // Contains classes for sorting internal runs
                            // using different comparison types
 #include <math.h> //for log, ceil, etc.
 
diff --git a/fastlib/u/nvasil/tpie/ami_sparse_matrix.h b/fastlib/u/nvasil/tpie/ami_sparse_matrix.h
index 6307961d61..1d806a7df7 100644
--- a/fastlib/u/nvasil/tpie/ami_sparse_matrix.h
+++ b/fastlib/u/nvasil/tpie/ami_sparse_matrix.h
@@ -10,12 +10,12 @@
 #define AMI_SPARSE_MATRIX_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 #include <iostream>
 
 // We need dense matrices to support some sparse/dense interactions.
-#include <ami_matrix.h>
+#include "u/nvasil/tpie/ami_matrix.h"
 
 // A spares matrix element is labeled with a row er and a column ec.
 // A sparse matrix is simply represented by a colletion of these.
diff --git a/fastlib/u/nvasil/tpie/ami_stack.h b/fastlib/u/nvasil/tpie/ami_stack.h
index 5f2cb44065..32ae1788da 100644
--- a/fastlib/u/nvasil/tpie/ami_stack.h
+++ b/fastlib/u/nvasil/tpie/ami_stack.h
@@ -10,9 +10,9 @@
 #define _AMI_STACK_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 // Get the AMI_STREAM definition.
-#include <ami_stream.h>
+#include "u/nvasil/tpie/ami_stream.h"
 
 template<class T>
 class AMI_stack : public AMI_STREAM<T> {
diff --git a/fastlib/u/nvasil/tpie/ami_stream.h b/fastlib/u/nvasil/tpie/ami_stream.h
index 9699d72fde..704f0eac31 100644
--- a/fastlib/u/nvasil/tpie/ami_stream.h
+++ b/fastlib/u/nvasil/tpie/ami_stream.h
@@ -8,24 +8,24 @@
 #define _AMI_STREAM_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 #ifndef AMI_VIRTUAL_BASE
 #  define AMI_VIRTUAL_BASE 0
 #endif
 
 // include definition of VERSION macro
-#include <versions.h>
+#include "u/nvasil/tpie/versions.h"
 
 // Include the configuration header.
-#include <config.h>
+#include "u/nvasil/tpie/config.h"
 
 // Get the base class, enums, etc...
-#include <ami_err.h>
-#include <ami_stream_base.h>
+#include "u/nvasil/tpie/ami_err.h"
+#include "u/nvasil/tpie/ami_stream_base.h"
 
 // Get the device description class
-#include <ami_device.h>
+#include "u/nvasil/tpie/ami_device.h"
 
 // Get an implementation definition
 
@@ -88,7 +88,7 @@
 
 // Single BTE stream implementation.
 #if defined(AMI_STREAM_IMP_SINGLE)
-#  include <ami_stream_single.h>
+#  include "u/nvasil/tpie/ami_stream_single.h"
    // If this is the only implementation, then make it easier to get to.
 #  ifndef AMI_STREAM_IMP_MULTI_IMP
 #    define AMI_STREAM AMI_stream_single
diff --git a/fastlib/u/nvasil/tpie/ami_stream_arith.h b/fastlib/u/nvasil/tpie/ami_stream_arith.h
index af1a618380..20e1db7671 100644
--- a/fastlib/u/nvasil/tpie/ami_stream_arith.h
+++ b/fastlib/u/nvasil/tpie/ami_stream_arith.h
@@ -10,9 +10,9 @@
 #define _AMI_STREAM_ARITH_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 // Get the definition of the AMI_scan_object class.
-#include <ami_scan.h>
+#include "u/nvasil/tpie/ami_scan.h"
 
 #define SCAN_OPERATOR_DECLARATION(NAME,OP)				\
 									\
diff --git a/fastlib/u/nvasil/tpie/ami_stream_base.h b/fastlib/u/nvasil/tpie/ami_stream_base.h
index 68ab993477..fe41accc9b 100644
--- a/fastlib/u/nvasil/tpie/ami_stream_base.h
+++ b/fastlib/u/nvasil/tpie/ami_stream_base.h
@@ -10,12 +10,12 @@
 
 #define A_INLINE inline
 
-#include <tpie_assert.h>
-#include <ami_err.h>
-#include <persist.h>
+#include "u/nvasil/tpie/tpie_assert.h"
+#include "u/nvasil/tpie/ami_err.h"
+#include "u/nvasil/tpie/persist.h"
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 // AMI stream types passed to constructors
 enum AMI_stream_type {
diff --git a/fastlib/u/nvasil/tpie/ami_stream_single.h b/fastlib/u/nvasil/tpie/ami_stream_single.h
index 2e11856db1..aa1d92e227 100644
--- a/fastlib/u/nvasil/tpie/ami_stream_single.h
+++ b/fastlib/u/nvasil/tpie/ami_stream_single.h
@@ -12,7 +12,7 @@
 #define _AMI_STREAM_SINGLE_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 // [tavi] for UINT_MAX
 #include <limits.h>
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 
 // To make assertions.
-#include <tpie_assert.h>
+#include "u/nvasil/tpie/tpie_assert.h"
 #include <assert.h>
 
 // Get an appropriate BTE.  Flags may have been set to determine
@@ -34,18 +34,18 @@
 // little concern to us.  bte_stream.h and recursively included files
 // will worry about parsing the appropriate flags and getting us an
 // implementation.
-#include <bte_stream.h>
+#include "u/nvasil/tpie/bte_stream.h"
 
 // Get the AMI_stream_base class.
-#include <ami_stream_base.h>
+#include "u/nvasil/tpie/ami_stream_base.h"
 
 // Get the base memory manager. Normally the BTE will have already
 // gotten this, but in library code where we have no BTE defined, it
 // may not.
-#include <mm_base.h>
+#include "u/nvasil/tpie/mm_base.h"
 
-#include <ami_device.h>
-#include <tpie_tempnam.h>
+#include "u/nvasil/tpie/ami_device.h"
+#include "u/nvasil/tpie/tpie_tempnam.h"
 
 // An initializer class to set the default device for the
 // AMI_stream_single_base class.
diff --git a/fastlib/u/nvasil/tpie/apm_dh.h b/fastlib/u/nvasil/tpie/apm_dh.h
index dcec438b17..989891afbf 100644
--- a/fastlib/u/nvasil/tpie/apm_dh.h
+++ b/fastlib/u/nvasil/tpie/apm_dh.h
@@ -24,10 +24,10 @@
 #include <portability.h>
 
 // Includes needed from TPIE
-#include <ami_stream.h>
-#include <tpie_tempnam.h>
-#include <mergeheap_dh.h>	   //For templated heaps
-#include <quicksort.h>		//For templated qsort_items
+#include "u/nvasil/tpie/ami_stream.h"
+#include "u/nvasil/tpie/tpie_tempnam.h"
+#include "u/nvasil/tpie/mergeheap_dh.h"	   //For templated heaps
+#include "u/nvasil/tpie/quicksort.h"		//For templated qsort_items
 
 typedef int arity_t;
 
diff --git a/fastlib/u/nvasil/tpie/b_vector.h b/fastlib/u/nvasil/tpie/b_vector.h
index 06c44497ef..8b2e642e3f 100644
--- a/fastlib/u/nvasil/tpie/b_vector.h
+++ b/fastlib/u/nvasil/tpie/b_vector.h
@@ -11,7 +11,7 @@
 #define _B_VECTOR_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 #include <string.h>
 
diff --git a/fastlib/u/nvasil/tpie/bit.h b/fastlib/u/nvasil/tpie/bit.h
index 5dee9c6721..da0bb35655 100644
--- a/fastlib/u/nvasil/tpie/bit.h
+++ b/fastlib/u/nvasil/tpie/bit.h
@@ -10,7 +10,7 @@
 #define _BIT_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 #include <iostream>
 
diff --git a/fastlib/u/nvasil/tpie/bit_matrix.h b/fastlib/u/nvasil/tpie/bit_matrix.h
index 3bbb1444ac..a38ec621a6 100644
--- a/fastlib/u/nvasil/tpie/bit_matrix.h
+++ b/fastlib/u/nvasil/tpie/bit_matrix.h
@@ -10,10 +10,10 @@
 #define _BIT_MATRIX_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
-#include <bit.h>
-#include <matrix.h>
+#include "u/nvasil/tpie/bit.h"
+#include "u/nvasil/tpie/matrix.h"
 
 #include <sys/types.h>
 
diff --git a/fastlib/u/nvasil/tpie/bte_coll.h b/fastlib/u/nvasil/tpie/bte_coll.h
index 26527b4bbe..47dc656ddd 100644
--- a/fastlib/u/nvasil/tpie/bte_coll.h
+++ b/fastlib/u/nvasil/tpie/bte_coll.h
@@ -11,16 +11,16 @@
 #define _BTE_COLL_H
 
 // Get the base class and various definitions.
-#include <bte_coll_base.h>
+#include "u/nvasil/tpie/bte_coll_base.h"
 
 // The MMAP implementation.
-#include <bte_coll_mmap.h>
+#include "u/nvasil/tpie/bte_coll_mmap.h"
 
 // The UFS implementation.
-#include <bte_coll_ufs.h>
+#include "u/nvasil/tpie/bte_coll_ufs.h"
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 
 #if defined(BTE_COLLECTION_IMP_MMB)
diff --git a/fastlib/u/nvasil/tpie/bte_coll_base.h b/fastlib/u/nvasil/tpie/bte_coll_base.h
index 095b7ab583..1af3d94bc2 100644
--- a/fastlib/u/nvasil/tpie/bte_coll_base.h
+++ b/fastlib/u/nvasil/tpie/bte_coll_base.h
@@ -13,20 +13,20 @@
 #define _BTE_COLL_BASE_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 // Include the registration based memory manager.
 #define MM_IMP_REGISTER
-#include <mm.h>
+#include "u/nvasil/tpie/mm.h"
 
 // For persist.
-#include <persist.h>
+#include "u/nvasil/tpie/persist.h"
 // For BTE_stack_ufs
-#include <bte_stack_ufs.h>
+#include "u/nvasil/tpie/bte_stack_ufs.h"
 // For BTE_err.
-#include <bte_err.h>
+#include "u/nvasil/tpie/bte_err.h"
 // For class tpie_stats_collection.
-#include <tpie_stats_coll.h>
+#include "u/nvasil/tpie/tpie_stats_coll.h"
 
 // BTE_COLLECTION types passed to constructors.
 enum BTE_collection_type {
diff --git a/fastlib/u/nvasil/tpie/bte_coll_mmap.h b/fastlib/u/nvasil/tpie/bte_coll_mmap.h
index f2059f4a25..5b07ed45b9 100644
--- a/fastlib/u/nvasil/tpie/bte_coll_mmap.h
+++ b/fastlib/u/nvasil/tpie/bte_coll_mmap.h
@@ -10,9 +10,9 @@
 #define _BTE_COLL_MMAP_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 // Get the base class.
-#include <bte_coll_base.h>
+#include "u/nvasil/tpie/bte_coll_base.h"
 
 // For header's type field (77 == 'M').
 #define BTE_COLLECTION_MMAP_ID 77
diff --git a/fastlib/u/nvasil/tpie/bte_coll_ufs.h b/fastlib/u/nvasil/tpie/bte_coll_ufs.h
index ae1a7b94bb..0bc345e534 100644
--- a/fastlib/u/nvasil/tpie/bte_coll_ufs.h
+++ b/fastlib/u/nvasil/tpie/bte_coll_ufs.h
@@ -10,9 +10,9 @@
 #define _BTE_COLL_UFS_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 // Get the base class.
-#include <bte_coll_base.h>
+#include "u/nvasil/tpie/bte_coll_base.h"
 
 // For header's type field (85 == 'U').
 #define BTE_COLLECTION_UFS_ID 85
diff --git a/fastlib/u/nvasil/tpie/bte_err.h b/fastlib/u/nvasil/tpie/bte_err.h
index 393b5d8c5c..92104c9fc6 100644
--- a/fastlib/u/nvasil/tpie/bte_err.h
+++ b/fastlib/u/nvasil/tpie/bte_err.h
@@ -12,7 +12,7 @@
 #define _BTE_ERR_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 //
 // BTE error codes are returned using the BTE_err type.
diff --git a/fastlib/u/nvasil/tpie/bte_stack_ufs.h b/fastlib/u/nvasil/tpie/bte_stack_ufs.h
index 5cb2c1291f..9d27e2c3b9 100644
--- a/fastlib/u/nvasil/tpie/bte_stack_ufs.h
+++ b/fastlib/u/nvasil/tpie/bte_stack_ufs.h
@@ -13,9 +13,9 @@
 #define _BTE_STACK_UFS_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
-#include <bte_stream_ufs.h>
+#include "u/nvasil/tpie/bte_stream_ufs.h"
 
 template<class T>
 class BTE_stack_ufs : public BTE_stream_ufs<T> {
diff --git a/fastlib/u/nvasil/tpie/bte_stream.h b/fastlib/u/nvasil/tpie/bte_stream.h
index 0217b60d35..73c0b0058a 100644
--- a/fastlib/u/nvasil/tpie/bte_stream.h
+++ b/fastlib/u/nvasil/tpie/bte_stream.h
@@ -9,14 +9,14 @@
 #define _BTE_STREAM_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 #ifndef BTE_VIRTUAL_BASE
 #  define BTE_VIRTUAL_BASE 0
 #endif
 
 // Get the base class, enums, etc...
-#include <bte_stream_base.h>
+#include "u/nvasil/tpie/bte_stream_base.h"
 
 #ifdef BTE_IMP_UFS
 //	TPIE_OS_UNIX_ONLY_WARNING_USE_BTE_STREAM_IMP_UFS	
@@ -79,7 +79,7 @@
 
  // stdio implementation.
 #if defined(BTE_STREAM_IMP_STDIO)
-#  include <bte_stream_stdio.h>
+#  include "u/nvasil/tpie/bte_stream_stdio.h"
    // If this is the only implementation, then make it easier to get to.
 #  ifndef BTE_STREAM_IMP_MULTI_IMP
 #ifdef BTE_STREAM
@@ -91,7 +91,7 @@
 
  // mmap implementation.
 #if defined(BTE_STREAM_IMP_MMAP)
-#  include <bte_stream_mmap.h>
+#  include "u/nvasil/tpie/bte_stream_mmap.h"
    // If this is the only implementation, then make it easier to get to.
 #  ifndef BTE_STREAM_IMP_MULTI_IMP
 #ifdef BTE_STREAM
@@ -103,7 +103,7 @@
 
  // ufs implementation.
 #if defined(BTE_STREAM_IMP_UFS)
-#  include <bte_stream_ufs.h>
+#  include "u/nvasil/tpie/bte_stream_ufs.h"
    // If this is the only implementation, then make it easier to get to.
 #  ifndef BTE_STREAM_IMP_MULTI_IMP
 #ifdef BTE_STREAM
diff --git a/fastlib/u/nvasil/tpie/bte_stream_base.h b/fastlib/u/nvasil/tpie/bte_stream_base.h
index 13f1f0b076..3a5366a546 100644
--- a/fastlib/u/nvasil/tpie/bte_stream_base.h
+++ b/fastlib/u/nvasil/tpie/bte_stream_base.h
@@ -9,17 +9,17 @@
 #define _BTE_STREAM_BASE_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
-#include <persist.h>
+#include "u/nvasil/tpie/persist.h"
 // Get the BTE error codes.
-#include <bte_err.h>
+#include "u/nvasil/tpie/bte_err.h"
 // Get statistics definitions.
-#include <tpie_stats_stream.h>
+#include "u/nvasil/tpie/tpie_stats_stream.h"
 
 // Include the registration based memory manager.
 #define MM_IMP_REGISTER
-#include <mm.h>
+#include "u/nvasil/tpie/mm.h"
 
 // Inline commonly called functions.
 //#define B_INLINE 
diff --git a/fastlib/u/nvasil/tpie/bte_stream_cache.h b/fastlib/u/nvasil/tpie/bte_stream_cache.h
index 593f2a0613..53c15b799a 100644
--- a/fastlib/u/nvasil/tpie/bte_stream_cache.h
+++ b/fastlib/u/nvasil/tpie/bte_stream_cache.h
@@ -11,17 +11,17 @@
 #define _BTE_STREAM_CACHE_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 // Include the registration based memory manager.
 #define MM_IMP_REGISTER
-#include <mm.h>
+#include "u/nvasil/tpie/mm.h"
 
-#include <bte_stream_base.h>
+#include "u/nvasil/tpie/bte_stream_base.h"
 
 // This code makes assertions and logs errors.
-#include <tpie_assert.h>
-#include <tpie_log.h>
+#include "u/nvasil/tpie/tpie_assert.h"
+#include "u/nvasil/tpie/tpie_log.h"
 
 
 #define BTE_STREAM_CACHE_DEFAULT_MAX_LEN (1024 * 256)
diff --git a/fastlib/u/nvasil/tpie/bte_stream_mmap.h b/fastlib/u/nvasil/tpie/bte_stream_mmap.h
index 6fcb2e5792..0266286517 100644
--- a/fastlib/u/nvasil/tpie/bte_stream_mmap.h
+++ b/fastlib/u/nvasil/tpie/bte_stream_mmap.h
@@ -23,7 +23,7 @@
 #endif
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 // For header's type field (77 == 'M').
 #define BTE_STREAM_MMAP 77
diff --git a/fastlib/u/nvasil/tpie/bte_stream_stdio.h b/fastlib/u/nvasil/tpie/bte_stream_stdio.h
index 6fb2369d9e..4e916f7e12 100644
--- a/fastlib/u/nvasil/tpie/bte_stream_stdio.h
+++ b/fastlib/u/nvasil/tpie/bte_stream_stdio.h
@@ -15,8 +15,8 @@
 #include <portability.h>
 
 #include <string.h>
-#include <tpie_log.h>
-#include <tpie_assert.h>
+#include "u/nvasil/tpie/tpie_log.h"
+#include "u/nvasil/tpie/tpie_assert.h"
 #include <stddef.h>
 #include <stdio.h>
 #include <errno.h>
diff --git a/fastlib/u/nvasil/tpie/bte_stream_ufs.h b/fastlib/u/nvasil/tpie/bte_stream_ufs.h
index 87abb97107..80248441ab 100644
--- a/fastlib/u/nvasil/tpie/bte_stream_ufs.h
+++ b/fastlib/u/nvasil/tpie/bte_stream_ufs.h
@@ -25,7 +25,7 @@
 #define _BTE_STREAM_UFS_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 // For header's type field (85 == 'U').
 #define BTE_STREAM_UFS 85
@@ -65,11 +65,11 @@
 #endif
 
 // Get the BTE_stream_base class and related definitions.
-#include <bte_stream_base.h>
+#include "u/nvasil/tpie/bte_stream_base.h"
 
 // This code makes assertions and logs errors.
-#include <tpie_assert.h>
-#include <tpie_log.h>
+#include "u/nvasil/tpie/tpie_assert.h"
+#include "u/nvasil/tpie/tpie_log.h"
 
 // Define a sensible logical block factor, if not already defined.
 #ifndef  BTE_STREAM_UFS_BLOCK_FACTOR
@@ -393,7 +393,7 @@ BTE_stream_ufs < T >::BTE_stream_ufs (const char *dev_path,
 	    }
 	    if (header->block_size != BTE_STREAM_UFS_BLOCK_FACTOR * os_block_size_) {
 		TP_LOG_WARNING_ID("Stream has different block factor than the default;");
-		TP_LOG_WARNING_ID("\tStream block factor: " << (TPIE_OS_LONGLONG)header->block_size/os_block_size_);
+		//TP_LOG_WARNING_ID("\tStream block factor: " << (TPIE_OS_LONGLONG)header->block_size/os_block_size_);
 		TP_LOG_WARNING_ID("\tDefault block factor: " << BTE_STREAM_UFS_BLOCK_FACTOR);
 		TP_LOG_WARNING_ID("This may cause problems in some existing applications.");
 	    }
@@ -1368,7 +1368,7 @@ BTE_err BTE_stream_ufs < T >::unmap_current (void) {
 	    f_filelen += header->block_size;
      TPIE_OS_OFFSET bla = 0;
 	if ((bla = TPIE_OS_WRITE (fd, (char *) curr_block, header->block_size)) !=
-	     header->block_size) {
+	     (signed long long)header->block_size) {
 	    status_ = BTE_STREAM_STATUS_INVALID;
 	    os_errno = errno;
 	   TP_LOG_FATAL_ID ("write() failed to unmap current block.");
diff --git a/fastlib/u/nvasil/tpie/comparator.h b/fastlib/u/nvasil/tpie/comparator.h
index 453764f22c..2b06889e5d 100644
--- a/fastlib/u/nvasil/tpie/comparator.h
+++ b/fastlib/u/nvasil/tpie/comparator.h
@@ -12,7 +12,7 @@
 #define _COMPARATOR_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 
 // In is unlikely that users will need to directly need these classes
diff --git a/fastlib/u/nvasil/tpie/cpu_timer.h b/fastlib/u/nvasil/tpie/cpu_timer.h
index 6c53f91b64..44b809f727 100644
--- a/fastlib/u/nvasil/tpie/cpu_timer.h
+++ b/fastlib/u/nvasil/tpie/cpu_timer.h
@@ -13,7 +13,7 @@
 #define _CPU_TIMER_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 #include <iostream>
 #include <timer.h>
diff --git a/fastlib/u/nvasil/tpie/internal_sort.h b/fastlib/u/nvasil/tpie/internal_sort.h
index de8c467158..f4d8e4b993 100644
--- a/fastlib/u/nvasil/tpie/internal_sort.h
+++ b/fastlib/u/nvasil/tpie/internal_sort.h
@@ -13,8 +13,8 @@
 #define _INTERNAL_SORT_H
  
 // Get definitions for working with Unix and Windows
-#include <portability.h>
-#include <quicksort.h>
+#include "u/nvasil/tpie/portability.h"
+#include "u/nvasil/tpie/quicksort.h"
 
 // Use our quicksort, or the sort from STL
 #ifdef TPIE_USE_STL_SORT
diff --git a/fastlib/u/nvasil/tpie/lib_config.h b/fastlib/u/nvasil/tpie/lib_config.h
index 4871e11a0b..b44a877702 100644
--- a/fastlib/u/nvasil/tpie/lib_config.h
+++ b/fastlib/u/nvasil/tpie/lib_config.h
@@ -8,19 +8,19 @@
 #ifndef _LIB_CONFIG_H
 #define _LIB_CONFIG_H
 
-#include <config.h>
+#include "u/nvasil/tpie/config.h"
 
 // Use logs if requested.
 #if TP_LOG_LIB
 #define TPL_LOGGING 1
 #endif
-#include <tpie_log.h>
+#include "u/nvasil/tpie/tpie_log.h"
 
 // Enable assertions if requested.
 #if TP_ASSERT_LIB
 #define DEBUG_ASSERTIONS 1
 #endif
-#include <tpie_assert.h>
+#include "u/nvasil/tpie/tpie_assert.h"
 
 
 #endif // _LIB_CONFIG_H 
diff --git a/fastlib/u/nvasil/tpie/logstream.h b/fastlib/u/nvasil/tpie/logstream.h
index 1492bc14d5..f8380ff05c 100644
--- a/fastlib/u/nvasil/tpie/logstream.h
+++ b/fastlib/u/nvasil/tpie/logstream.h
@@ -11,7 +11,7 @@
 #define _LOGSTREAM_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 // For size_t
 #include <sys/types.h>
diff --git a/fastlib/u/nvasil/tpie/matrix.h b/fastlib/u/nvasil/tpie/matrix.h
index 976aae363e..a066251ec6 100644
--- a/fastlib/u/nvasil/tpie/matrix.h
+++ b/fastlib/u/nvasil/tpie/matrix.h
@@ -10,11 +10,11 @@
 #define MATRIX_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 #include <iostream>
 
-#include <tpie_assert.h>
+#include "u/nvasil/tpie/tpie_assert.h"
 
 
 // Enable exceptions if the compiler supports them.
diff --git a/fastlib/u/nvasil/tpie/mergeheap.h b/fastlib/u/nvasil/tpie/mergeheap.h
index 99bac418a4..f3274753b4 100644
--- a/fastlib/u/nvasil/tpie/mergeheap.h
+++ b/fastlib/u/nvasil/tpie/mergeheap.h
@@ -16,7 +16,7 @@
 #define _MERGE_HEAP_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/fastlib/u/nvasil/tpie/mergeheap_dh.h b/fastlib/u/nvasil/tpie/mergeheap_dh.h
index bb3080570c..e1b418e929 100644
--- a/fastlib/u/nvasil/tpie/mergeheap_dh.h
+++ b/fastlib/u/nvasil/tpie/mergeheap_dh.h
@@ -41,7 +41,7 @@
 #define _MERGE_HEAP_DH_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 // Macros for left and right.
 #define Left(i)   2*(i)
diff --git a/fastlib/u/nvasil/tpie/mm.h b/fastlib/u/nvasil/tpie/mm.h
index 31fbf520c9..ae68b43fc3 100644
--- a/fastlib/u/nvasil/tpie/mm.h
+++ b/fastlib/u/nvasil/tpie/mm.h
@@ -10,16 +10,16 @@
 #define _MM_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 // Get the base class, enums, etc...
-#include <mm_base.h>
+#include "u/nvasil/tpie/mm_base.h"
 
 // Get an implementation definition
 
 // For now only single address space memory management is supported.
 #ifdef MM_IMP_REGISTER
-#include <mm_register.h>
+#include "u/nvasil/tpie/mm_register.h"
 #else
 #error No MM implementation selected.
 #endif
diff --git a/fastlib/u/nvasil/tpie/mm_base.h b/fastlib/u/nvasil/tpie/mm_base.h
index 18dd507a44..b4fd778a17 100644
--- a/fastlib/u/nvasil/tpie/mm_base.h
+++ b/fastlib/u/nvasil/tpie/mm_base.h
@@ -10,7 +10,7 @@
 #define _MM_BASE_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 #include <sys/types.h>
 
diff --git a/fastlib/u/nvasil/tpie/mm_register.h b/fastlib/u/nvasil/tpie/mm_register.h
index 3688e15768..4054759e7f 100644
--- a/fastlib/u/nvasil/tpie/mm_register.h
+++ b/fastlib/u/nvasil/tpie/mm_register.h
@@ -10,7 +10,7 @@
 #define _MM_REGISTER_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 #define MM_REGISTER_VERSION 2
 
diff --git a/fastlib/u/nvasil/tpie/persist.h b/fastlib/u/nvasil/tpie/persist.h
index 043fa26c26..d93da36b2b 100644
--- a/fastlib/u/nvasil/tpie/persist.h
+++ b/fastlib/u/nvasil/tpie/persist.h
@@ -12,7 +12,7 @@
 #define _PERSIST_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 enum persistence {
     // Delete the stream from the disk when it is destructed.
diff --git a/fastlib/u/nvasil/tpie/portability.h b/fastlib/u/nvasil/tpie/portability.h
index 63cdf2f664..3f8d424e43 100644
--- a/fastlib/u/nvasil/tpie/portability.h
+++ b/fastlib/u/nvasil/tpie/portability.h
@@ -152,7 +152,7 @@ using namespace std;
 #include <sys/resource.h>	
 #endif
 
-#include <bte_err.h>
+#include "u/nvasil/tpie/bte_err.h"
 
 //		Get functions for mapping			//
 #ifdef _WIN32
@@ -384,7 +384,7 @@ typedef TPIE_OS_OFFSET TPIE_BLOCK_ID_TYPE;
 #endif
 
 // for ANSI conform arrays.
-#include <vararray.h>
+#include "u/nvasil/tpie/vararray.h"
 
 //////////////////////////////////////////////
 // functions				    //
diff --git a/fastlib/u/nvasil/tpie/pqueue_heap.h b/fastlib/u/nvasil/tpie/pqueue_heap.h
index 44b54afe89..7996d296af 100644
--- a/fastlib/u/nvasil/tpie/pqueue_heap.h
+++ b/fastlib/u/nvasil/tpie/pqueue_heap.h
@@ -13,7 +13,7 @@
 #define _PQUEUE_HEAP_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 // The virtual base class that defines what priority queues must do.
 template <class T, class P>
diff --git a/fastlib/u/nvasil/tpie/quicksort.h b/fastlib/u/nvasil/tpie/quicksort.h
index 65fbe8708b..b9dce8dc40 100644
--- a/fastlib/u/nvasil/tpie/quicksort.h
+++ b/fastlib/u/nvasil/tpie/quicksort.h
@@ -13,7 +13,7 @@
 #define _QUICKSORT_H
  
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 //A simple class that facilitates doing key sorting followed 
 //by in-memory permuting to sort items in-memory. This is 
diff --git a/fastlib/u/nvasil/tpie/stdio_stack.h b/fastlib/u/nvasil/tpie/stdio_stack.h
index 602a2b4275..4b7bb144d6 100644
--- a/fastlib/u/nvasil/tpie/stdio_stack.h
+++ b/fastlib/u/nvasil/tpie/stdio_stack.h
@@ -18,9 +18,9 @@
 #define _STDIO_STACK_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
-#include <bte_stream_stdio.h>
+#include "u/nvasil/tpie/bte_stream_stdio.h"
 
 template<class T>
 class stdio_stack : public BTE_stream_stdio<T> {
diff --git a/fastlib/u/nvasil/tpie/timer.h b/fastlib/u/nvasil/tpie/timer.h
index 185a2095e5..1d2e68eec8 100644
--- a/fastlib/u/nvasil/tpie/timer.h
+++ b/fastlib/u/nvasil/tpie/timer.h
@@ -12,7 +12,7 @@
 #define _TIMER_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 class timer {
 public:
diff --git a/fastlib/u/nvasil/tpie/tpie_assert.h b/fastlib/u/nvasil/tpie/tpie_assert.h
index 07ea34133a..99a68b4f41 100644
--- a/fastlib/u/nvasil/tpie/tpie_assert.h
+++ b/fastlib/u/nvasil/tpie/tpie_assert.h
@@ -11,9 +11,9 @@
 #define _TPIE_ASSERT_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
-#include <tpie_log.h>
+#include "u/nvasil/tpie/tpie_log.h"
 #include <assert.h>
 #include <iostream>
 
diff --git a/fastlib/u/nvasil/tpie/tpie_log.h b/fastlib/u/nvasil/tpie/tpie_log.h
index 9d5ef2c4f0..6f13db3832 100644
--- a/fastlib/u/nvasil/tpie/tpie_log.h
+++ b/fastlib/u/nvasil/tpie/tpie_log.h
@@ -21,9 +21,9 @@ enum TPIE_LOG_LEVEL {
 
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
-#include <logstream.h>
+#include "u/nvasil/tpie/logstream.h"
 
 // The file name of the log stream.
 char *tpie_log_name();
diff --git a/fastlib/u/nvasil/tpie/tpie_stats.h b/fastlib/u/nvasil/tpie/tpie_stats.h
index f808a921be..5da081a8fa 100644
--- a/fastlib/u/nvasil/tpie/tpie_stats.h
+++ b/fastlib/u/nvasil/tpie/tpie_stats.h
@@ -11,7 +11,7 @@
 #define _TPIE_STATS_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 template<int C>
 class tpie_stats {
diff --git a/fastlib/u/nvasil/tpie/tpie_stats_coll.h b/fastlib/u/nvasil/tpie/tpie_stats_coll.h
index f9d0da07b2..18de916c09 100644
--- a/fastlib/u/nvasil/tpie/tpie_stats_coll.h
+++ b/fastlib/u/nvasil/tpie/tpie_stats_coll.h
@@ -11,9 +11,9 @@
 #define _TPIE_STATS_COLL_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
-#include <tpie_stats.h>
+#include "u/nvasil/tpie/tpie_stats.h"
 
 #define TPIE_STATS_COLLECTION_COUNT 9
 enum TPIE_STATS_COLLECTION {
diff --git a/fastlib/u/nvasil/tpie/tpie_stats_stream.h b/fastlib/u/nvasil/tpie/tpie_stats_stream.h
index 893a6b8670..1e2e0bf873 100644
--- a/fastlib/u/nvasil/tpie/tpie_stats_stream.h
+++ b/fastlib/u/nvasil/tpie/tpie_stats_stream.h
@@ -10,9 +10,9 @@
 #define _TPIE_STATS_STREAM_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
-#include <tpie_stats.h>
+#include "u/nvasil/tpie/tpie_stats.h"
 
 #define TPIE_STATS_STREAM_COUNT 11
 enum TPIE_STATS_STREAM {
diff --git a/fastlib/u/nvasil/tpie/tpie_stats_tree.h b/fastlib/u/nvasil/tpie/tpie_stats_tree.h
index 2db33265fb..0e5909457f 100644
--- a/fastlib/u/nvasil/tpie/tpie_stats_tree.h
+++ b/fastlib/u/nvasil/tpie/tpie_stats_tree.h
@@ -10,9 +10,9 @@
 #define _TPIE_STATS_TREE_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
-#include <tpie_stats.h>
+#include "u/nvasil/tpie/tpie_stats.h"
 
 #define TPIE_STATS_TREE_COUNT 14
 enum TPIE_STATS_TREE {
diff --git a/fastlib/u/nvasil/tpie/tpie_tempnam.h b/fastlib/u/nvasil/tpie/tpie_tempnam.h
index 6708001406..bb00534024 100644
--- a/fastlib/u/nvasil/tpie/tpie_tempnam.h
+++ b/fastlib/u/nvasil/tpie/tpie_tempnam.h
@@ -10,7 +10,7 @@
 #define _TPIE_TEMPNAM_H
 
 // Get definitions for working with Unix and Windows
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 // The name of the environment variable pointing to a tmp directory.
 #define TMPDIR_ENV "TMPDIR"
diff --git a/fastlib/u/nvasil/tpie/vararray.h b/fastlib/u/nvasil/tpie/vararray.h
index 671efe9bd4..ad0145def7 100644
--- a/fastlib/u/nvasil/tpie/vararray.h
+++ b/fastlib/u/nvasil/tpie/vararray.h
@@ -12,7 +12,7 @@
 #ifndef _VARARRAY_H
 #define _VARARRAY_H
 
-#include <portability.h>
+#include "u/nvasil/tpie/portability.h"
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/fastlib/u/nvasil/tpie/versions.h b/fastlib/u/nvasil/tpie/versions.h
index ebfd0596eb..1687926f6b 100644
--- a/fastlib/u/nvasil/tpie/versions.h
+++ b/fastlib/u/nvasil/tpie/versions.h
@@ -16,6 +16,6 @@
 #define _VERSIONS_H
 
 // Get definitions for working with Unix and Windows
-#include "portability.h"
+#include "u/nvasil/tpie/portability.h"
 
 #endif // _VERSIONS_H