diff --git a/.gitignore b/.gitignore
index 4c54d04ea..18e980a59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-# Maven build folders
-target/
 
 # Ant build folders
 build/
@@ -58,3 +56,7 @@ bild.log
 
 bild_output.txt
 antlr4cpp.suo
+antlr4-maven-plugin/target
+runtime/Java/target
+tool/target
+runtime-testsuite/target
diff --git a/tool/src/org/antlr/v4/codegen/CodeGenerator.java b/tool/src/org/antlr/v4/codegen/CodeGenerator.java
index f29ad8912..af95ddae7 100644
--- a/tool/src/org/antlr/v4/codegen/CodeGenerator.java
+++ b/tool/src/org/antlr/v4/codegen/CodeGenerator.java
@@ -245,7 +245,7 @@ public class CodeGenerator {
 			getTarget().genBaseVisitorHeaderFile(g, headerFileST);
 		}
 	}
-
+/*
 	public void writeHeaderFile() {
 		String fileName = getHeaderFileName();
 		if (fileName == null)
@@ -257,7 +257,7 @@ public class CodeGenerator {
 			getTarget().genRecognizerHeaderFile(g, headerFileST, extST.render(lineWidth));
 		}
 	}
-	
+*/	
 	public void writeVocabFile() {
 		// write out the vocab interchange file; used by antlr,
 		// does not change per target
diff --git a/tool/src/org/antlr/v4/codegen/CppTarget.java b/tool/src/org/antlr/v4/codegen/target/CppTarget.java
similarity index 100%
rename from tool/src/org/antlr/v4/codegen/CppTarget.java
rename to tool/src/org/antlr/v4/codegen/target/CppTarget.java