@@ -9,6 +9,7 @@
 import java.io.PrintWriter;
 import java.text.SimpleDateFormat;
 import java.util.HashMap;
+import java.util.List;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DefaultLogger;
 import org.apache.tools.ant.Project;
@@ -107,8 +108,7 @@ public boolean createProject() {
 
       // grab code from current editing window
       sketch.prepare();
-      className = sketch.preprocess(buildPath, new Preproc(buildPath, sketch
-          .getName()));
+      className = sketch.preprocess(buildPath, new Preproc(sketch.getName()));
       if (className != null) {
         final File androidXML = new File(androidFolder, "AndroidManifest.xml");
         writeAndroidManifest(androidXML, sketch.getName(), className);
@@ -325,17 +325,18 @@ String getPathForAPK(final String target) {
 
   class Preproc extends PdePreprocessor {
 
-    public Preproc(final String buildPath, final String sketchName)
-        throws IOException {
-      super(buildPath, sketchName);
+    public Preproc(final String sketchName) throws IOException {
+      super(sketchName);
     }
 
     @Override
-    public int writeImports(final PrintStream out) {
+    protected int writeImports(final PrintStream out,
+                               final List<String> programImports,
+                               final List<String> codeFolderImports) {
       out.println("package " + getPackageName() + ";");
       out.println();
       // add two lines for the package above
-      return 2 + super.writeImports(out);
+      return 2 + super.writeImports(out, programImports, codeFolderImports);
     }
 
     @Override
 
@@ -1203,7 +1203,7 @@ public void prepare() {
    */
   public String preprocess(String buildPath) throws RunnerException {
     try {
-      return preprocess(buildPath, new PdePreprocessor(buildPath, name));
+      return preprocess(buildPath, new PdePreprocessor(name));
     } catch (IOException e) {
       throw new RunnerException("Error while preprocessing", true);
     }
@@ -1250,30 +1250,20 @@ public String preprocess(String buildPath, PdePreprocessor preprocessor) throws
       }
     }
 
-    // Note that the headerOffset isn't applied until compile and run, because
-    // it only applies to the code after it's been written to the .java file.
-    int headerOffset = 0;
+    final PreprocessResult result;
     try {
-      headerOffset = preprocessor.writePrefix(bigCode.toString(), codeFolderPackages);
+      final File java = new File(buildPath, name + ".java");
+      final PrintStream stream = new PrintStream(new FileOutputStream(java));
+      try {
+        result = preprocessor.write(stream, bigCode.toString(),
+          codeFolderPackages);
+      } finally {
+        stream.close();
+      }
     } catch (FileNotFoundException fnfe) {
       fnfe.printStackTrace();
       String msg = "Build folder disappeared or could not be written";
       throw new RunnerException(msg);
-    }
-
-    // 2. run preproc on that code using the sugg class name
-    //    to create a single .java file and write to buildpath
-
-    String primaryClassName = null;
-
-    try {
-      final String className = preprocessor.write();
-      if (className == null) {
-        throw new RunnerException("Could not find main class");
-      }
-
-      // store this for the compiler and the runtime
-      primaryClassName = className;
     } catch (antlr.RecognitionException re) {
       // re also returns a column that we're not bothering with for now
 
@@ -1394,7 +1384,7 @@ public String preprocess(String buildPath, PdePreprocessor preprocessor) throws
     // grab the imports from the code just preproc'd
 
     importedLibraries = new ArrayList<File>();
-    for (String item : preprocessor.getExtraImports()) {
+    for (String item : result.extraImports) {
       // remove things up to the last dot
       int dot = item.lastIndexOf('.');
       // http://dev.processing.org/bugs/show_bug.cgi?id=1145
@@ -1433,15 +1423,14 @@ public String preprocess(String buildPath, PdePreprocessor preprocessor) throws
           throw new RunnerException("Problem moving " + filename +
                                     " to the build folder");
         }
-//        sc.setPreprocName(filename);
 
       } else if (sc.isExtension("pde")) {
         // The compiler and runner will need this to have a proper offset
-        sc.addPreprocOffset(headerOffset);
+        sc.addPreprocOffset(result.headerOffset);
       }
     }
     foundMain = preprocessor.getFoundMain();
-    return primaryClassName;
+    return result.className;
   }
 
   public boolean getFoundMain() {