2 files changed, 18 insertions, 8 deletions
diff --git a/Swiften/JID/JID.cpp b/Swiften/JID/JID.cpp
index 0822595..1bdf390 100644
--- a/Swiften/JID/JID.cpp
+++ b/Swiften/JID/JID.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -18,6 +18,7 @@
 #include <boost/assign/list_of.hpp>
 #include <boost/algorithm/string/find_format.hpp>
 #include <boost/algorithm/string/finder.hpp>
+#include <iostream>
 #include <sstream>
 
 #include <Swiften/Base/String.h>
@@ -111,6 +112,8 @@ struct EscapedCharacterFormatter {
 };
 #endif
 
+namespace Swift {
+
 JID::JID(const char* jid) : valid_(true) {
 	initializeFromString(std::string(jid));
 }
@@ -270,3 +273,10 @@ std::string JID::getUnescapedNode() const {
 	return result;
 	//return boost::find_format_all_copy(node_, EscapedCharacterFinder(), EscapedCharacterFormatter());
 }
+
+std::ostream& operator<<(std::ostream& os, const JID& j) {
+	os << j.toString();
+	return os;
+}
+
+}
diff --git a/Swiften/JID/JID.h b/Swiften/JID/JID.h
index 08309d3..3ccf7de 100644
--- a/Swiften/JID/JID.h
+++ b/Swiften/JID/JID.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -7,11 +7,11 @@
 #pragma once
 
 #include <string>
-//#include <iosfwd>
-#include <iostream>
+#include <iosfwd>
 
 #include <Swiften/Base/API.h>
 
+
 namespace Swift {
 	/**
 	 * This represents the JID used in XMPP
@@ -146,10 +146,7 @@ namespace Swift {
 				return compare(b, Swift::JID::WithResource) < 0;
 			}
 
-			friend std::ostream& operator<<(std::ostream& os, const Swift::JID& j) {
-				os << j.toString();
-				return os;
-			}
+			friend std::ostream& operator<<(std::ostream& os, const Swift::JID& j);
 
 			friend bool operator==(const Swift::JID& a, const Swift::JID& b) {
 				return a.compare(b, Swift::JID::WithResource) == 0;
@@ -170,4 +167,7 @@ namespace Swift {
 			bool hasResource_;
 			std::string resource_;
 	};
+	
+	std::ostream& operator<<(std::ostream& os, const Swift::JID& j);
 }
+