diff --git a/build/bootstrap b/build/bootstrap
index 56b9119ca..d593d670a 100755
--- a/build/bootstrap
+++ b/build/bootstrap
@@ -6,10 +6,9 @@
 # following a git checkout.  It copies static files and shared include
 # files to the export tree prior to building the software.
 
+set -e
+
 mkdir -p export/{include,lib,etc,share,bin,sbin,post,mysql}
-if [ ! $$ ]; then
-    exit 1
-fi
 
 #TODO: these prebuilt binaries may need to be fetched
 #and built as dependencies
@@ -32,10 +31,6 @@ cp dbcon/mysql/install_calpont_mysql.sh export/mysql/ && \
 cp dbcon/mysql/my.cnf export/mysql/ && \
 cp dbcon/mysql/mysql-Columnstore export/mysql/
 
-if [ ! $$ ]; then
-    exit 1
-fi
-
 cp -p -r utils/net-snmp export/include
 
 #FIXME: 
@@ -59,57 +54,29 @@ cp -p -r utils/net-snmp export/include
 ## 		cp -p utils/net-snmp-built-libs/fc6bin/* export/sbin
 ## 	fi
 ## fi
-
-## pushd export/lib >/dev/null
-## for lib in libnetsnmpagent.so libnetsnmphelpers.so libnetsnmpmibs.so libnetsnmp.so libnetsnmptrapd.so; do
-## 	rm -f ${lib} ${lib}.5
-## 	ln -s ${lib}.5.2.1 ${lib}.5
-## 	ln -s ${lib}.5.2.1 ${lib}
-## done
-## popd >/dev/null
+d=utils/net-snmp-built-libs/lib64
+for lib in libnetsnmpagent.so libnetsnmphelpers.so libnetsnmpmibs.so libnetsnmp.so libnetsnmptrapd.so; do
+	ln -svf $lib.5.2.1 $d/$lib
+done
 
 #FIXME:
 #This is not going to update the version in configure.ac
 echo Generating version header
 ./build/genVersion.sh
-if [ ! $$ ]; then
-  exit 1
-fi
 
 echo Running GNU autotools to generate build environment
 aclocal 
-if [ ! $$ ]; then
-  exit 1
-fi
 autoconf
-if [ ! $$ ]; then
-  exit 1
-fi
 autoheader
-if [ ! $$ ]; then
-  exit 1
-fi
 libtoolize
-if [ ! $$ ]; then
-  exit 1
-fi
 automake --add-missing
-if [ ! $$ ]; then
-  exit 1
-fi
 autoreconf
-if [ ! $$ ]; then
-  exit 1
-fi
 
 echo GNU autotools environment generation completed successfully
 
 echo Configuring MariaDB ColumnStore
 
 ./configure 
-if [ ! $$ ]; then
-  exit 1
-fi
 
 #for x in \
 #$(find . -name '[mM]akefile' \
diff --git a/configure.ac b/configure.ac
index 087e484cd..7f1fc6b21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -159,15 +159,15 @@ AC_SUBST([mysqldir], ['${idbinstall}/mysql'])
 AC_SUBST([mibdir], ['${idbinstall}/share/snmp/mibs'])
 AC_SUBST([toolsdir], ['${idbinstall}/tools'])
 
-AC_SUBST([netsnmp_libs], ['-lnetsnmpmibs -lnetsnmpagent -lnetsnmp -lnetsnmpmibs -lnetsnmphelpers'])
+AC_SUBST([netsnmp_libs], ['-L${abs_top_builddir}/utils/net-snmp-built-libs/lib64 -lnetsnmpmibs -lnetsnmpagent -lnetsnmp -lnetsnmpmibs -lnetsnmphelpers'])
 
-AC_SUBST([idb_common_libs], ['-lmessageqcpp -lloggingcpp -lconfigcpp -lidbboot -lxml2 -lpthread -lrt'])
-AC_SUBST([idb_oam_libs], ['-loamcpp -lsnmpmanager ${netsnmp_libs}'])
-AC_SUBST([idb_brm_libs], ['-lbrm -lidbdatafile -lcacheutils -lrwlock ${idb_oam_libs} ${idb_common_libs}'])
-AC_SUBST([idb_exec_libs], ['-ljoblist -lexecplan -lwindowfunction -ljoiner -lrowgroup -lfuncexp -ludfsdk -ldataconvert -lcommon -lcompress -lmysqlcl_idb -lquerystats -lquerytele -lthrift -lthreadpool ${idb_brm_libs}'])
+AC_SUBST([idb_common_libs], ['${abs_top_builddir}/utils/messageqcpp/libmessageqcpp.la ${abs_top_builddir}/utils/loggingcpp/libloggingcpp.la ${abs_top_builddir}/utils/configcpp/libconfigcpp.la ${abs_top_builddir}/utils/startup/libidbboot.a -lxml2 -lpthread -lrt'])
+AC_SUBST([idb_oam_libs], ['${abs_top_builddir}/oam/oamcpp/liboamcpp.la ${abs_top_builddir}/snmpd/snmpmanager/libsnmpmanager.la ${netsnmp_libs}'])
+AC_SUBST([idb_brm_libs], ['${abs_top_builddir}/versioning/BRM/libbrm.la ${abs_top_builddir}/utils/idbdatafile/libidbdatafile.la ${abs_top_builddir}/utils/cacheutils/libcacheutils.la ${abs_top_builddir}/utils/rwlock/librwlock.la ${idb_oam_libs} ${idb_common_libs}'])
+AC_SUBST([idb_exec_libs], ['${abs_top_builddir}/dbcon/joblist/libjoblist.la ${abs_top_builddir}/dbcon/execplan/libexecplan.la ${abs_top_builddir}/utils/windowfunction/libwindowfunction.la ${abs_top_builddir}/utils/joiner/libjoiner.la ${abs_top_builddir}/utils/rowgroup/librowgroup.la ${abs_top_builddir}/utils/funcexp/libfuncexp.la ${abs_top_builddir}/utils/udfsdk/libudfsdk.la ${abs_top_builddir}/utils/dataconvert/libdataconvert.la ${abs_top_builddir}/utils/common/libcommon.la ${abs_top_builddir}/utils/compress/libcompress.la ${abs_top_builddir}/utils/mysqlcl_idb/libmysqlcl_idb.la ${abs_top_builddir}/utils/querystats/libquerystats.la ${abs_top_builddir}/utils/querytele/libquerytele.la ${abs_top_builddir}/utils/thrift/libthrift.la ${abs_top_builddir}/utils/threadpool/libthreadpool.la ${idb_brm_libs}'])
 AC_SUBST([idb_write_libs], ['-lddlpackageproc -lddlpackage -ldmlpackageproc -ldmlpackage -lwriteengine -lwriteengineclient -lidbdatafile -lcacheutils ${idb_exec_libs}'])
-AC_SUBST([idb_common_includes], ['-I/usr/local/include -I/usr/local/include/libxml2 -I/usr/include/libxml2 -I ${abs_top_builddir}/snmpd -I ${abs_top_builddir}/snmpd/snmpmanager -I ${abs_top_builddir}/snmpd/etc -I ${abs_top_builddir}/decomsvr -I ${abs_top_builddir}/procmgr -I ${abs_top_builddir}/oam -I ${abs_top_builddir}/oam/post -I ${abs_top_builddir}/oam/oamcpp -I ${abs_top_builddir}/oam/cloud -I ${abs_top_builddir}/oam/install_scripts -I ${abs_top_builddir}/oam/etc -I ${abs_top_builddir}/oam/replaytxnlog -I ${abs_top_builddir}/dmlproc -I ${abs_top_builddir}/tools -I ${abs_top_builddir}/tools/pingproc -I ${abs_top_builddir}/tools/fixdate -I ${abs_top_builddir}/tools/qfe -I ${abs_top_builddir}/tools/brmtest -I ${abs_top_builddir}/tools/clearShm -I ${abs_top_builddir}/tools/sendPlan -I ${abs_top_builddir}/tools/valprint -I ${abs_top_builddir}/tools/editem -I ${abs_top_builddir}/tools/cplogger -I ${abs_top_builddir}/tools/cfread -I ${abs_top_builddir}/tools/setConfig -I ${abs_top_builddir}/tools/reserveStacks -I ${abs_top_builddir}/tools/idbmeminfo -I ${abs_top_builddir}/tools/rebuildEM -I ${abs_top_builddir}/tools/hdfsCheck -I ${abs_top_builddir}/tools/idb_comp -I ${abs_top_builddir}/tools/dmldriver -I ${abs_top_builddir}/tools/configMgt -I ${abs_top_builddir}/tools/getConfig -I ${abs_top_builddir}/tools/ddlcleanup -I ${abs_top_builddir}/tools/cleartablelock -I ${abs_top_builddir}/tools/evalidx -I ${abs_top_builddir}/tools/bincvt -I ${abs_top_builddir}/tools/vbgen -I ${abs_top_builddir}/tools/updateGenii -I ${abs_top_builddir}/tools/dbloadxml -I ${abs_top_builddir}/tools/notificationTester -I ${abs_top_builddir}/tools/dbbuilder -I ${abs_top_builddir}/tools/dbbuilder/srcdata -I ${abs_top_builddir}/tools/viewtablelock -I ${abs_top_builddir}/tools/snconvert -I ${abs_top_builddir}/tools/ddldriver -I ${abs_top_builddir}/build -I ${abs_top_builddir}/versioning -I ${abs_top_builddir}/versioning/BRM -I ${abs_top_builddir}/utils -I ${abs_top_builddir}/utils/configcpp -I ${abs_top_builddir}/utils/configcpp/md5 -I ${abs_top_builddir}/utils/joiner -I ${abs_top_builddir}/utils/idbdatafile -I ${abs_top_builddir}/utils/startup -I ${abs_top_builddir}/utils/common -I ${abs_top_builddir}/utils/mysqlcl_idb -I ${abs_top_builddir}/utils/mysqlcl_idb/libdrizzle-2.0 -I ${abs_top_builddir}/utils/windowfunction -I ${abs_top_builddir}/utils/udfsdk -I ${abs_top_builddir}/utils/testbc -I ${abs_top_builddir}/utils/infinidb_hadoop -I ${abs_top_builddir}/utils/infinidb_hadoop/src -I ${abs_top_builddir}/utils/infinidb_hadoop/src/infinidb -I ${abs_top_builddir}/utils/infinidb_hadoop/src/infinidb/hadoop -I ${abs_top_builddir}/utils/infinidb_hadoop/src/infinidb/hadoop/db -I ${abs_top_builddir}/utils/infinidb_hadoop/src/infinidb/hadoop/example -I ${abs_top_builddir}/utils/loggingcpp -I ${abs_top_builddir}/utils/compress -I ${abs_top_builddir}/utils/idbhdfs -I ${abs_top_builddir}/utils/idbhdfs/hdfs-20 -I ${abs_top_builddir}/utils/idbhdfs/hdfs-12 -I ${abs_top_builddir}/utils/idbhdfs/hdfs-shared -I ${abs_top_builddir}/utils/batchloader -I ${abs_top_builddir}/utils/threadpool -I ${abs_top_builddir}/utils/jemalloc -I ${abs_top_builddir}/utils/dataconvert -I ${abs_top_builddir}/utils/messageqcpp -I ${abs_top_builddir}/utils/libxml -I ${abs_top_builddir}/utils/libxml/libxml -I ${abs_top_builddir}/utils/ddlcleanup -I ${abs_top_builddir}/utils/querystats -I ${abs_top_builddir}/utils/autoconf -I ${abs_top_builddir}/utils/autoconf/m4 -I ${abs_top_builddir}/utils/multicast -I ${abs_top_builddir}/utils/rowgroup -I ${abs_top_builddir}/utils/scenarios -I ${abs_top_builddir}/utils/scenarios/common -I ${abs_top_builddir}/utils/scenarios/common/sh -I ${abs_top_builddir}/utils/scenarios/common/sql -I ${abs_top_builddir}/utils/scenarios/common/sql/testResultTables -I ${abs_top_builddir}/utils/scenarios/perf -I ${abs_top_builddir}/utils/scenarios/perf/sh -I ${abs_top_builddir}/utils/scenarios/perf/source -I ${abs_top_builddir}/utils/scenarios/perf/source/iteration17queries -I ${abs_top_builddir}/utils/scenarios/perf/source/iteration17queries/Group3 -I ${abs_top_builddir}/utils/scenarios/perf/source/iteration17queries/Deferred -I ${abs_top_builddir}/utils/scenarios/perf/source/iteration17queries/Group2 -I ${abs_top_builddir}/utils/scenarios/perf/source/iteration17queries/special -I ${abs_top_builddir}/utils/scenarios/perf/source/iteration17queries/Group5 -I ${abs_top_builddir}/utils/scenarios/perf/source/iteration17queries/Group4 -I ${abs_top_builddir}/utils/scenarios/perf/source/iteration17queries/Group1 -I ${abs_top_builddir}/utils/scenarios/perf/source/pf -I ${abs_top_builddir}/utils/scenarios/perf/source/pf/common -I ${abs_top_builddir}/utils/scenarios/perf/source/pf/fm -I ${abs_top_builddir}/utils/scenarios/perf/source/pf/scripts -I ${abs_top_builddir}/utils/scenarios/perf/testcase -I ${abs_top_builddir}/utils/scenarios/perf/test -I ${abs_top_builddir}/utils/scenarios/perf/setup -I ${abs_top_builddir}/utils/scenarios/perf/sql -I ${abs_top_builddir}/utils/scenarios/perf/sql/201 -I ${abs_top_builddir}/utils/scenarios/perf/sql/3 -I ${abs_top_builddir}/utils/scenarios/perf/sql/105 -I ${abs_top_builddir}/utils/scenarios/perf/sql/200 -I ${abs_top_builddir}/utils/scenarios/perf/sql/204 -I ${abs_top_builddir}/utils/scenarios/perf/sql/107 -I ${abs_top_builddir}/utils/scenarios/perf/sql/103 -I ${abs_top_builddir}/utils/scenarios/perf/sql/1 -I ${abs_top_builddir}/utils/scenarios/perf/sql/106 -I ${abs_top_builddir}/utils/scenarios/perf/sql/101 -I ${abs_top_builddir}/utils/scenarios/perf/sql/5 -I ${abs_top_builddir}/utils/scenarios/perf/sql/112 -I ${abs_top_builddir}/utils/scenarios/perf/sql/110 -I ${abs_top_builddir}/utils/scenarios/perf/sql/202 -I ${abs_top_builddir}/utils/scenarios/perf/sql/109 -I ${abs_top_builddir}/utils/scenarios/perf/sql/104 -I ${abs_top_builddir}/utils/scenarios/perf/sql/302 -I ${abs_top_builddir}/utils/scenarios/perf/sql/301 -I ${abs_top_builddir}/utils/scenarios/perf/sql/111 -I ${abs_top_builddir}/utils/scenarios/perf/sql/102 -I ${abs_top_builddir}/utils/scenarios/perf/sql/6 -I ${abs_top_builddir}/utils/scenarios/perf/sql/303 -I ${abs_top_builddir}/utils/scenarios/perf/sql/203 -I ${abs_top_builddir}/utils/scenarios/perf/sql/300 -I ${abs_top_builddir}/utils/scenarios/perf/sql/2 -I ${abs_top_builddir}/utils/scenarios/perf/sql/4 -I ${abs_top_builddir}/utils/scenarios/perf/sql/108 -I ${abs_top_builddir}/utils/scenarios/perf/data -I ${abs_top_builddir}/utils/scenarios/dwweek -I ${abs_top_builddir}/utils/scenarios/dwweek/testcase -I ${abs_top_builddir}/utils/scenarios/dwweek/test -I ${abs_top_builddir}/utils/scenarios/dwweek/data -I ${abs_top_builddir}/utils/funcexp -I ${abs_top_builddir}/utils/funcexp/utf8 -I ${abs_top_builddir}/utils/rwlock -I ${abs_top_builddir}/utils/querytele -I ${abs_top_builddir}/utils/thrift -I ${abs_top_builddir}/utils/thrift/thrift -I ${abs_top_builddir}/utils/thrift/thrift/processor -I ${abs_top_builddir}/utils/thrift/thrift/concurrency -I ${abs_top_builddir}/utils/thrift/thrift/qt -I ${abs_top_builddir}/utils/thrift/thrift/async -I ${abs_top_builddir}/utils/thrift/thrift/server -I ${abs_top_builddir}/utils/thrift/thrift/protocol -I ${abs_top_builddir}/utils/thrift/thrift/transport -I ${abs_top_builddir}/utils/prat -I ${abs_top_builddir}/utils/cacheutils -I ${abs_top_builddir}/exemgr -I ${abs_top_builddir}/dbcon -I ${abs_top_builddir}/dbcon/dmlpackage -I ${abs_top_builddir}/dbcon/dmlpackage/sql -I ${abs_top_builddir}/dbcon/mysql -I ${abs_top_builddir}/dbcon/execplan -I ${abs_top_builddir}/dbcon/joblist -I ${abs_top_builddir}/dbcon/ddlpackage -I ${abs_top_builddir}/dbcon/ddlpackage/sql -I ${abs_top_builddir}/dbcon/ddlpackage/sql/examples -I ${abs_top_builddir}/dbcon/dmlpackageproc -I ${abs_top_builddir}/dbcon/ddlpackageproc -I ${abs_top_builddir}/dbcon/doc -I ${abs_top_builddir}/dbcon/doc/oraclexplan -I ${abs_top_builddir}/dbcon/doc/100GB_stream0 -I ${abs_top_builddir}/dbcon/ingres -I ${abs_top_builddir}/procmon -I ${abs_top_builddir}/oamapps -I ${abs_top_builddir}/oamapps/serverMonitor -I ${abs_top_builddir}/oamapps/columnstoreDB -I ${abs_top_builddir}/oamapps/sessionWalker -I ${abs_top_builddir}/oamapps/resourceMonitor -I ${abs_top_builddir}/oamapps/postConfigure -I ${abs_top_builddir}/oamapps/calpontConsole -I ${abs_top_builddir}/oamapps/columnstoreSupport -I ${abs_top_builddir}/oamapps/calpont-console -I ${abs_top_builddir}/oamapps/replayTransactionLog -I ${abs_top_builddir}/oamapps/sendtrap -I ${abs_top_builddir}/oamapps/traphandler -I ${abs_top_builddir}/oamapps/calpontSupport -I ${abs_top_builddir}/oamapps/calpontSupport/analytics -I ${abs_top_builddir}/oamapps/mcsadmin -I ${abs_top_builddir}/oamapps/hardwareMonitor -I ${abs_top_builddir}/oamapps/calpontDB -I ${abs_top_builddir}/ddlproc -I ${abs_top_builddir}/primitives -I ${abs_top_builddir}/primitives/blockcache -I ${abs_top_builddir}/primitives/primproc -I ${abs_top_builddir}/primitives/linux-port -I ${abs_top_builddir}/writeengine -I ${abs_top_builddir}/writeengine/redistribute -I ${abs_top_builddir}/writeengine/build -I ${abs_top_builddir}/writeengine/dictionary -I ${abs_top_builddir}/writeengine/client -I ${abs_top_builddir}/writeengine/bulk -I ${abs_top_builddir}/writeengine/xml -I ${abs_top_builddir}/writeengine/server -I ${abs_top_builddir}/writeengine/index -I ${abs_top_builddir}/writeengine/shared -I ${abs_top_builddir}/writeengine/splitter -I ${abs_top_builddir}/writeengine/wrapper -I ${abs_top_builddir}/utils/boost_idb '])
-AC_SUBST([idb_common_ldflags], ['-L${idbinstall}/lib -L/usr/local/lib'])
+AC_SUBST([idb_common_includes], ['-I${abs_top_builddir}/utils/libxml -I${abs_top_builddir}/utils/messageqcpp -I${abs_top_builddir}/writeengine/shared -I${abs_top_builddir}/utils/idbdatafile -I${abs_top_builddir}/utils/loggingcpp -I${abs_top_builddir}/utils/configcpp -I${abs_top_builddir}/utils/compress -I${abs_top_builddir}/versioning/BRM -I${abs_top_builddir}/utils/rowgroup -I${abs_top_builddir}/utils/common -I${abs_top_builddir}/utils/dataconvert -I${abs_top_builddir}/utils/rwlock -I${abs_top_builddir}/utils/funcexp -I${abs_top_builddir}/snmpd/snmpmanager -I${abs_top_builddir}/utils -I${abs_top_builddir}/oam/oamcpp -I${abs_top_builddir}/dbcon/ddlpackageproc -I${abs_top_builddir}/dbcon/ddlpackage -I${abs_top_builddir}/dbcon/execplan -I${abs_top_builddir}/utils/startup -I${abs_top_builddir}/dbcon/joblist -I${abs_top_builddir}/writeengine/wrapper -I${abs_top_builddir}/utils/cacheutils -I${abs_top_builddir}/utils/mysqlcl_idb -I${abs_top_builddir}/utils/querytele -I${abs_top_builddir}/utils/boost_idb -I${abs_top_builddir}/utils/thrift -I${abs_top_builddir}/utils/joiner -I${abs_top_builddir}/utils/querystats'])
+AC_SUBST([idb_common_ldflags], [''])
 
 AC_CONFIG_FILES([
 	Makefile
diff --git a/dbcon/ddlpackageproc/ddlpackageprocessor.h b/dbcon/ddlpackageproc/ddlpackageprocessor.h
index 9e72d4619..4706bd342 100644
--- a/dbcon/ddlpackageproc/ddlpackageprocessor.h
+++ b/dbcon/ddlpackageproc/ddlpackageprocessor.h
@@ -44,7 +44,7 @@
 #include "we_define.h"
 #include "writeengine.h"
 #include "columnresult.h"
-#include "we_clients.h"
+#include "../../writeengine/client/we_clients.h"
 #include "liboamcpp.h"
 
 #if defined(_MSC_VER) && defined(DDLPKGPROC_DLLEXPORT)
diff --git a/dbcon/dmlpackageproc/dmlpackageprocessor.h b/dbcon/dmlpackageproc/dmlpackageprocessor.h
index 5751dcb46..2b93c1300 100644
--- a/dbcon/dmlpackageproc/dmlpackageprocessor.h
+++ b/dbcon/dmlpackageproc/dmlpackageprocessor.h
@@ -38,7 +38,7 @@
 #include "sessionmanager.h"
 #include "distributedenginecomm.h"
 #include "brmtypes.h"
-#include "we_clients.h"
+#include "../../writeengine/client/we_clients.h"
 #include "liboamcpp.h"
 #include "oamcache.h"
 #include "querystats.h"
diff --git a/dbcon/execplan/calpontsystemcatalog.h b/dbcon/execplan/calpontsystemcatalog.h
index c382c3e50..c14cbd607 100644
--- a/dbcon/execplan/calpontsystemcatalog.h
+++ b/dbcon/execplan/calpontsystemcatalog.h
@@ -39,7 +39,7 @@
 #include <iosfwd>
 #include <limits>
 
-#include "we_typeext.h"
+#include "../../writeengine/shared/we_typeext.h"
 #include "columnresult.h"
 #include "bytestream.h"
 #include "joblisttypes.h"
diff --git a/dbcon/execplan/simplecolumn.cpp b/dbcon/execplan/simplecolumn.cpp
index 2799c05e1..bfbf96a2c 100644
--- a/dbcon/execplan/simplecolumn.cpp
+++ b/dbcon/execplan/simplecolumn.cpp
@@ -49,7 +49,7 @@ using namespace joblist;
 #include "simplefilter.h"
 #include "aggregatecolumn.h"
 #include "constantfilter.h"
-#include "windowfunction.h"
+#include "../../utils/windowfunction/windowfunction.h"
 
 namespace execplan
 {
diff --git a/dbcon/joblist/diskjoinstep.h b/dbcon/joblist/diskjoinstep.h
index fc4f2bcfc..a0524e805 100644
--- a/dbcon/joblist/diskjoinstep.h
+++ b/dbcon/joblist/diskjoinstep.h
@@ -18,7 +18,7 @@
 #include "jobstep.h"
 #include "tuplehashjoin.h"
 #include "joinpartition.h"
-#include "prioritythreadpool.h"
+#include "../../utils/threadpool/prioritythreadpool.h"
 
 #ifndef DISKJOINSTEP_H
 #define DISKJOINSTEP_H
diff --git a/dbcon/joblist/groupconcat.cpp b/dbcon/joblist/groupconcat.cpp
index 17cdc1c60..2d93d0f96 100644
--- a/dbcon/joblist/groupconcat.cpp
+++ b/dbcon/joblist/groupconcat.cpp
@@ -50,7 +50,6 @@ using namespace dataconvert;
 
 #include "groupconcat.h"
 
-#include "idborderby.h"
 using namespace ordering;
 
 #include "jobstep.h"
diff --git a/dbcon/joblist/limitedorderby.cpp b/dbcon/joblist/limitedorderby.cpp
index c3db2c18c..1b85c4b36 100644
--- a/dbcon/joblist/limitedorderby.cpp
+++ b/dbcon/joblist/limitedorderby.cpp
@@ -34,12 +34,10 @@ using namespace logging;
 #include "rowgroup.h"
 using namespace rowgroup;
 
-#include "idborderby.h"
-using namespace ordering;
-
 #include "jlf_common.h"
 #include "limitedorderby.h"
 
+using namespace ordering;
 
 namespace joblist
 {
diff --git a/dbcon/joblist/limitedorderby.h b/dbcon/joblist/limitedorderby.h
index 3ab4eab75..e3b01c974 100644
--- a/dbcon/joblist/limitedorderby.h
+++ b/dbcon/joblist/limitedorderby.h
@@ -25,7 +25,7 @@
 
 #include <string>
 #include "rowgroup.h"
-#include "idborderby.h"
+#include "../../utils/windowfunction/idborderby.h"
 
 
 namespace joblist
diff --git a/dbcon/joblist/windowfunctionstep.cpp b/dbcon/joblist/windowfunctionstep.cpp
index c6b0309db..4d56b6cc8 100644
--- a/dbcon/joblist/windowfunctionstep.cpp
+++ b/dbcon/joblist/windowfunctionstep.cpp
@@ -53,18 +53,17 @@ using namespace config;
 #include "windowfunctioncolumn.h"
 using namespace execplan;
 
-#include "windowfunction.h"
-#include "windowfunctiontype.h"
-#include "framebound.h"
-#include "frameboundrange.h"
-#include "frameboundrow.h"
-#include "windowframe.h"
+#include "../../utils/windowfunction/windowfunction.h"
+#include "../../utils/windowfunction/windowfunctiontype.h"
+#include "../../utils/windowfunction/framebound.h"
+#include "../../utils/windowfunction/frameboundrange.h"
+#include "../../utils/windowfunction/frameboundrow.h"
+#include "../../utils/windowfunction/windowframe.h"
 using namespace windowfunction;
 
 #include "rowgroup.h"
 using namespace rowgroup;
 
-#include "idborderby.h"
 using namespace ordering;
 
 #include "funcexp.h"
diff --git a/dbcon/joblist/windowfunctionstep.h b/dbcon/joblist/windowfunctionstep.h
index a1cfaf9c6..a4c105362 100644
--- a/dbcon/joblist/windowfunctionstep.h
+++ b/dbcon/joblist/windowfunctionstep.h
@@ -21,7 +21,7 @@
 #ifndef JOBLIST_WINDOWFUNCTIONSTEP_H
 #define JOBLIST_WINDOWFUNCTIONSTEP_H
 
-#include "idborderby.h"
+#include "../../utils/windowfunction/idborderby.h"
 #include "jobstep.h"
 #include "rowgroup.h"
 #include "windowfunctioncolumn.h"
diff --git a/ddlproc/ddlproc.cpp b/ddlproc/ddlproc.cpp
index 3ea3b8a03..dcf1dd4c7 100644
--- a/ddlproc/ddlproc.cpp
+++ b/ddlproc/ddlproc.cpp
@@ -55,7 +55,7 @@ using namespace execplan;
 
 #include "writeengine.h"
 #include "cacheutils.h"
-#include "we_clients.h"
+#include "../writeengine/client/we_clients.h"
 #include "dbrm.h"
 #include "IDBPolicy.h"
 #include "utils_utf8.h"
diff --git a/dmlproc/batchinsertprocessor.h b/dmlproc/batchinsertprocessor.h
index 8e5b86389..8e966762e 100644
--- a/dmlproc/batchinsertprocessor.h
+++ b/dmlproc/batchinsertprocessor.h
@@ -36,7 +36,7 @@
 #include "bytestream.h"
 #include "dbrm.h"
 #include "batchloader.h"
-#include "we_clients.h"
+#include "../writeengine/client/we_clients.h"
 namespace dmlprocessor 
 {
 class BatchInsertProc
diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp
index 89c90c487..511bbfb88 100644
--- a/oam/oamcpp/liboamcpp.cpp
+++ b/oam/oamcpp/liboamcpp.cpp
@@ -47,7 +47,7 @@
 #include <sstream>
 
 #include "ddlpkg.h"
-#include "dmlpkg.h"
+#include "../../dbcon/dmlpackage/dmlpkg.h"
 #define LIBOAM_DLLEXPORT
 #include "liboamcpp.h"
 #undef LIBOAM_DLLEXPORT
diff --git a/primitives/primproc/bppseeder.h b/primitives/primproc/bppseeder.h
index b64f55213..25b3b01dc 100644
--- a/primitives/primproc/bppseeder.h
+++ b/primitives/primproc/bppseeder.h
@@ -45,7 +45,6 @@
 #include "batchprimitiveprocessor.h"
 #include "primitiveserver.h"
 #include "umsocketselector.h"
-#include "prioritythreadpool.h"
 
 namespace primitiveprocessor
 {
diff --git a/primitives/primproc/primitiveserver.h b/primitives/primproc/primitiveserver.h
index 564e12953..592dd30c3 100644
--- a/primitives/primproc/primitiveserver.h
+++ b/primitives/primproc/primitiveserver.h
@@ -36,7 +36,7 @@
 #include <boost/thread.hpp>
 
 #include "threadpool.h"
-#include "prioritythreadpool.h"
+#include "../../utils/threadpool/prioritythreadpool.h"
 #include "messagequeue.h"
 #include "blockrequestprocessor.h"
 #include "batchprimitiveprocessor.h"
diff --git a/utils/common/nullvaluemanip.h b/utils/common/nullvaluemanip.h
index 609e6655a..21bcf3d46 100644
--- a/utils/common/nullvaluemanip.h
+++ b/utils/common/nullvaluemanip.h
@@ -19,7 +19,7 @@
 #ifndef NULLVALUEMANIP_H
 #define NULLVALUEMANIP_H
 
-#include "calpontsystemcatalog.h"
+#include "../../dbcon/execplan/calpontsystemcatalog.h"
 
 namespace utils {
 
diff --git a/utils/funcexp/funcexp.cpp b/utils/funcexp/funcexp.cpp
index 3f8304b98..b291a4ccb 100644
--- a/utils/funcexp/funcexp.cpp
+++ b/utils/funcexp/funcexp.cpp
@@ -38,7 +38,7 @@ using namespace execplan;
 using namespace joblist;
 
 #ifndef SKIP_UDF
-#include "udfsdk.h"
+#include "../udfsdk/udfsdk.h"
 #endif
 
 namespace funcexp
diff --git a/utils/joiner/joiner.h b/utils/joiner/joiner.h
index dabd5a01a..b4956e113 100644
--- a/utils/joiner/joiner.h
+++ b/utils/joiner/joiner.h
@@ -27,7 +27,7 @@
 #include <tr1/unordered_map>
 #endif
 
-#include "simpleallocator.h"
+#include "../common/simpleallocator.h"
 
 #ifndef _HASHFIX_
 #define _HASHFIX_
@@ -54,7 +54,7 @@ namespace tr1
 #endif
 
 #define NO_DATALISTS
-#include <elementtype.h>
+#include "../joblist/elementtype.h"
 #undef NO_DATALISTS
 
 
diff --git a/utils/joiner/tuplejoiner.h b/utils/joiner/tuplejoiner.h
index 55a0af265..858fb266e 100644
--- a/utils/joiner/tuplejoiner.h
+++ b/utils/joiner/tuplejoiner.h
@@ -34,7 +34,7 @@
 #include "joiner.h"
 #include "fixedallocator.h"
 #include "joblisttypes.h"
-#include "funcexpwrapper.h"
+#include "../funcexp/funcexpwrapper.h"
 #include "stlpoolallocator.h"
 #include "hasher.h"
 
diff --git a/utils/rowgroup/rowgroup.h b/utils/rowgroup/rowgroup.h
index 054760bd4..a0055d0c5 100644
--- a/utils/rowgroup/rowgroup.h
+++ b/utils/rowgroup/rowgroup.h
@@ -59,7 +59,7 @@
 
 #include "branchpred.h"
 
-#include "winport.h"
+#include "../winport/winport.h"
 
 namespace rowgroup
 {
diff --git a/utils/threadpool/prioritythreadpool.h b/utils/threadpool/prioritythreadpool.h
index 8fde73c19..516c0df2f 100644
--- a/utils/threadpool/prioritythreadpool.h
+++ b/utils/threadpool/prioritythreadpool.h
@@ -35,7 +35,7 @@
 #include <boost/thread/condition.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
-#include "winport.h"
+#include "../winport/winport.h"
 
 namespace threadpool
 {
diff --git a/utils/udfsdk/udfinfinidb.cpp b/utils/udfsdk/udfinfinidb.cpp
index c6bbf2408..892979bda 100644
--- a/utils/udfsdk/udfinfinidb.cpp
+++ b/utils/udfsdk/udfinfinidb.cpp
@@ -22,7 +22,7 @@
 *
 ***********************************************************************/
 
-#include <my_config.h>
+//#include <my_config.h>
 #include <cmath>
 #include <iostream>
 using namespace std;
diff --git a/writeengine/client/we_dmlcommandclient.cpp b/writeengine/client/we_dmlcommandclient.cpp
index c5b59d257..a7c8a4dd6 100644
--- a/writeengine/client/we_dmlcommandclient.cpp
+++ b/writeengine/client/we_dmlcommandclient.cpp
@@ -23,7 +23,7 @@ using namespace messageqcpp;
 #include "we_messages.h"
 #include "we_clients.h"
 #include "resourcemanager.h"
-#include "dmlpkg.h"
+#include "../../dbcon/dmlpackage/dmlpkg.h"
 #include "ddlpackageprocessor.h"
 #include <boost/date_time/gregorian/gregorian.hpp>
 using namespace boost::gregorian;
diff --git a/writeengine/server/we_dmlcommandproc.cpp b/writeengine/server/we_dmlcommandproc.cpp
index ce732f0a3..1c61b8f26 100644
--- a/writeengine/server/we_dmlcommandproc.cpp
+++ b/writeengine/server/we_dmlcommandproc.cpp
@@ -24,7 +24,7 @@ using namespace messageqcpp;
 
 #include "we_messages.h"
 #include "we_message_handlers.h"
-#include "dmlpkg.h"
+#include "../../dbcon/dmlpackage/dmlpkg.h"
 #include "we_dmlcommandproc.h"
 using namespace dmlpackage;
 #include "dmlpackageprocessor.h"
diff --git a/writeengine/wrapper/we_colop.h b/writeengine/wrapper/we_colop.h
index 666929a3d..3bdb3bd8e 100644
--- a/writeengine/wrapper/we_colop.h
+++ b/writeengine/wrapper/we_colop.h
@@ -29,7 +29,7 @@
 #include "brmtypes.h"
 #include "we_dbrootextenttracker.h"
 #include "we_tablemetadata.h"
-#include "we_dctnry.h"
+#include "../dictionary/we_dctnry.h"
 #if defined(_MSC_VER) && defined(WRITEENGINE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
 #else
diff --git a/writeengine/wrapper/we_dctnrycompress.h b/writeengine/wrapper/we_dctnrycompress.h
index 24d4bbfc3..f9af8a70a 100644
--- a/writeengine/wrapper/we_dctnrycompress.h
+++ b/writeengine/wrapper/we_dctnrycompress.h
@@ -25,7 +25,7 @@
 
 #include <stdlib.h>
 
-#include "we_dctnry.h"
+#include "../dictionary/we_dctnry.h"
 #include "we_chunkmanager.h"
 #if defined(_MSC_VER) && defined(WRITEENGINE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/writeengine/wrapper/writeengine.cpp b/writeengine/wrapper/writeengine.cpp
index 1d097a458..bbd168638 100644
--- a/writeengine/wrapper/writeengine.cpp
+++ b/writeengine/wrapper/writeengine.cpp
@@ -41,7 +41,6 @@ using namespace std;
 #include "brm.h"
 #include "stopwatch.h"
 #include "we_colop.h"
-#include "we_dctnry.h"
 #include "we_type.h"
 
 #include "we_colopcompress.h"
diff --git a/writeengine/wrapper/writeengine.h b/writeengine/wrapper/writeengine.h
index d81d8e7e6..a47b9e291 100644
--- a/writeengine/wrapper/writeengine.h
+++ b/writeengine/wrapper/writeengine.h
@@ -39,7 +39,6 @@
 
 #include "we_brm.h"
 #include "we_colop.h"
-#include "we_dctnry.h"
 #include "we_index.h"
 #include "we_tablemetadata.h"
 #include "we_dbrootextenttracker.h"