diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/CommentManager.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/CommentManager.java
index a772fa1e4..59ea60d9a 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/CommentManager.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/CommentManager.java
@@ -77,8 +77,11 @@ public class CommentManager
      * This should be called for every file that is checked.
      * @param aLines all lines in a file.
      */
-    CommentManager(String[] aLines)
+    public CommentManager(String[] aLines)
     {
+        // TODO: Make this constructor package local again
+        // when parsing is done in a central place
+        // (currently it's done in the c.p.t.checkstyle and c.p.t.c.gui)
         mLines = aLines;
     }
 
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/StringArrayReader.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/StringArrayReader.java
index 372f7c256..6a3cfb5e6 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/StringArrayReader.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/StringArrayReader.java
@@ -27,8 +27,12 @@ import java.io.IOException;
  *
  * @author <a href="mailto:lkuehne@users.sourceforge.net">Lars Kühne</a>
  */
-class StringArrayReader extends Reader
+public class StringArrayReader extends Reader
 {
+    // TODO: Make this class and it's constructor package local again
+    // when parsing is done in a central place
+    // (currently it's done in the c.p.t.checkstyle and c.p.t.c.gui)
+
     /** the underlying String array */
     private final String[] mUnderlyingArray;
 
@@ -49,7 +53,7 @@ class StringArrayReader extends Reader
      *
      * @param aUnderlyingArray the underlying String array.
      */
-    StringArrayReader(String[] aUnderlyingArray)
+    public StringArrayReader(String[] aUnderlyingArray)
     {
         final int length = aUnderlyingArray.length;
         mUnderlyingArray = new String[length];
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/java_new.g b/src/checkstyle/com/puppycrawl/tools/checkstyle/java_new.g
index 5783dd6be..741711612 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/java_new.g
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/java_new.g
@@ -954,7 +954,9 @@ options {
 
     private CommentManager mCommentManager = null;
 
-    void setCommentManager(CommentManager aCommentManager)
+    // TODO: Check visibility of this method one parsing is done in central
+    // utility method
+    public void setCommentManager(CommentManager aCommentManager)
     {
         mCommentManager = aCommentManager;
     }