diff --git a/pip b/pip
index 6143700..c642702 160000
--- a/pip
+++ b/pip
@@ -1 +1 @@
-Subproject commit 614370096cc0a2deb45790b69d27eada2fe237e0
+Subproject commit c642702265ccac3144cf234169d11d82b3432fb8
diff --git a/qad/utils/qad_locations.cpp b/qad/utils/qad_locations.cpp
index bcc9d6e..54e3e32 100644
--- a/qad/utils/qad_locations.cpp
+++ b/qad/utils/qad_locations.cpp
@@ -3,6 +3,7 @@
 #include <QDirIterator>
 #include <QTranslator>
 #include <QApplication>
+#include <QDebug>
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 #  include <QStandardPaths>
 #else
diff --git a/qad/utils/qad_locations.h b/qad/utils/qad_locations.h
index 8fba7c0..3168b18 100644
--- a/qad/utils/qad_locations.h
+++ b/qad/utils/qad_locations.h
@@ -21,12 +21,12 @@
 #define QAD_LOCATIONS_H
 
 #include "qad_export.h"
-#include <QDebug>
+#include <QString>
 
 
 namespace QAD {
 
-	enum QAD_EXPORT LocationType {
+	enum LocationType {
 		ltConfig,
 		ltCache,
 	};
diff --git a/qcd_utils/pult/main.cpp b/qcd_utils/pult/main.cpp
index 337ca21..e40a74c 100644
--- a/qcd_utils/pult/main.cpp
+++ b/qcd_utils/pult/main.cpp
@@ -199,7 +199,7 @@ public:
 	PIHash<Key, T> & clear() {pih_content.clear(); return *this;}
 
 	void swap(PIHash<Key, T> & other) {
-		piSwapBinary<PIVector<PIVector<HashEntry> > >(pih_content, other.pih_content);
+		pih_content.swap(other.pih_content);
 	}
 
 	PIHash<Key, T> & insert(const Key & key, const T & value) {
diff --git a/qglengine/core/gltypes.h b/qglengine/core/gltypes.h
index e7e8c56..df9e232 100644
--- a/qglengine/core/gltypes.h
+++ b/qglengine/core/gltypes.h
@@ -128,7 +128,7 @@ inline float randomu() {return float(random()) / RAND_MAX;}
 
 inline const QSizeF operator *(const QSizeF & f, const QSizeF & s) {return QSizeF(f.width() * s.width(), f.height() * s.height());}
 #ifndef PIP_VERSION
-template<typename Type> inline void piSwap(Type & f, Type & s) {Type t = f; f = s; s = t;}
+template<typename T> inline void piSwap(T & f, T & s) {T t(f); f = s; s = t;}
 template<typename Type> inline Type piMin(const Type & f, const Type & s) {return (f > s) ? s : f;}
 template<typename Type> inline Type piMin(const Type & f, const Type & s, const Type & t) {return (f < s && f < t) ? f : ((s < t) ? s : t);}
 template<typename Type> inline Type piMax(const Type & f, const Type & s) {return (f < s) ? s : f;}
diff --git a/qglview/gltypes.h b/qglview/gltypes.h
index dd301f3..00cf1b5 100644
--- a/qglview/gltypes.h
+++ b/qglview/gltypes.h
@@ -127,7 +127,7 @@ inline float randomu() {return float(random()) / RAND_MAX;}
 
 inline const QSizeF operator *(const QSizeF & f, const QSizeF & s) {return QSizeF(f.width() * s.width(), f.height() * s.height());}
 #ifndef PIP_VERSION
-template<typename Type> inline void piSwap(Type & f, Type & s) {Type t = f; f = s; s = t;}
+template<typename T> inline void piSwap(T & f, T & s) {T t(f); f = s; s = t;}
 template<typename Type> inline Type piMin(const Type & f, const Type & s) {return (f > s) ? s : f;}
 template<typename Type> inline Type piMin(const Type & f, const Type & s, const Type & t) {return (f < s && f < t) ? f : ((s < t) ? s : t);}
 template<typename Type> inline Type piMax(const Type & f, const Type & s) {return (f < s) ? s : f;}