diff --git a/include/yaml-cpp/emitterstyle.h b/include/yaml-cpp/emitterstyle.h
index 67bb3981b..5a6355fa2 100644
--- a/include/yaml-cpp/emitterstyle.h
+++ b/include/yaml-cpp/emitterstyle.h
@@ -8,9 +8,10 @@
 #endif
 
 namespace YAML {
-struct EmitterStyle {
-  enum value { Default, Block, Flow };
-};
+namespace EmitterStyle {
+enum value { Default, Block, Flow };
+}
+
 }
 
 #endif  // EMITTERSTYLE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
diff --git a/include/yaml-cpp/node/type.h b/include/yaml-cpp/node/type.h
index 9d55ca966..b1237670c 100644
--- a/include/yaml-cpp/node/type.h
+++ b/include/yaml-cpp/node/type.h
@@ -8,9 +8,10 @@
 #endif
 
 namespace YAML {
-struct NodeType {
-  enum value { Undefined, Null, Scalar, Sequence, Map };
-};
+namespace NodeType {
+enum value { Undefined, Null, Scalar, Sequence, Map };
+}
+
 }
 
 #endif  // VALUE_TYPE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
diff --git a/src/singledocparser.cpp b/src/singledocparser.cpp
index 22913d198..a8e949c2e 100644
--- a/src/singledocparser.cpp
+++ b/src/singledocparser.cpp
@@ -1,4 +1,3 @@
-#include <algorithm>
 #include <cstdio>
 #include <sstream>
 
@@ -93,8 +92,8 @@ void SingleDocParser::HandleNode(EventHandler& eventHandler) {
   // add non-specific tags
   if (tag.empty())
     tag = (token.type == Token::NON_PLAIN_SCALAR ? "!" : "?");
-  
-  if (token.type == Token::PLAIN_SCALAR 
+
+  if (token.type == Token::PLAIN_SCALAR
       && tag.compare("?") == 0 && IsNullString(token.value)) {
     eventHandler.OnNull(mark, anchor);
     m_scanner.pop();