diff --git a/vhdlpp/debug.cc b/vhdlpp/debug.cc
index af4fd7a32..717687d68 100644
--- a/vhdlpp/debug.cc
+++ b/vhdlpp/debug.cc
@@ -436,29 +436,6 @@ void ExpRelation::dump(ostream&out, int indent) const
       dump_operands(out, indent+4);
 }
 
-void ExpString::dump(ostream&out, int indent) const
-{
-    out << setw(indent) << "" << "String \"" << value_;
-    out << "\"" << " at " << get_fileline() << endl;
-}
-
-void ExpUAbs::dump(ostream&out, int indent) const
-{
-      out << setw(indent) << "" << "abs() at " << get_fileline() << endl;
-      dump_operand1(out, indent+4);
-}
-
-void ExpUnary::dump_operand1(ostream&out, int indent) const
-{
-      operand1_->dump(out, indent);
-}
-
-void ExpUNot::dump(ostream&out, int indent) const
-{
-      out << setw(indent) << "" << "not() at " << get_fileline() << endl;
-      dump_operand1(out, indent+4);
-}
-
 void named_expr_t::dump(ostream&out, int indent) const
 {
     out << setw(indent) << "" << name_ << "=>";
diff --git a/vhdlpp/expression_debug.cc b/vhdlpp/expression_debug.cc
index feaaf9510..f745f128d 100644
--- a/vhdlpp/expression_debug.cc
+++ b/vhdlpp/expression_debug.cc
@@ -119,6 +119,29 @@ void ExpShift::dump(ostream&out, int indent) const
       dump_operands(out, indent+4);
 }
 
+void ExpString::dump(ostream&out, int indent) const
+{
+    out << setw(indent) << "" << "String \"" << value_;
+    out << "\"" << " at " << get_fileline() << endl;
+}
+
+void ExpUAbs::dump(ostream&out, int indent) const
+{
+      out << setw(indent) << "" << "abs() at " << get_fileline() << endl;
+      dump_operand1(out, indent+4);
+}
+
+void ExpUnary::dump_operand1(ostream&out, int indent) const
+{
+      operand1_->dump(out, indent);
+}
+
+void ExpUNot::dump(ostream&out, int indent) const
+{
+      out << setw(indent) << "" << "not() at " << get_fileline() << endl;
+      dump_operand1(out, indent+4);
+}
+
 void ExpTime::dump(ostream&out, int indent) const
 {
       out << setw(indent) << "" << "Time ";