--- a/src/Connection.h	Wed Dec 25 01:07:41 2019 +0100
+++ b/src/Connection.h	Wed Dec 25 01:26:02 2019 +0100
@@ -16,27 +16,8 @@
  */
 #pragma once
 
-#include <memory>
-#include <string>
-#include <sstream>
-#include <regex>
-#include <vector>
-#include <locale>
-#include <codecvt>
-#include <unistd.h>
-#include <cassert>
-#include <sys/stat.h>
-
 #include <sqlite3.h>
 
-#include <relpipe/reader/typedefs.h>
-#include <relpipe/reader/TypeId.h>
-#include <relpipe/reader/handlers/RelationalReaderValueHandler.h>
-#include <relpipe/reader/handlers/AttributeMetadata.h>
-
-#include <relpipe/writer/Factory.h>
-
-#include "Configuration.h"
 #include "SqlException.h"
 #include "PreparedStatement.h"
 
@@ -44,11 +25,6 @@
 namespace tr {
 namespace sql {
 
-using namespace std;
-using namespace relpipe;
-using namespace relpipe::reader;
-using namespace relpipe::reader::handlers;
-
 class Connection {
 private:
 	sqlite3* db;

--- a/src/PreparedStatement.cpp	Wed Dec 25 01:07:41 2019 +0100
+++ b/src/PreparedStatement.cpp	Wed Dec 25 01:26:02 2019 +0100
@@ -15,6 +15,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <cstring>
+
 #include "PreparedStatement.h"
 
 namespace relpipe {
@@ -94,7 +96,7 @@
 
 std::string PreparedStatement::getString(int columnIndex) {
 	const char* value = (const char*) sqlite3_column_text(stmt, columnIndex);
-		return value ? value : ""; // TODO: support NULL values (when supported in relpipe format)
+	return value ? value : ""; // TODO: support NULL values (when supported in relpipe format)
 }
 
 }

--- a/src/PreparedStatement.h	Wed Dec 25 01:07:41 2019 +0100
+++ b/src/PreparedStatement.h	Wed Dec 25 01:26:02 2019 +0100
@@ -16,38 +16,17 @@
  */
 #pragma once
 
-#include <memory>
-#include <string>
-#include <sstream>
-#include <regex>
-#include <vector>
-#include <locale>
-#include <codecvt>
-#include <unistd.h>
-#include <cassert>
-#include <sys/stat.h>
-
 #include <sqlite3.h>
 
 #include <relpipe/reader/typedefs.h>
 #include <relpipe/reader/TypeId.h>
-#include <relpipe/reader/handlers/RelationalReaderValueHandler.h>
-#include <relpipe/reader/handlers/AttributeMetadata.h>
-
-#include <relpipe/writer/Factory.h>
-
-#include "Configuration.h"
+#include <relpipe/writer/TypeId.h>
 #include "SqlException.h"
 
 namespace relpipe {
 namespace tr {
 namespace sql {
 
-using namespace std;
-using namespace relpipe;
-using namespace relpipe::reader;
-using namespace relpipe::reader::handlers;
-
 class PreparedStatement {
 private:
 	sqlite3_stmt* stmt;