diff --git a/Foundation/Makefile b/Foundation/Makefile
index 7a69f095d..17a8d88dd 100644
--- a/Foundation/Makefile
+++ b/Foundation/Makefile
@@ -22,7 +22,7 @@ objects = ArchiveStrategy Ascii ASCIIEncoding AsyncChannel \
 	NotificationQueue PriorityNotificationQueue TimedNotificationQueue \
 	NullStream NumberFormatter NumberParser NumericString AbstractObserver \
 	Path PatternFormatter Process PurgeStrategy RWLock Random RandomStream \
-	RecursiveDirectoryIteratorStrategy RegularExpression RefCountedObject Runnable RotateStrategy \
+	DirectoryIteratorStrategy RegularExpression RefCountedObject Runnable RotateStrategy \
 	SHA1Engine Semaphore SharedLibrary SimpleFileChannel \
 	SignalHandler SplitterChannel SortedDirectoryIterator Stopwatch StreamChannel \
 	StreamConverter StreamCopier StreamTokenizer String StringTokenizer SynchronizedObject \
diff --git a/Foundation/include/Poco/ListMap.h b/Foundation/include/Poco/ListMap.h
index 235045b1e..4c8fddea7 100644
--- a/Foundation/include/Poco/ListMap.h
+++ b/Foundation/include/Poco/ListMap.h
@@ -128,8 +128,8 @@ public:
 		/// or iterator pointing to the end if entry is
 		/// not found.
 	{
-		Container::const_iterator it = _list.begin();
-		Container::const_iterator end = _list.end();
+		typename Container::const_iterator it = _list.begin();
+		typename Container::const_iterator end = _list.end();
 		for(; it != end; ++it)
 		{
 			if (isEqual(it->first, key)) return it;
@@ -143,8 +143,8 @@ public:
 		/// or iterator pointing to the end if entry is
 		/// not found.
 	{
-		Container::iterator it = _list.begin();
-		Container::iterator end = _list.end();
+		typename Container::iterator it = _list.begin();
+		typename Container::iterator end = _list.end();
 		for(; it != end; ++it)
 		{
 			if (isEqual(it->first, key)) return it;
diff --git a/Foundation/testsuite/Makefile-Driver b/Foundation/testsuite/Makefile-Driver
index f0bb73c44..36373a40d 100644
--- a/Foundation/testsuite/Makefile-Driver
+++ b/Foundation/testsuite/Makefile-Driver
@@ -16,7 +16,7 @@ objects = ActiveMethodTest ActivityTest ActiveDispatcherTest \
 	DateTimeParserTest DateTimeTest LocalDateTimeTest DateTimeTestSuite DigestStreamTest \
 	Driver DynamicFactoryTest FPETest FileChannelTest FileTest GlobTest FilesystemTestSuite \
 	FIFOBufferStreamTest FoundationTestSuite HMACEngineTest HexBinaryTest LoggerTest \
-	LoggingFactoryTest LoggingRegistryTest LoggingTestSuite LogStreamTest \
+	ListMapTest LoggingFactoryTest LoggingRegistryTest LoggingTestSuite LogStreamTest \
 	NamedEventTest NamedMutexTest ProcessesTestSuite ProcessTest \
 	MemoryPoolTest MD4EngineTest MD5EngineTest ManifestTest \
 	NDCTest NotificationCenterTest NotificationQueueTest \
diff --git a/JSON/Makefile b/JSON/Makefile
index 84eb08e8d..8cb83ed0b 100644
--- a/JSON/Makefile
+++ b/JSON/Makefile
@@ -10,8 +10,8 @@ include $(POCO_BASE)/build/rules/global
 
 INCLUDE += -I $(POCO_BASE)/JSON/include/Poco/JSON
 
-objects = Array Object Parser Handler  \
-	Stringifier ParseHandler Query JSONException \
+objects = Array Object Parser Handler Stringifier \
+	ParseHandler PrintHandler Query JSONException \
 	Template TemplateCache
 
 target         = PocoJSON
diff --git a/JSON/include/Poco/JSON/Object.h b/JSON/include/Poco/JSON/Object.h
index b2c17e21b..6f05c0cfa 100644
--- a/JSON/include/Poco/JSON/Object.h
+++ b/JSON/include/Poco/JSON/Object.h
@@ -42,6 +42,7 @@
 
 #include "Poco/JSON/JSON.h"
 #include "Poco/JSON/Array.h"
+#include "Poco/JSON/Stringifier.h"
 #include "Poco/SharedPtr.h"
 #include "Poco/Dynamic/Var.h"
 #include <map>
@@ -156,8 +157,10 @@ private:
 		out << '{';
 
 		if (indent > 0) out << std::endl;
-
-		for (C::const_iterator it = container.begin(); it != container.end();)
+		
+		typename C::const_iterator it = container.begin();
+		typename C::const_iterator end = container.end();
+		for (; it != end;)
 		{
 			for(int i = 0; i < indent; i++) out << ' ';
 
diff --git a/JSON/src/Object.cpp b/JSON/src/Object.cpp
index 97026c3fd..45ea44a92 100644
--- a/JSON/src/Object.cpp
+++ b/JSON/src/Object.cpp
@@ -35,8 +35,6 @@
 
 
 #include "Poco/JSON/Object.h"
-#include "Poco/JSON/Array.h"
-#include "Poco/JSON/Stringifier.h"
 #include <iostream>
 #include <sstream>
 
diff --git a/JSON/src/PrintHandler.cpp b/JSON/src/PrintHandler.cpp
index f87dd5429..2487d16ae 100644
--- a/JSON/src/PrintHandler.cpp
+++ b/JSON/src/PrintHandler.cpp
@@ -36,6 +36,7 @@
 
 #include "Poco/JSON/PrintHandler.h"
 #include "Poco/JSON/Stringifier.h"
+#include <iostream>
 
 
 namespace Poco {
diff --git a/Net/Makefile b/Net/Makefile
index dbb2e44d9..3d73f282d 100644
--- a/Net/Makefile
+++ b/Net/Makefile
@@ -12,7 +12,7 @@ SHAREDOPT_CXX += -DNet_EXPORTS
 
 objects = \
 	DNS HTTPResponse HostEntry Socket \
-	DatagramSocket HTTPServer IPAddress IPAddressImpl SocketAddress SocketAddress \
+	DatagramSocket HTTPServer IPAddress IPAddressImpl SocketAddress SocketAddressImpl \
 	HTTPBasicCredentials HTTPCookie HTMLForm MediaType DialogSocket \
 	DatagramSocketImpl FilePartSource HTTPServerConnection MessageHeader \
 	HTTPChunkedStream HTTPServerConnectionFactory MulticastSocket SocketStream \
@@ -25,7 +25,7 @@ objects = \
 	HTTPRequestHandler HTTPStream HTTPIOStream ServerSocket TCPServerDispatcher TCPServerConnectionFactory \
 	HTTPRequestHandlerFactory HTTPStreamFactory ServerSocketImpl TCPServerParams \
 	QuotedPrintableEncoder QuotedPrintableDecoder StringPartSource \
-	FTPClientSession FTPStreamFactory PartHandler PartSource NullPartHandler \
+	FTPClientSession FTPStreamFactory PartHandler PartSource PartStore NullPartHandler \
 	SocketReactor SocketNotifier SocketNotification AbstractHTTPRequestHandler \
 	MailRecipient MailMessage MailStream SMTPClientSession POP3ClientSession \
 	RawSocket RawSocketImpl ICMPClient ICMPEventArgs ICMPPacket ICMPPacketImpl \
diff --git a/Net/include/Poco/Net/FilePartSource.h b/Net/include/Poco/Net/FilePartSource.h
index 58f1079a3..3096265bf 100644
--- a/Net/include/Poco/Net/FilePartSource.h
+++ b/Net/include/Poco/Net/FilePartSource.h
@@ -80,7 +80,7 @@ public:
 	std::istream& stream();
 		/// Returns a file input stream for the given file.
 		
-	const std::string& filename();
+	const std::string& filename() const;
 		/// Returns the filename portion of the path.
 
 private:
diff --git a/Net/src/FilePartSource.cpp b/Net/src/FilePartSource.cpp
index 5820897bd..c8a8cd025 100644
--- a/Net/src/FilePartSource.cpp
+++ b/Net/src/FilePartSource.cpp
@@ -90,7 +90,7 @@ std::istream& FilePartSource::stream()
 }
 
 
-const std::string& FilePartSource::filename()
+const std::string& FilePartSource::filename() const
 {
 	return _filename;
 }