diff --git a/Data/PostgreSQL/Makefile b/Data/PostgreSQL/Makefile
index 8e95b8f42..518325476 100644
--- a/Data/PostgreSQL/Makefile
+++ b/Data/PostgreSQL/Makefile
@@ -6,9 +6,38 @@
 
 include $(POCO_BASE)/build/rules/global
 
-INCLUDE += -I/usr/include/postgresql -I/usr/local/include/postgresql -I/usr/local/postgresql/include -I/opt/postgresql/include
+ifeq (0, $(shell test -e /usr/include/postgresql; echo $$?))
+INCLUDE += -I/usr/include/postgresql
+endif
+ifeq (0, $(shell test -e /usr/local/include/postgresql; echo $$?))
+INCLUDE += -I/usr/local/include/postgresql
+endif
+ifeq (0, $(shell test -e /usr/local/postgresql/include; echo $$?))
+INCLUDE += -I/usr/local/postgresql/include
+endif
+ifeq (0, $(shell test -e /opt/postgresql/include; echo $$?))
+INCLUDE += -I/opt/postgresql/include
+endif
+ifeq (0, $(shell test -e /usr/local/opt/libpq/include; echo $$?))
+INCLUDE += -I/usr/local/opt/libpq/include
+endif
 
-SYSLIBS += -L/usr/lib$(LIB64SUFFIX)/postgresql -L/usr/local/lib$(LIB64SUFFIX)/postgresql -L/usr/local/postgresql/lib$(LIB64SUFFIX) -L/opt/postgresql/lib$(LIB64SUFFIX) -lpq
+ifeq (0, $(shell test -e /usr/lib$(LIB64SUFFIX)/postgresql; echo $$?))
+SYSLIBS += -L/usr/lib$(LIB64SUFFIX)/postgresql
+endif
+ifeq (0, $(shell test -e /usr/local/lib$(LIB64SUFFIX)/postgresql; echo $$?))
+SYSLIBS += -L/usr/local/lib$(LIB64SUFFIX)/postgresql
+endif
+ifeq (0, $(shell test -e /usr/local/postgresql/lib$(LIB64SUFFIX); echo $$?))
+SYSLIBS += -L/usr/local/postgresql/lib$(LIB64SUFFIX)
+endif
+ifeq (0, $(shell test -e /opt/postgresql/lib$(LIB64SUFFIX); echo $$?))
+SYSLIBS += -L/opt/postgresql/lib$(LIB64SUFFIX)
+endif
+ifeq (0, $(shell test -e /opt/postgresql/lib$(LIB64SUFFIX); echo $$?))
+SYSLIBS += -L/opt/postgresql/lib$(LIB64SUFFIX)
+endif
+SYSLIBS += -lpq
 
 objects = Extractor Binder SessionImpl Connector \
 	PostgreSQLStatementImpl PostgreSQLException \
diff --git a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Binder.h b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Binder.h
index 3ad3fcc91..6b3aa966a 100644
--- a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Binder.h
+++ b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Binder.h
@@ -213,11 +213,11 @@ public:
 
 	virtual void bind(std::size_t pos, const std::list<Time>& val, Direction dir = PD_IN);
 
-	virtual void bind(std::size_t pos, const std::vector<NullData>& val, Direction dir = PD_IN, const std::type_info& bindType = typeid(void));
+	virtual void bind(std::size_t pos, const std::vector<NullData>& val, Direction dir = PD_IN);
 
-	virtual void bind(std::size_t pos, const std::deque<NullData>& val, Direction dir = PD_IN, const std::type_info& bindType = typeid(void));
+	virtual void bind(std::size_t pos, const std::deque<NullData>& val, Direction dir = PD_IN);
 
-	virtual void bind(std::size_t pos, const std::list<NullData>& val, Direction dir = PD_IN, const std::type_info& bindType = typeid(void));
+	virtual void bind(std::size_t pos, const std::list<NullData>& val, Direction dir = PD_IN);
 
 	virtual void bind(std::size_t pos, const std::vector<std::string>& val, Direction dir = PD_IN);
 
diff --git a/Data/PostgreSQL/src/Binder.cpp b/Data/PostgreSQL/src/Binder.cpp
index 3d50983d8..6d38a4cc7 100644
--- a/Data/PostgreSQL/src/Binder.cpp
+++ b/Data/PostgreSQL/src/Binder.cpp
@@ -632,19 +632,19 @@ void Binder::bind(std::size_t /*pos*/, const std::list<Poco::Data::Time>& /*val*
 }
 
 
-void Binder::bind(std::size_t /*pos*/, const std::vector<Poco::Data::NullData>& /*val*/, Direction /*dir*/, const std::type_info&)
+void Binder::bind(std::size_t /*pos*/, const std::vector<Poco::Data::NullData>& /*val*/, Direction /*dir*/)
 {
 	throw NotImplementedException();
 }
 
 
-void Binder::bind(std::size_t /*pos*/, const std::deque<Poco::Data::NullData>& /*val*/, Direction /*dir*/, const std::type_info&)
+void Binder::bind(std::size_t /*pos*/, const std::deque<Poco::Data::NullData>& /*val*/, Direction /*dir*/)
 {
 	throw NotImplementedException();
 }
 
 
-void Binder::bind(std::size_t /*pos*/, const std::list<Poco::Data::NullData>& /*val*/, Direction /*dir*/, const std::type_info&)
+void Binder::bind(std::size_t /*pos*/, const std::list<Poco::Data::NullData>& /*val*/, Direction /*dir*/)
 {
 	throw NotImplementedException();
 }
diff --git a/Data/PostgreSQL/testsuite/Makefile b/Data/PostgreSQL/testsuite/Makefile
index 781ea7113..c5decc354 100644
--- a/Data/PostgreSQL/testsuite/Makefile
+++ b/Data/PostgreSQL/testsuite/Makefile
@@ -6,12 +6,40 @@
 
 include $(POCO_BASE)/build/rules/global
 
-INCLUDE += -I/usr/include/postgresql -I/usr/local/include/postgresql -I/usr/local/postgresql/include -I/opt/postgresql/include
+ifeq (0, $(shell test -e /usr/include/postgresql; echo $$?))
+INCLUDE += -I/usr/include/postgresql
+endif
+ifeq (0, $(shell test -e /usr/local/include/postgresql; echo $$?))
+INCLUDE += -I/usr/local/include/postgresql
+endif
+ifeq (0, $(shell test -e /usr/local/postgresql/include; echo $$?))
+INCLUDE += -I/usr/local/postgresql/include
+endif
+ifeq (0, $(shell test -e /opt/postgresql/include; echo $$?))
+INCLUDE += -I/opt/postgresql/include
+endif
+ifeq (0, $(shell test -e /usr/local/opt/libpq/include; echo $$?))
+INCLUDE += -I/usr/local/opt/libpq/include
+endif
 
-SYSLIBS += -L/usr/lib$(LIB64SUFFIX)/postgresql -L/usr/local/lib$(LIB64SUFFIX)/postgresql -L/usr/local/postgresql/lib$(LIB64SUFFIX) -L/opt/postgresql/lib$(LIB64SUFFIX) -lpq
+ifeq (0, $(shell test -e /usr/lib$(LIB64SUFFIX)/postgresql; echo $$?))
+SYSLIBS += -L/usr/lib$(LIB64SUFFIX)/postgresql
+endif
+ifeq (0, $(shell test -e /usr/local/lib$(LIB64SUFFIX)/postgresql; echo $$?))
+SYSLIBS += -L/usr/local/lib$(LIB64SUFFIX)/postgresql
+endif
+ifeq (0, $(shell test -e /usr/local/postgresql/lib$(LIB64SUFFIX); echo $$?))
+SYSLIBS += -L/usr/local/postgresql/lib$(LIB64SUFFIX)
+endif
+ifeq (0, $(shell test -e /opt/postgresql/lib$(LIB64SUFFIX); echo $$?))
+SYSLIBS += -L/opt/postgresql/lib$(LIB64SUFFIX)
+endif
+ifeq (0, $(shell test -e /opt/postgresql/lib$(LIB64SUFFIX); echo $$?))
+SYSLIBS += -L/opt/postgresql/lib$(LIB64SUFFIX)
+endif
 
 # Note: linking order is important, do not change it.
-SYSLIBS += -lz -lpthread -ldl
+SYSLIBS += -lpq -lz -lpthread -ldl
 
 objects = PostgreSQLTestSuite Driver PostgreSQLTest SQLExecutor
 
diff --git a/Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp b/Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp
index df5978688..da4c5a46f 100644
--- a/Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp
+++ b/Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp
@@ -26,6 +26,7 @@
 #include "Poco/Data/DataException.h"
 #include <iostream>
 
+
 using namespace Poco::Data;
 using namespace Poco::Data::Keywords;
 using Poco::Data::PostgreSQL::ConnectionException;
@@ -39,45 +40,56 @@ using Poco::Tuple;
 using Poco::NamedTuple;
 using Poco::Environment;
 
+
 Poco::SharedPtr<Poco::Data::Session> PostgreSQLTest::_pSession = 0;
 Poco::SharedPtr<SQLExecutor> PostgreSQLTest::_pExecutor = 0;
 
+
 //
 // Connection string
 std::string PostgreSQLTest::_dbConnString;
 
+
 //
 // Parameters for barebone-test
 //
-std::string PostgreSQLTest::getHost() {
+std::string PostgreSQLTest::getHost()
+{
 	return "localhost";
 }
-std::string PostgreSQLTest::getPort() {
+
+
+std::string PostgreSQLTest::getPort()
+{
 	return "5432";
 }
-std::string PostgreSQLTest::getBase(){
+
+
+std::string PostgreSQLTest::getBase()
+{
 	return "postgres";
 }
-std::string PostgreSQLTest::getUser(){
+
+
+std::string PostgreSQLTest::getUser()
+{
 	return "postgres";
 }
-std::string PostgreSQLTest::getPass(){
+
+
+std::string PostgreSQLTest::getPass()
+{
 	if (Environment::has("APPVEYOR"))
 	{
 		return "Password12!";
 	}
-	else if (Environment::has("JENKINS_HOME"))
+	else
 	{
 		return "postgres";
 	}
-	else
-	{
-		return "poco";
-	}
 }
 
 
-
 PostgreSQLTest::PostgreSQLTest(const std::string& name):
 	CppUnit::TestCase(name)
 {