diff --git a/include/dpp/channel.h b/include/dpp/channel.h
index 70b36aa834..651eb96dbb 100644
--- a/include/dpp/channel.h
+++ b/include/dpp/channel.h
@@ -30,14 +30,13 @@
 #include <dpp/json_fwd.h>
 #include <dpp/permissions.h>
 #include <dpp/json_interface.h>
-
 #include <unordered_map>
-
 #include <variant>
 #include <string>
 
 namespace dpp {
 
+class channel_stream; //Forward declaration
 /** @brief Flag integers as received from and sent to discord */
 enum channel_type : uint8_t {
 	CHANNEL_TEXT		= 0,	//!< a text channel within a server
diff --git a/include/dpp/dpp.h b/include/dpp/dpp.h
index 1ca3b9820f..abbe512100 100644
--- a/include/dpp/dpp.h
+++ b/include/dpp/dpp.h
@@ -33,7 +33,7 @@
 #include <map>
 
 #include <functional>
-#include <dpp/streams.h>
+
 #include <dpp/exception.h>
 #include <dpp/snowflake.h>
 #include <dpp/misc-enum.h>
@@ -65,6 +65,7 @@
 #include <dpp/discordclient.h>
 #include <dpp/dispatcher.h>
 #include <dpp/cluster.h>
+#include <dpp/streams.h>
 #include <dpp/cache.h>
 #include <dpp/httpsclient.h>
 #include <dpp/queues.h>
diff --git a/include/dpp/streams.h b/include/dpp/streams.h
index a29122fdb2..b7031e5dc4 100644
--- a/include/dpp/streams.h
+++ b/include/dpp/streams.h
@@ -28,7 +28,10 @@
 
 
 namespace dpp {
-
+/**
+ * @brief Return end of message
+ * @return 0
+*/
 int end_msg();
 /**
  * @brief Simple parent for streams
diff --git a/include/dpp/user.h b/include/dpp/user.h
index f364067d50..24257d7a4a 100644
--- a/include/dpp/user.h
+++ b/include/dpp/user.h
@@ -24,11 +24,10 @@
 #include <dpp/snowflake.h>
 #include <dpp/managed.h>
 #include <dpp/utility.h>
-
 #include <dpp/json_interface.h>
-
 namespace dpp {
-
+class cluster; //TODO Find a way to remove this forward declaration
+class dm_stream; //Forward declaration
 /**
  * @brief Various bitmask flags used to represent information about a dpp::user
  */
@@ -109,7 +108,7 @@ class DPP_EXPORT user : public managed, public json_interface<user>  {
 	 * @param bot The bot that will send the message
 	 * @return The stream object used to send messages
 	 */
-	//dm_stream stream(cluster& bot);
+	dm_stream stream(cluster& bot);
 	/**
 	 * @brief Construct a new user object
 	 */
diff --git a/src/dpp/channel.cpp b/src/dpp/channel.cpp
index 1dac979d3c..9dcdb2a5c7 100644
--- a/src/dpp/channel.cpp
+++ b/src/dpp/channel.cpp
@@ -20,6 +20,7 @@
  *
  ************************************************************************************/
 #include <dpp/channel.h>
+#include <dpp/streams.h>
 #include <dpp/cache.h>
 #include <dpp/guild.h>
 #include <dpp/user.h>
diff --git a/src/dpp/user.cpp b/src/dpp/user.cpp
index 9d60362ebc..584b94cf08 100644
--- a/src/dpp/user.cpp
+++ b/src/dpp/user.cpp
@@ -19,6 +19,8 @@
  *
  ************************************************************************************/
 #include <dpp/user.h>
+#include <dpp/cluster.h>
+#include <dpp/streams.h>
 #include <dpp/discordevents.h>
 #include <dpp/json.h>
 #include <dpp/stringops.h>
@@ -292,11 +294,11 @@ void from_json(const nlohmann::json& j, user& u) {
 		}
 	}
 }
-/*
+
 dm_stream user::stream(cluster& bot) {
 	return dm_stream(bot,*this);
 }
-*/
+
 
 
 } // namespace dpp