Cleaned up unnecessary header dependencies and fixed some indentations.

9 files changed, 11 insertions, 25 deletions

diff --git a/src/dal/dataprovider.h b/src/dal/dataprovider.h
index 6687a74..fe03487 100644
--- a/src/dal/dataprovider.h
+++ b/src/dal/dataprovider.h
@@ -27,7 +27,6 @@
 
 #include <string>
 
-#include "dalexcept.h"
 #include "recordset.h"
 
 
diff --git a/src/dal/dataproviderfactory.h b/src/dal/dataproviderfactory.h
index 480f6da..165113b 100644
--- a/src/dal/dataproviderfactory.h
+++ b/src/dal/dataproviderfactory.h
@@ -20,20 +20,15 @@
  *  $Id$
  */
 
-
 #ifndef _TMWSERV_DATA_PROVIDER_FACTORY_H_
 #define _TMWSERV_DATA_PROVIDER_FACTORY_H_
 
 
-#include <stdexcept>
-
-#include "dataprovider.h"
-
-
 namespace tmwserv
 {
 namespace dal
 {
+    class DataProvider;
 
 
 /**
diff --git a/src/dal/mysqldataprovider.cpp b/src/dal/mysqldataprovider.cpp
index d397253..69b4937 100644
--- a/src/dal/mysqldataprovider.cpp
+++ b/src/dal/mysqldataprovider.cpp
@@ -20,11 +20,9 @@
  *  $Id$
  */
 
-
-#include "dalexcept.h"
-
 #include "mysqldataprovider.h"
 
+#include "dalexcept.h"
 
 namespace tmwserv
 {
diff --git a/src/dal/mysqldataprovider.h b/src/dal/mysqldataprovider.h
index 7619468..698c9fc 100644
--- a/src/dal/mysqldataprovider.h
+++ b/src/dal/mysqldataprovider.h
@@ -25,7 +25,7 @@
 #define _TMWSERV_MYSQL_DATA_PROVIDER_H_
 
 
-#include <string>
+#include <iosfwd>
 
 #include <mysql/mysql.h>
 
diff --git a/src/dal/pqdataprovider.h b/src/dal/pqdataprovider.h
index 8b0c0bf..73d5c8d 100644
--- a/src/dal/pqdataprovider.h
+++ b/src/dal/pqdataprovider.h
@@ -25,8 +25,7 @@
 #define _TMWSERV_PQDATAPROVIDER_H_
 
 
-#include <string>
-
+#include <iosfwd>
 #include <libpq-fe.h>
 
 #include "dataprovider.h"
diff --git a/src/dal/recordset.cpp b/src/dal/recordset.cpp
index f404c2a..d59447c 100644
--- a/src/dal/recordset.cpp
+++ b/src/dal/recordset.cpp
@@ -20,11 +20,12 @@
  *  $Id$
  */
 
+#include "recordset.h"
 
 #include <sstream>
+#include <stdexcept>
 
-#include "recordset.h"
-
+#include "dalexcept.h"
 
 namespace tmwserv
 {
diff --git a/src/dal/recordset.h b/src/dal/recordset.h
index eac33cf..0300c92 100644
--- a/src/dal/recordset.h
+++ b/src/dal/recordset.h
@@ -20,18 +20,12 @@
  *  $Id$
  */
 
-
 #ifndef _TMWSERV_RECORDSET_H_
 #define _TMWSERV_RECORDSET_H_
 
-
 #include <iostream>
-#include <stdexcept>
 #include <vector>
 
-#include "dalexcept.h"
-
-
 namespace tmwserv
 {
 namespace dal
diff --git a/src/dal/sqlitedataprovider.cpp b/src/dal/sqlitedataprovider.cpp
index 2af82fc..e0f67f5 100644
--- a/src/dal/sqlitedataprovider.cpp
+++ b/src/dal/sqlitedataprovider.cpp
@@ -23,6 +23,9 @@
 
 #include "sqlitedataprovider.h"
 
+#include <stdexcept>
+
+#include "dalexcept.h"
 
 namespace tmwserv
 {
diff --git a/src/dal/sqlitedataprovider.h b/src/dal/sqlitedataprovider.h
index 384067c..60ac7b6 100644
--- a/src/dal/sqlitedataprovider.h
+++ b/src/dal/sqlitedataprovider.h
@@ -20,13 +20,10 @@
  *  $Id$
  */
 
-
 #ifndef _TMWSERV_SQLITE_DATA_PROVIDER_H_
 #define _TMWSERV_SQLITE_DATA_PROVIDER_H_
 
-
-#include <string>
-
+#include <iosfwd>
 #include <sqlite3.h>
 
 #include "dataprovider.h"