diff --git a/include/mapnik/svg/svg_parser.hpp b/include/mapnik/svg/svg_parser.hpp
index fd22dec60..bf919f413 100644
--- a/include/mapnik/svg/svg_parser.hpp
+++ b/include/mapnik/svg/svg_parser.hpp
@@ -40,10 +40,9 @@ namespace  mapnik { namespace svg {
 class svg_parser : private boost::noncopyable
 {
 public:
-explicit svg_parser(svg_converter_type & path);
-~svg_parser();
- 
-void parse(std::string const& filename);
+    explicit svg_parser(svg_converter_type & path);
+    ~svg_parser();
+    void parse(std::string const& filename);
 private:
     void process_node(xmlTextReaderPtr reader);
     void start_element(xmlTextReaderPtr reader);
diff --git a/include/mapnik/wkt/wkt_grammar.hpp b/include/mapnik/wkt/wkt_grammar.hpp
index de42810c8..a8db25ab2 100644
--- a/include/mapnik/wkt/wkt_grammar.hpp
+++ b/include/mapnik/wkt/wkt_grammar.hpp
@@ -135,7 +135,7 @@ struct wkt_grammar : qi::grammar<Iterator, geometry_type*(), ascii::space_type>
 };
 
 template <typename Iterator>
-struct wkt_collection_grammar : qi::grammar<Iterator, boost::ptr_vector<mapnik::geometry_type>(), ascii::space_type>
+struct wkt_collection_grammar : qi::grammar<Iterator, boost::ptr_vector<geometry_type>(), ascii::space_type>
 {
     wkt_collection_grammar()
         :  wkt_collection_grammar::base_type(start)
@@ -148,7 +148,7 @@ struct wkt_collection_grammar : qi::grammar<Iterator, boost::ptr_vector<mapnik::
             >> (lit("(") >> *wkt[push_back(_val,_1)] % lit(",") >> lit(")"));
     }
     
-    qi::rule<Iterator,boost::ptr_vector<mapnik::geometry_type>(),ascii::space_type> start;
+    qi::rule<Iterator,boost::ptr_vector<geometry_type>(),ascii::space_type> start;
     wkt_grammar<Iterator> wkt;
 };