diff --git a/core/src/processing/xml/StdXMLBuilder.java b/core/src/processing/xml/StdXMLBuilder.java
index c6a43cd39..54a223546 100644
--- a/core/src/processing/xml/StdXMLBuilder.java
+++ b/core/src/processing/xml/StdXMLBuilder.java
@@ -49,7 +49,7 @@ public class StdXMLBuilder
    /**
     * This stack contains the current element and its parents.
     */
-   private Stack stack;
+   private Stack<XMLElement> stack;
 
 
    /**
@@ -118,7 +118,7 @@ public class StdXMLBuilder
    public void startBuilding(String systemID,
                              int    lineNr)
    {
-      this.stack = new Stack();
+      this.stack = new Stack<XMLElement>();
       this.root = null;
    }
 
diff --git a/core/src/processing/xml/StdXMLParser.java b/core/src/processing/xml/StdXMLParser.java
index ce0c049b3..da60bbb5d 100644
--- a/core/src/processing/xml/StdXMLParser.java
+++ b/core/src/processing/xml/StdXMLParser.java
@@ -461,9 +461,9 @@ public class StdXMLParser {
          name = name.substring(colonIndex + 1);
       }
 
-      Vector attrNames = new Vector();
-      Vector attrValues = new Vector();
-      Vector attrTypes = new Vector();
+      Vector<String> attrNames = new Vector<String>();
+      Vector<String> attrValues = new Vector<String>();
+      Vector<String> attrTypes = new Vector<String>();
 
       this.validator.elementStarted(fullName,
                                     this.reader.getSystemID(),
@@ -487,7 +487,7 @@ public class StdXMLParser {
                                                 extraAttributes,
                                                 this.reader.getSystemID(),
                                                 this.reader.getLineNr());
-      Enumeration en = extraAttributes.keys();
+      Enumeration<?> en = extraAttributes.keys();
 
       while (en.hasMoreElements()) {
          String key = (String) en.nextElement();
@@ -656,9 +656,9 @@ public class StdXMLParser {
     * @throws java.lang.Exception
     *     if something went wrong
     */
-   protected void processAttribute(Vector attrNames,
-                                   Vector attrValues,
-                                   Vector attrTypes)
+   protected void processAttribute(Vector<String> attrNames,
+                                   Vector<String> attrValues,
+                                   Vector<String> attrTypes)
       throws Exception
    {
       String key = XMLUtil.scanIdentifier(this.reader);
diff --git a/core/src/processing/xml/StdXMLReader.java b/core/src/processing/xml/StdXMLReader.java
index 9914cee49..e2d97a580 100644
--- a/core/src/processing/xml/StdXMLReader.java
+++ b/core/src/processing/xml/StdXMLReader.java
@@ -78,7 +78,7 @@ public class StdXMLReader
    /**
     * The stack of readers.
     */
-   private Stack readers;
+   private Stack<StackedReader> readers;
 
 
    /**
@@ -158,7 +158,7 @@ public class StdXMLReader
       }
 
       this.currentReader = new StackedReader();
-      this.readers = new Stack();
+      this.readers = new Stack<StackedReader>();
       Reader reader = this.openStream(publicID, systemIDasURL.toString());
       this.currentReader.lineReader = new LineNumberReader(reader);
       this.currentReader.pbReader
@@ -174,7 +174,7 @@ public class StdXMLReader
    public StdXMLReader(Reader reader)
    {
       this.currentReader = new StackedReader();
-      this.readers = new Stack();
+      this.readers = new Stack<StackedReader>();
       this.currentReader.lineReader = new LineNumberReader(reader);
       this.currentReader.pbReader
          = new PushbackReader(this.currentReader.lineReader, 2);
@@ -349,7 +349,7 @@ public class StdXMLReader
       StringBuffer charsRead = new StringBuffer();
       Reader reader = this.stream2reader(stream, charsRead);
       this.currentReader = new StackedReader();
-      this.readers = new Stack();
+      this.readers = new Stack<StackedReader>();
       this.currentReader.lineReader = new LineNumberReader(reader);
       this.currentReader.pbReader
          = new PushbackReader(this.currentReader.lineReader, 2);
diff --git a/core/src/processing/xml/XMLElement.java b/core/src/processing/xml/XMLElement.java
index d068971ed..944df0cd8 100644
--- a/core/src/processing/xml/XMLElement.java
+++ b/core/src/processing/xml/XMLElement.java
@@ -56,13 +56,13 @@ public class XMLElement implements Serializable {
     /**
      * The attributes of the element.
      */
-    private Vector attributes;
+    private Vector<XMLAttribute> attributes;
 
 
     /**
      * The child elements.
      */
-    private Vector children;
+    private Vector<XMLElement> children;
 
 
     /**
@@ -178,8 +178,8 @@ public class XMLElement implements Serializable {
                       String namespace,
                       String systemID,
                       int    lineNr) {
-        this.attributes = new Vector();
-        this.children = new Vector(8);
+        this.attributes = new Vector<XMLAttribute>();
+        this.children = new Vector<XMLElement>(8);
         this.fullName = fullName;
         if (namespace == null) {
             this.name = fullName;
@@ -481,7 +481,7 @@ public class XMLElement implements Serializable {
      *
      * @return the non-null enumeration
      */
-    public Enumeration enumerateChildren() {
+    public Enumeration<XMLElement> enumerateChildren() {
         return this.children.elements();
     }
 
@@ -767,7 +767,7 @@ public class XMLElement implements Serializable {
      * @return the attribute, or null if the attribute does not exist.
      */
     private XMLAttribute findAttribute(String fullName) {
-        Enumeration en = this.attributes.elements();
+        Enumeration<XMLAttribute> en = this.attributes.elements();
         while (en.hasMoreElements()) {
             XMLAttribute attr = (XMLAttribute) en.nextElement();
             if (attr.getFullName().equals(fullName)) {
@@ -788,7 +788,7 @@ public class XMLElement implements Serializable {
      */
     private XMLAttribute findAttribute(String name,
                                        String namespace) {
-        Enumeration en = this.attributes.elements();
+        Enumeration<XMLAttribute> en = this.attributes.elements();
         while (en.hasMoreElements()) {
             XMLAttribute attr = (XMLAttribute) en.nextElement();
             boolean found = attr.getName().equals(name);
@@ -1136,9 +1136,9 @@ public class XMLElement implements Serializable {
      *
      * @return the non-null enumeration.
      */
-    public Enumeration enumerateAttributeNames() {
-        Vector result = new Vector();
-        Enumeration en = this.attributes.elements();
+    public Enumeration<String> enumerateAttributeNames() {
+        Vector<String> result = new Vector<String>();
+        Enumeration<XMLAttribute> en = this.attributes.elements();
         while (en.hasMoreElements()) {
             XMLAttribute attr = (XMLAttribute) en.nextElement();
             result.addElement(attr.getFullName());
@@ -1175,7 +1175,7 @@ public class XMLElement implements Serializable {
      */
     public Properties getAttributes() {
         Properties result = new Properties();
-        Enumeration en = this.attributes.elements();
+        Enumeration<XMLAttribute> en = this.attributes.elements();
         while (en.hasMoreElements()) {
             XMLAttribute attr = (XMLAttribute) en.nextElement();
             result.put(attr.getFullName(), attr.getValue());
@@ -1193,7 +1193,7 @@ public class XMLElement implements Serializable {
      */
     public Properties getAttributesInNamespace(String namespace) {
         Properties result = new Properties();
-        Enumeration en = this.attributes.elements();
+        Enumeration<XMLAttribute> en = this.attributes.elements();
         while (en.hasMoreElements()) {
             XMLAttribute attr = (XMLAttribute) en.nextElement();
             if (namespace == null) {
@@ -1285,7 +1285,7 @@ public class XMLElement implements Serializable {
         if (this.attributes.size() != rawElement.getAttributeCount()) {
             return false;
         }
-        Enumeration en = this.attributes.elements();
+        Enumeration<XMLAttribute> en = this.attributes.elements();
         while (en.hasMoreElements()) {
             XMLAttribute attr = (XMLAttribute) en.nextElement();
             if (! rawElement.hasAttribute(attr.getName(), attr.getNamespace())) {
diff --git a/core/src/processing/xml/XMLEntityResolver.java b/core/src/processing/xml/XMLEntityResolver.java
index 7388c8708..f12c4c0d4 100644
--- a/core/src/processing/xml/XMLEntityResolver.java
+++ b/core/src/processing/xml/XMLEntityResolver.java
@@ -46,7 +46,7 @@ public class XMLEntityResolver
    /**
     * The entities.
     */
-   private Hashtable entities;
+   private Hashtable<String, Object> entities;
 
 
    /**
@@ -54,7 +54,7 @@ public class XMLEntityResolver
     */
    public XMLEntityResolver()
    {
-      this.entities = new Hashtable();
+      this.entities = new Hashtable<String, Object>();
       this.entities.put("amp", "&#38;");
       this.entities.put("quot", "&#34;");
       this.entities.put("apos", "&#39;");
diff --git a/core/src/processing/xml/XMLValidator.java b/core/src/processing/xml/XMLValidator.java
index 2c0529075..876046d85 100644
--- a/core/src/processing/xml/XMLValidator.java
+++ b/core/src/processing/xml/XMLValidator.java
@@ -59,13 +59,13 @@ public class XMLValidator
     * Contains the default values for attributes for the different element
     * types.
     */
-   protected Hashtable attributeDefaultValues;
+   protected Hashtable<String, Properties> attributeDefaultValues;
 
 
    /**
     * The stack of elements to be processed.
     */
-   protected Stack currentElements;
+   protected Stack<Properties> currentElements;
 
 
    /**
@@ -73,8 +73,8 @@ public class XMLValidator
     */
    public XMLValidator()
    {
-      this.attributeDefaultValues = new Hashtable();
-      this.currentElements = new Stack();
+      this.attributeDefaultValues = new Hashtable<String, Properties>();
+      this.currentElements = new Stack<Properties>();
       this.parameterEntityResolver = new XMLEntityResolver();
    }
 
@@ -586,7 +586,7 @@ public class XMLValidator
                                           int        lineNr)
    {
       Properties props = (Properties) this.currentElements.pop();
-      Enumeration en = props.keys();
+      Enumeration<?> en = props.keys();
 
       while (en.hasMoreElements()) {
          String key = (String) en.nextElement();
diff --git a/core/src/processing/xml/XMLWriter.java b/core/src/processing/xml/XMLWriter.java
index caf8a5659..7925cf8e3 100644
--- a/core/src/processing/xml/XMLWriter.java
+++ b/core/src/processing/xml/XMLWriter.java
@@ -164,7 +164,7 @@ public class XMLWriter
       } else {
          this.writer.print('<');
          this.writer.print(xml.getName());
-         Vector nsprefixes = new Vector();
+         Vector<String> nsprefixes = new Vector<String>();
 
          if (xml.getNamespace() != null) {
             if (xml.getLocalName().equals(xml.getName())) {
@@ -178,7 +178,7 @@ public class XMLWriter
             }
          }
 
-         Enumeration en = xml.enumerateAttributeNames();
+         Enumeration<?> en = xml.enumerateAttributeNames();
 
          while (en.hasMoreElements()) {
             String key = (String) en.nextElement();