16 files changed, 24 insertions, 24 deletions
diff --git a/libmysqlpp/Jamfile.jam b/libmysqlpp/Jamfile.jam
index b0085a8..5bb9c2e 100644
--- a/libmysqlpp/Jamfile.jam
+++ b/libmysqlpp/Jamfile.jam
@@ -7,7 +7,7 @@ lib boost_date_time ;
 lib boost_system ;
 
 lib dbpp-mysql :
-	[ glob *.cpp ] :
+	[ glob my-*.cpp ] :
 	<library>..//glibmm
 	<library>mysqlclient
 	<library>dbppcore
@@ -24,5 +24,5 @@ lib dbpp-mysql :
 
 build-project unittests ;
 
-package.install install : <install-source-root>. : : dbpp-mysql : [ glob *.h ] ;
+package.install install : <install-source-root>. : : dbpp-mysql : [ glob my-*.h ] ;
 
diff --git a/libmysqlpp/column.cpp b/libmysqlpp/my-column.cpp
index 7ff365a..4e3038e 100644
--- a/libmysqlpp/column.cpp
+++ b/libmysqlpp/my-column.cpp
@@ -1,6 +1,6 @@
-#include "column.h"
-#include "selectcommand.h"
-#include "error.h"
+#include "my-column.h"
+#include "my-selectcommand.h"
+#include "my-error.h"
 #include <string.h>
 #include <boost/date_time/gregorian/gregorian_types.hpp>
 
diff --git a/libmysqlpp/column.h b/libmysqlpp/my-column.h
index 38f4f39..38f4f39 100644
--- a/libmysqlpp/column.h
+++ b/libmysqlpp/my-column.h
diff --git a/libmysqlpp/command.cpp b/libmysqlpp/my-command.cpp
index 51db90f..bfa25e6 100644
--- a/libmysqlpp/command.cpp
+++ b/libmysqlpp/my-command.cpp
@@ -1,5 +1,5 @@
-#include "command.h"
-#include "connection.h"
+#include "my-command.h"
+#include "my-connection.h"
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/libmysqlpp/command.h b/libmysqlpp/my-command.h
index 2de1b85..2de1b85 100644
--- a/libmysqlpp/command.h
+++ b/libmysqlpp/my-command.h
diff --git a/libmysqlpp/connection.cpp b/libmysqlpp/my-connection.cpp
index fe3f51f..3e1aed3 100644
--- a/libmysqlpp/connection.cpp
+++ b/libmysqlpp/my-connection.cpp
@@ -1,7 +1,7 @@
-#include "connection.h"
-#include "error.h"
-#include "selectcommand.h"
-#include "modifycommand.h"
+#include "my-connection.h"
+#include "my-error.h"
+#include "my-selectcommand.h"
+#include "my-modifycommand.h"
 #include <nvpParse.h>
 #include <runtimeContext.h>
 #include <ucontext.h>
diff --git a/libmysqlpp/connection.h b/libmysqlpp/my-connection.h
index 3ea6be8..1f7ec5a 100644
--- a/libmysqlpp/connection.h
+++ b/libmysqlpp/my-connection.h
@@ -2,7 +2,7 @@
 #define MY_CONNECTION_H
 
 #include <connection.h>
-#include "error.h"
+#include "my-error.h"
 #include <mysql.h>
 #include <boost/shared_ptr.hpp>
 
diff --git a/libmysqlpp/error.cpp b/libmysqlpp/my-error.cpp
index 2b9b418..c35a3a1 100644
--- a/libmysqlpp/error.cpp
+++ b/libmysqlpp/my-error.cpp
@@ -1,4 +1,4 @@
-#include "error.h"
+#include "my-error.h"
 #include <string.h>
 
 MySQL::Error::Error() :
diff --git a/libmysqlpp/error.h b/libmysqlpp/my-error.h
index b4f93b2..b4f93b2 100644
--- a/libmysqlpp/error.h
+++ b/libmysqlpp/my-error.h
diff --git a/libmysqlpp/mock.cpp b/libmysqlpp/my-mock.cpp
index 3c749de..bf02e11 100644
--- a/libmysqlpp/mock.cpp
+++ b/libmysqlpp/my-mock.cpp
@@ -1,5 +1,5 @@
-#include "connection.h"
-#include "mock.h"
+#include "my-connection.h"
+#include "my-mock.h"
 #include <buffer.h>
 
 namespace MySQL {
diff --git a/libmysqlpp/mock.h b/libmysqlpp/my-mock.h
index ce4fdf2..ce4fdf2 100644
--- a/libmysqlpp/mock.h
+++ b/libmysqlpp/my-mock.h
diff --git a/libmysqlpp/modifycommand.cpp b/libmysqlpp/my-modifycommand.cpp
index e6e86b7..c66c628 100644
--- a/libmysqlpp/modifycommand.cpp
+++ b/libmysqlpp/my-modifycommand.cpp
@@ -1,5 +1,5 @@
-#include "modifycommand.h"
-#include "error.h"
+#include "my-modifycommand.h"
+#include "my-error.h"
 #include <stdlib.h>
 #include "connection.h"
 
diff --git a/libmysqlpp/modifycommand.h b/libmysqlpp/my-modifycommand.h
index abb3507..cf570bb 100644
--- a/libmysqlpp/modifycommand.h
+++ b/libmysqlpp/my-modifycommand.h
@@ -2,7 +2,7 @@
 #define MY_MODIFYCOMMAND_H
 
 #include <modifycommand.h>
-#include "command.h"
+#include "my-command.h"
 
 namespace MySQL {
 	class Connection;
diff --git a/libmysqlpp/selectcommand.cpp b/libmysqlpp/my-selectcommand.cpp
index b24e8d7..257f33f 100644
--- a/libmysqlpp/selectcommand.cpp
+++ b/libmysqlpp/my-selectcommand.cpp
@@ -1,7 +1,7 @@
-#include "selectcommand.h"
-#include "connection.h"
-#include "column.h"
-#include "error.h"
+#include "my-selectcommand.h"
+#include "my-connection.h"
+#include "my-column.h"
+#include "my-error.h"
 #include <string.h>
 
 MySQL::SelectCommand::SelectCommand(const Connection * conn, const std::string & sql) :
diff --git a/libmysqlpp/selectcommand.h b/libmysqlpp/my-selectcommand.h
index d145ce8..dc4937a 100644
--- a/libmysqlpp/selectcommand.h
+++ b/libmysqlpp/my-selectcommand.h
@@ -2,7 +2,7 @@
 #define MY_SELECTCOMMAND_H
 
 #include <selectcommand.h>
-#include "command.h"
+#include "my-command.h"
 
 namespace MySQL {
 	class Connection;
diff --git a/libmysqlpp/unittests/testmysql.cpp b/libmysqlpp/unittests/testmysql.cpp
index 9b0eae2..827ae84 100644
--- a/libmysqlpp/unittests/testmysql.cpp
+++ b/libmysqlpp/unittests/testmysql.cpp
@@ -1,7 +1,7 @@
 #define BOOST_TEST_MODULE TestMySQL
 #include <boost/test/unit_test.hpp>
 
-#include <mock.h>
+#include <my-mock.h>
 #include <definedDirs.h>
 #include <dbpp/modifycommand.h>
 #include <dbpp/selectcommand.h>