diff --git a/dbcon/joblist/subquerystep.h b/dbcon/joblist/subquerystep.h
index d69863df5..e7c479ba2 100644
--- a/dbcon/joblist/subquerystep.h
+++ b/dbcon/joblist/subquerystep.h
@@ -227,11 +227,11 @@ public:
 
     /** @brief add function columns (returned columns)
      */
-    void addExpression(const vector<execplan::SRCP>&);
+    void addExpression(const std::vector<execplan::SRCP>&);
 
     /** @brief add function join expresssion
      */
-    void addFcnJoinExp(const vector<execplan::SRCP>&);
+    void addFcnJoinExp(const std::vector<execplan::SRCP>&);
 
 
 protected:
diff --git a/dbcon/joblist/tupleaggregatestep.h b/dbcon/joblist/tupleaggregatestep.h
index ae356e156..f137daf6f 100644
--- a/dbcon/joblist/tupleaggregatestep.h
+++ b/dbcon/joblist/tupleaggregatestep.h
@@ -199,7 +199,7 @@ private:
     std::vector<rowgroup::RGData > fRowGroupDatas;
     std::vector<rowgroup::SP_ROWAGG_UM_t> fAggregators;
     std::vector<rowgroup::RowGroup> fRowGroupIns;
-    vector<rowgroup::RowGroup> fRowGroupOuts;
+    std::vector<rowgroup::RowGroup> fRowGroupOuts;
     std::vector<std::vector<rowgroup::RGData> > fRowGroupsDeliveredData;
     bool fIsMultiThread;
     int fInputIter; // iterator
diff --git a/dbcon/joblist/windowfunctionstep.h b/dbcon/joblist/windowfunctionstep.h
index f483c6027..b57d06324 100644
--- a/dbcon/joblist/windowfunctionstep.h
+++ b/dbcon/joblist/windowfunctionstep.h
@@ -134,15 +134,15 @@ private:
     uint64_t nextFunctionIndex();
 
     boost::shared_ptr<windowfunction::FrameBound> parseFrameBound(const execplan::WF_Boundary&,
-            const map<uint64_t, uint64_t>&, const vector<execplan::SRCP>&,
+            const std::map<uint64_t, uint64_t>&, const std::vector<execplan::SRCP>&,
             const boost::shared_ptr<ordering::EqualCompData>&, JobInfo&, bool, bool);
     boost::shared_ptr<windowfunction::FrameBound> parseFrameBoundRows(
-        const execplan::WF_Boundary&, const map<uint64_t, uint64_t>&, JobInfo&);
+        const execplan::WF_Boundary&, const std::map<uint64_t, uint64_t>&, JobInfo&);
     boost::shared_ptr<windowfunction::FrameBound> parseFrameBoundRange(
-        const execplan::WF_Boundary&, const map<uint64_t, uint64_t>&, const vector<execplan::SRCP>&,
+        const execplan::WF_Boundary&, const std::map<uint64_t, uint64_t>&, const std::vector<execplan::SRCP>&,
         JobInfo&);
-    void updateWindowCols(execplan::ParseTree*, const map<uint64_t, uint64_t>&, JobInfo&);
-    void updateWindowCols(execplan::ReturnedColumn*, const map<uint64_t, uint64_t>&, JobInfo&);
+    void updateWindowCols(execplan::ParseTree*, const std::map<uint64_t, uint64_t>&, JobInfo&);
+    void updateWindowCols(execplan::ReturnedColumn*, const std::map<uint64_t, uint64_t>&, JobInfo&);
     void sort(std::vector<joblist::RowPosition>::iterator, uint64_t);
 
     void formatMiniStats();
diff --git a/primitives/primproc/primitiveserver.h b/primitives/primproc/primitiveserver.h
index d50edb3be..f212fd9fd 100644
--- a/primitives/primproc/primitiveserver.h
+++ b/primitives/primproc/primitiveserver.h
@@ -58,7 +58,7 @@ extern boost::mutex bppLock;
 extern uint32_t highPriorityThreads, medPriorityThreads, lowPriorityThreads;
 
 #ifdef PRIMPROC_STOPWATCH
-extern map<pthread_t, logging::StopWatch*> stopwatchMap;
+extern std::map<pthread_t, logging::StopWatch*> stopwatchMap;
 extern pthread_mutex_t stopwatchMapMutex;
 extern bool stopwatchThreadCreated;
 
diff --git a/writeengine/redistribute/we_redistributecontrolthread.h b/writeengine/redistribute/we_redistributecontrolthread.h
index 21b47b7da..9b28fe9d7 100644
--- a/writeengine/redistribute/we_redistributecontrolthread.h
+++ b/writeengine/redistribute/we_redistributecontrolthread.h
@@ -102,7 +102,7 @@ private:
     int  executeRedistributePlan();
 
     int  connectToWes(int);
-    void dumpPlanToFile(uint64_t, vector<PartitionInfo>&, int);
+    void dumpPlanToFile(uint64_t, std::vector<PartitionInfo>&, int);
     void displayPlan();
 
     uint32_t                      fAction;
diff --git a/writeengine/splitter/we_xmlgetter.h b/writeengine/splitter/we_xmlgetter.h
index 4f6e3dfbc..935cd4d27 100644
--- a/writeengine/splitter/we_xmlgetter.h
+++ b/writeengine/splitter/we_xmlgetter.h
@@ -43,15 +43,15 @@ public:
 
 public:
     //..Public methods
-    std::string getValue(const vector<string>& section) const;
-    std::string getAttribute(const std::vector<string>& sections,
+    std::string getValue(const std::vector<std::string>& section) const;
+    std::string getAttribute(const std::vector<std::string>& sections,
                              const std::string& Tag) const;
     void getConfig(const std::string& section,
                    const std::string& name, std::vector<std::string>& values ) const;
     void getAttributeListForAllChildren(
-        const vector<string>& sections,
-        const string& attributeTag,
-        vector<string>& attributeValues);
+        const std::vector<std::string>& sections,
+        const std::string& attributeTag,
+      std::vector<std::string>& attributeValues);
 
 private:
     //..Private methods