diff --git a/include/ircd/cmd.h b/include/ircd/cmd.h
index 566477095..93ad5a6ac 100644
--- a/include/ircd/cmd.h
+++ b/include/ircd/cmd.h
@@ -22,49 +22,6 @@
 #pragma once
 #define HAVE_IRCD_CMD_H
 
-#ifdef __cplusplus
-namespace ircd {
-
-struct line
-:rfc1459::line
-{
-	using rfc1459::line::line;
-
-	auto &operator[](const size_t &pos) const;
-	auto &operator[](const size_t &pos);
-};
-
-inline auto &pfx(const line &line)               { return line.pfx;                                }
-inline auto &pfx(line &line)                     { return line.pfx;                                }
-inline auto &nick(const line &line)              { return pfx(line).nick;                          }
-inline auto &nick(line &line)                    { return pfx(line).nick;                          }
-inline auto &user(const line &line)              { return pfx(line).user;                          }
-inline auto &user(line &line)                    { return pfx(line).user;                          }
-inline auto &host(const line &line)              { return pfx(line).host;                          }
-inline auto &host(line &line)                    { return pfx(line).host;                          }
-inline auto &command(const line &line)           { return line.cmd;                                }
-inline auto &command(line &line)                 { return line.cmd;                                }
-inline auto &parv(const line &line)              { return line.parv;                               }
-inline auto &parv(line &line)                    { return line.parv;                               }
-inline auto parc(const line &line)               { return parv(line).size();                       }
-
-inline auto &
-line::operator[](const size_t &pos)
-{
-	return parv.at(pos);
-}
-
-inline auto &
-line::operator[](const size_t &pos)
-const
-{
-	return parv.at(pos);
-}
-
-} // namespace ircd
-#endif
-
-
 #ifdef __cplusplus
 namespace ircd {
 namespace cmds {
diff --git a/include/ircd/line.h b/include/ircd/line.h
new file mode 100644
index 000000000..488529614
--- /dev/null
+++ b/include/ircd/line.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2016 Charybdis Development Team
+ * Copyright (C) 2016 Jason Volk <jason@zemos.net>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice is present in all copies.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+#define HAVE_IRCD_LINE_H
+
+#ifdef __cplusplus
+namespace ircd {
+
+struct line
+:rfc1459::line
+{
+	using rfc1459::line::line;
+
+	auto &operator[](const size_t &pos) const;
+	auto &operator[](const size_t &pos);
+};
+
+inline auto &pfx(const line &line)               { return line.pfx;                                }
+inline auto &pfx(line &line)                     { return line.pfx;                                }
+inline auto &nick(const line &line)              { return pfx(line).nick;                          }
+inline auto &nick(line &line)                    { return pfx(line).nick;                          }
+inline auto &user(const line &line)              { return pfx(line).user;                          }
+inline auto &user(line &line)                    { return pfx(line).user;                          }
+inline auto &host(const line &line)              { return pfx(line).host;                          }
+inline auto &host(line &line)                    { return pfx(line).host;                          }
+inline auto &command(const line &line)           { return line.cmd;                                }
+inline auto &command(line &line)                 { return line.cmd;                                }
+inline auto &parv(const line &line)              { return line.parv;                               }
+inline auto &parv(line &line)                    { return line.parv;                               }
+inline auto parc(const line &line)               { return parv(line).size();                       }
+
+inline auto &
+line::operator[](const size_t &pos)
+{
+	return parv.at(pos);
+}
+
+inline auto &
+line::operator[](const size_t &pos)
+const
+{
+	return parv.at(pos);
+}
+
+} // namespace ircd
+#endif
diff --git a/include/ircd/stdinc.h b/include/ircd/stdinc.h
index 9205ecb82..ed7deacbe 100644
--- a/include/ircd/stdinc.h
+++ b/include/ircd/stdinc.h
@@ -87,6 +87,7 @@ namespace ircd
 #include "whowas.h"
 #include "tgchange.h"
 #include "msgbuf.h"
+#include "line.h"
 #include "cmd.h"
 #include "client.h"