diff --git a/Data/include/Poco/Data/RecordSet.h b/Data/include/Poco/Data/RecordSet.h
index 30ace7a9c..da0432a03 100644
--- a/Data/include/Poco/Data/RecordSet.h
+++ b/Data/include/Poco/Data/RecordSet.h
@@ -41,6 +41,7 @@
 
 
 #include "Poco/Data/Data.h"
+#include "Poco/Data/Session.h"
 #include "Poco/Data/Extraction.h"
 #include "Poco/Data/BulkExtraction.h"
 #include "Poco/Data/Statement.h"
@@ -113,7 +114,7 @@ public:
 
 	template <class RF>
 	RecordSet(Session& rSession, const std::string& query, const RF& rowFormatter): 
-		Statement((rSession << query, now)),
+		Statement((rSession << query, Keywords::now)),
 		_currentRow(0),
 		_pBegin(new RowIterator(this, 0 == rowsExtracted())),
 		_pEnd(new RowIterator(this, true)),
diff --git a/Data/src/RecordSet.cpp b/Data/src/RecordSet.cpp
index 8b52d1843..f11aae925 100644
--- a/Data/src/RecordSet.cpp
+++ b/Data/src/RecordSet.cpp
@@ -35,7 +35,6 @@
 
 
 #include "Poco/Data/RecordSet.h"
-#include "Poco/Data/Session.h"
 #include "Poco/Data/RowFilter.h"
 #include "Poco/Data/Date.h"
 #include "Poco/Data/Time.h"