Index: code/commands/file-commands.cpp
===================================================================
--- code/commands/file-commands.cpp (revision f4c6a3db38b252de69e1eb1b882d87de5d4c00be)
+++ code/commands/file-commands.cpp (revision d96f21af85f2fb0eeb992b52e58b03c317bf0a49)
@@ -232,12 +232,14 @@
 
 #include <libinftextgtk/inf-text-gtk-buffer.h>
+#include "util/i18n.hpp"
 
 // write the Gtk::TextBuffer from document into content, inserting <span/>s for
 // line breaks and authorship of chunks of text, also save all users
 // encountered and the total number of lines dumped
-void dump_buffer(DocWindow& document,
+void dump_buffer(Gobby::DocWindow& document,
                  xmlpp::Element* content,
                  std::set<InfTextUser*>& users,
                  unsigned int& line_counter) {
+  using namespace Gobby;
   users.clear();
   line_counter = 1;
@@ -337,7 +339,8 @@
 // some random interesting information/advertisement to be put at the end of
 // the html output
-void dump_info(xmlpp::Element* node, DocWindow& document) {
+void dump_info(xmlpp::Element* node, Gobby::DocWindow& document) {
+	using namespace Gobby;
 	// put current time
-  char const* time_str;
+	char const* time_str;
 	int const n = 128;
 	char buf[n];
@@ -409,5 +412,6 @@
 // generate xhtml representation of the document and write it to the
 // specified location in the filesystem
-void export_html(DocWindow& document, const Glib::ustring& output_path) {
+void export_html(Gobby::DocWindow& document, const Glib::ustring& output_path) {
+	using namespace Gobby;
 	xmlpp::Document output;