@@ -123,11 +123,11 @@
 		OF_XMLPARSER_IN_ATTR_NAME,
 		OF_XMLPARSER_EXPECT_DELIM,
 		OF_XMLPARSER_IN_ATTR_VALUE,
 		OF_XMLPARSER_EXPECT_CLOSE,
 		OF_XMLPARSER_EXPECT_SPACE_OR_CLOSE,
-		OF_XMLPARSER_IN_CDATA_OR_COMMENT,
+		OF_XMLPARSER_IN_EXCLAMATIONMARK,
 		OF_XMLPARSER_IN_CDATA_OPENING_1,
 		OF_XMLPARSER_IN_CDATA_OPENING_2,
 		OF_XMLPARSER_IN_CDATA_OPENING_3,
 		OF_XMLPARSER_IN_CDATA_OPENING_4,
 		OF_XMLPARSER_IN_CDATA_OPENING_5,
@@ -137,10 +137,11 @@
 		OF_XMLPARSER_IN_CDATA_3,
 		OF_XMLPARSER_IN_COMMENT_OPENING,
 		OF_XMLPARSER_IN_COMMENT_1,
 		OF_XMLPARSER_IN_COMMENT_2,
 		OF_XMLPARSER_IN_COMMENT_3,
+		OF_XMLPARSER_IN_DOCTYPE,
 		OF_XMLPARSER_NUM_STATES
 	} state;
 	OFMutableString *cache;
 	OFString *name;
 	OFString *prefix;
@@ -156,10 +157,11 @@
 	of_xml_parser_string_block_t charactersHandler;
 	of_xml_parser_string_block_t CDATAHandler;
 	of_xml_parser_string_block_t commentHandler;
 	of_xml_parser_unknown_entity_block_t unknownEntityHandler;
 #endif
+	size_t level;
 }
 
 #ifdef OF_HAVE_PROPERTIES
 @property (retain) id <OFXMLParserDelegate> delegate;
 # ifdef OF_HAVE_BLOCKS