1 files changed, 13 insertions, 8 deletions
diff --git a/src/sexpr/parser.hpp b/src/sexpr/parser.hpp
index 6097f78..feed636 100644
--- a/src/sexpr/parser.hpp
+++ b/src/sexpr/parser.hpp
@@ -1,5 +1,4 @@
-#ifndef TMWA_SEXPR_PARSER_HPP
-#define TMWA_SEXPR_PARSER_HPP
+#pragma once
 //    parser.hpp - build a tree of S-expressions
 //
 //    Copyright © 2014 Ben Longbons <b.r.longbons@gmail.com>
@@ -19,14 +18,21 @@
 //    You should have received a copy of the GNU Affero General Public License
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# include "../sanity.hpp"
+#include "fwd.hpp"
 
-# include "../strings/zstring.hpp"
+#include <cstdlib>
 
-# include "../io/line.hpp"
+#include "../strings/fwd.hpp"
 
-# include "lexer.hpp"
+#include "../io/line.hpp"
 
+#include "lexer.hpp"
+
+#include "fwd.hpp"
+
+
+namespace tmwa
+{
 namespace sexpr
 {
     enum Type
@@ -76,5 +82,4 @@ namespace sexpr
     /// return false on error or eof, check lex.peek() == TOK_EOF to see
     bool parse(Lexer& lex, SExpr& out);
 } // namespace sexpr
-
-#endif // TMWA_SEXPR_PARSER_HPP
+} // namespace tmwa