16 files changed, 25 insertions, 25 deletions
diff --git a/libpqpp/Jamfile.jam b/libpqpp/Jamfile.jam
index 86f5736..359edbc 100644
--- a/libpqpp/Jamfile.jam
+++ b/libpqpp/Jamfile.jam
@@ -30,5 +30,5 @@ lib dbpp-postgresql :
 
 build-project unittests ;
 
-package.install install : <install-source-root>. : : dbpp-postgresql : [ glob *.h ] ;
+package.install install : <install-source-root>. : : dbpp-postgresql : [ glob pq-*.h ] ;
 
diff --git a/libpqpp/column.cpp b/libpqpp/pq-column.cpp
index c43e4ab..c569ca2 100644
--- a/libpqpp/column.cpp
+++ b/libpqpp/pq-column.cpp
@@ -1,6 +1,6 @@
-#include "column.h"
-#include "selectcommand.h"
-#include "error.h"
+#include "pq-column.h"
+#include "pq-selectcommand.h"
+#include "pq-error.h"
 #include <string.h>
 #include <boost/date_time/posix_time/posix_time.hpp>
 
diff --git a/libpqpp/column.h b/libpqpp/pq-column.h
index 5980763..5980763 100644
--- a/libpqpp/column.h
+++ b/libpqpp/pq-column.h
diff --git a/libpqpp/command.cpp b/libpqpp/pq-command.cpp
index 94079da..aeb4914 100644
--- a/libpqpp/command.cpp
+++ b/libpqpp/pq-command.cpp
@@ -1,5 +1,5 @@
-#include "command.h"
-#include "connection.h"
+#include "pq-command.h"
+#include "pq-connection.h"
 #include <stdlib.h>
 #include <string.h>
 #include <boost/date_time/posix_time/posix_time.hpp>
diff --git a/libpqpp/command.h b/libpqpp/pq-command.h
index 32faaa0..32faaa0 100644
--- a/libpqpp/command.h
+++ b/libpqpp/pq-command.h
diff --git a/libpqpp/connection.cpp b/libpqpp/pq-connection.cpp
index de3f189..db46dc5 100644
--- a/libpqpp/connection.cpp
+++ b/libpqpp/pq-connection.cpp
@@ -1,7 +1,7 @@
-#include "connection.h"
-#include "error.h"
-#include "selectcommand.h"
-#include "modifycommand.h"
+#include "pq-connection.h"
+#include "pq-error.h"
+#include "pq-selectcommand.h"
+#include "pq-modifycommand.h"
 #include <unistd.h>
 #include <poll.h>
 #include <boost/assert.hpp>
diff --git a/libpqpp/connection.h b/libpqpp/pq-connection.h
index 618c875..618c875 100644
--- a/libpqpp/connection.h
+++ b/libpqpp/pq-connection.h
diff --git a/libpqpp/error.cpp b/libpqpp/pq-error.cpp
index f2bebd6..0d0299c 100644
--- a/libpqpp/error.cpp
+++ b/libpqpp/pq-error.cpp
@@ -1,4 +1,4 @@
-#include "error.h"
+#include "pq-error.h"
 #include <string.h>
 
 PQ::Error::Error() :
diff --git a/libpqpp/error.h b/libpqpp/pq-error.h
index 8e7c4bc..8e7c4bc 100644
--- a/libpqpp/error.h
+++ b/libpqpp/pq-error.h
diff --git a/libpqpp/mock.cpp b/libpqpp/pq-mock.cpp
index 20d4340..db7eafb 100644
--- a/libpqpp/mock.cpp
+++ b/libpqpp/pq-mock.cpp
@@ -1,5 +1,5 @@
-#include "mock.h"
-#include "connection.h"
+#include "pq-mock.h"
+#include "pq-connection.h"
 #include <buffer.h>
 
 namespace PQ {
diff --git a/libpqpp/mock.h b/libpqpp/pq-mock.h
index e8b7366..e8b7366 100644
--- a/libpqpp/mock.h
+++ b/libpqpp/pq-mock.h
diff --git a/libpqpp/modifycommand.cpp b/libpqpp/pq-modifycommand.cpp
index 460ec31..e07af0b 100644
--- a/libpqpp/modifycommand.cpp
+++ b/libpqpp/pq-modifycommand.cpp
@@ -1,7 +1,7 @@
-#include "modifycommand.h"
-#include "error.h"
+#include "pq-modifycommand.h"
+#include "pq-error.h"
 #include <stdlib.h>
-#include "connection.h"
+#include "pq-connection.h"
 
 PQ::ModifyCommand::ModifyCommand(const Connection * conn, const std::string & sql, unsigned int no) :
 	DB::Command(sql),
diff --git a/libpqpp/modifycommand.h b/libpqpp/pq-modifycommand.h
index b451273..d29cf5e 100644
--- a/libpqpp/modifycommand.h
+++ b/libpqpp/pq-modifycommand.h
@@ -2,7 +2,7 @@
 #define PQ_MODIFYCOMMAND_H
 
 #include <modifycommand.h>
-#include "command.h"
+#include "pq-command.h"
 
 namespace PQ {
 	class Connection;
diff --git a/libpqpp/selectcommand.cpp b/libpqpp/pq-selectcommand.cpp
index 2312dbb..26967c5 100644
--- a/libpqpp/selectcommand.cpp
+++ b/libpqpp/pq-selectcommand.cpp
@@ -1,7 +1,7 @@
-#include "selectcommand.h"
-#include "connection.h"
-#include "column.h"
-#include "error.h"
+#include "pq-selectcommand.h"
+#include "pq-connection.h"
+#include "pq-column.h"
+#include "pq-error.h"
 
 PQ::SelectCommand::SelectCommand(const Connection * conn, const std::string & sql, unsigned int no) :
 	DB::Command(sql),
diff --git a/libpqpp/selectcommand.h b/libpqpp/pq-selectcommand.h
index e4acce7..c72c314 100644
--- a/libpqpp/selectcommand.h
+++ b/libpqpp/pq-selectcommand.h
@@ -2,7 +2,7 @@
 #define PQ_SELECTCOMMAND_H
 
 #include <selectcommand.h>
-#include "command.h"
+#include "pq-command.h"
 #include <vector>
 #include <map>
 
diff --git a/libpqpp/unittests/testpq.cpp b/libpqpp/unittests/testpq.cpp
index 3f55c63..b321075 100644
--- a/libpqpp/unittests/testpq.cpp
+++ b/libpqpp/unittests/testpq.cpp
@@ -5,12 +5,12 @@
 #include <dbpp/modifycommand.h>
 #include <dbpp/selectcommand.h>
 #include <dbpp/column.h>
-#include "mock.h"
+#include <pq-mock.h>
 #include <testCore.h>
 #include <fstream>
 #include <boost/date_time/posix_time/posix_time.hpp>
-#include "../error.h"
-#include "../connection.h"
+#include <pq-error.h>
+#include <pq-connection.h>
 
 class StandardMockDatabase : public PQ::Mock {
 	public: