diff --git a/com.ibm.wala.cast.java.jdt.test/source/com/ibm/wala/cast/java/test/JDTJava15IRTests.java b/com.ibm.wala.cast.java.jdt.test/source/com/ibm/wala/cast/java/test/JDTJava15IRTests.java
index 6cbec7670..3dc7050b5 100644
--- a/com.ibm.wala.cast.java.jdt.test/source/com/ibm/wala/cast/java/test/JDTJava15IRTests.java
+++ b/com.ibm.wala.cast.java.jdt.test/source/com/ibm/wala/cast/java/test/JDTJava15IRTests.java
@@ -62,7 +62,7 @@ public class JDTJava15IRTests extends IRTests {
     };
 
     try {
-      engine.setExclusionsFile(FileProvider
+      engine.setExclusionsFile((new FileProvider())
           .getFileFromPlugin(CoreTestsPlugin.getDefault(), CallGraphTestUtil.REGRESSION_EXCLUSIONS).getAbsolutePath());
     } catch (IOException e) {
       Assert.assertFalse("Cannot find exclusions file", true);
diff --git a/com.ibm.wala.cast.java.jdt.test/source/com/ibm/wala/cast/java/test/JDTJavaIRTests.java b/com.ibm.wala.cast.java.jdt.test/source/com/ibm/wala/cast/java/test/JDTJavaIRTests.java
index cdb318467..b515919d3 100644
--- a/com.ibm.wala.cast.java.jdt.test/source/com/ibm/wala/cast/java/test/JDTJavaIRTests.java
+++ b/com.ibm.wala.cast.java.jdt.test/source/com/ibm/wala/cast/java/test/JDTJavaIRTests.java
@@ -96,7 +96,7 @@ public class JDTJavaIRTests extends JavaIRTests {
     };
 
     try {
-      engine.setExclusionsFile(FileProvider
+      engine.setExclusionsFile((new FileProvider())
           .getFileFromPlugin(CoreTestsPlugin.getDefault(), CallGraphTestUtil.REGRESSION_EXCLUSIONS).getAbsolutePath());
     } catch (IOException e) {
       Assert.assertFalse("Cannot find exclusions file", true);
diff --git a/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/client/polyglot/EclipseProjectSourceAnalysisEngine.java b/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/client/polyglot/EclipseProjectSourceAnalysisEngine.java
index f40398eed..7bde96d20 100644
--- a/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/client/polyglot/EclipseProjectSourceAnalysisEngine.java
+++ b/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/client/polyglot/EclipseProjectSourceAnalysisEngine.java
@@ -64,7 +64,7 @@ public class EclipseProjectSourceAnalysisEngine extends EclipseProjectAnalysisEn
     super(project);
     this.fileExt = fileExt;
     try {
-      setExclusionsFile(FileProvider.getFileFromPlugin(CorePlugin.getDefault(), "J2SEClassHierarchyExclusions.txt")
+      setExclusionsFile((new FileProvider()).getFileFromPlugin(CorePlugin.getDefault(), "J2SEClassHierarchyExclusions.txt")
           .getAbsolutePath());
     } catch (IOException e) {
       Assertions.UNREACHABLE("Cannot find exclusions file");
diff --git a/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/HTMLCGBuilder.java b/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/HTMLCGBuilder.java
index c73766cef..0096bad00 100644
--- a/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/HTMLCGBuilder.java
+++ b/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/HTMLCGBuilder.java
@@ -125,7 +125,7 @@ public class HTMLCGBuilder {
 		// first try interpreting as local file name, if that doesn't work just
 		// assume it's a URL
 		try {
-			File f = FileProvider.getFileFromClassLoader(src, HTMLCGBuilder.class.getClassLoader());
+			File f = (new FileProvider()).getFileFromClassLoader(src, HTMLCGBuilder.class.getClassLoader());
 			URL url = f.toURI().toURL();
 			return url;
 		} catch (FileNotFoundException fnfe) {
diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationFinder.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationFinder.java
index f5a5e5403..965f5f384 100644
--- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationFinder.java
+++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationFinder.java
@@ -270,7 +270,7 @@ public class CorrelationFinder {
   private URL toUrl(String src) throws MalformedURLException {
     // first try interpreting as local file name, if that doesn't work just assume it's a URL
     try {
-      File f = FileProvider.getFileFromClassLoader(src, this.getClass().getClassLoader());
+      File f = (new FileProvider()).getFileFromClassLoader(src, this.getClass().getClassLoader());
       URL url = f.toURI().toURL();
       return url;
     } catch(FileNotFoundException fnfe) {
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CallGraphTestUtil.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CallGraphTestUtil.java
index 578d06a3d..d2fc631e1 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CallGraphTestUtil.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CallGraphTestUtil.java
@@ -45,7 +45,7 @@ public class CallGraphTestUtil {
   private static final boolean CHECK_FOOTPRINT = false;
 
   public static AnalysisScope makeJ2SEAnalysisScope(String scopeFile, String exclusionsFile) throws IOException {
-    AnalysisScope scope = AnalysisScopeReader.readJavaScope(scopeFile, FileProvider.getFile(exclusionsFile), MY_CLASSLOADER);
+    AnalysisScope scope = AnalysisScopeReader.readJavaScope(scopeFile, (new FileProvider()).getFile(exclusionsFile), MY_CLASSLOADER);
     return scope;
   }
 
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/DupFieldsTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/DupFieldsTest.java
index 84b3f6833..a17c623c7 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/DupFieldsTest.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/DupFieldsTest.java
@@ -34,7 +34,7 @@ public class DupFieldsTest extends WalaTestCase {
 
   @Test public void testDupFieldNames() throws IOException, ClassHierarchyException {
     AnalysisScope scope = null;
-    scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, FileProvider.getFile("J2SEClassHierarchyExclusions.txt"), DupFieldsTest.class.getClassLoader());
+    scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, (new FileProvider()).getFile("J2SEClassHierarchyExclusions.txt"), DupFieldsTest.class.getClassLoader());
     ClassHierarchy cha = ClassHierarchy.make(scope);
     TypeReference ref = TypeReference.findOrCreate(ClassLoaderReference.Application, "LDupFieldName");
     IClass klass = cha.lookupClass(ref);
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/ExclusionsTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/ExclusionsTest.java
index 51dd5ef9c..40036d3e2 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/ExclusionsTest.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/ExclusionsTest.java
@@ -28,7 +28,7 @@ public class ExclusionsTest {
 
   @Test
   public void testExclusions() throws IOException {
-    AnalysisScope scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, FileProvider.getFile("GUIExclusions.txt"),
+    AnalysisScope scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, (new FileProvider()).getFile("GUIExclusions.txt"),
         ExclusionsTest.class.getClassLoader());
     TypeReference buttonRef = TypeReference.findOrCreate(ClassLoaderReference.Application,
         StringStuff.deployment2CanonicalTypeString("java.awt.Button"));
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/GetTargetsTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/GetTargetsTest.java
index bb6e1d662..638fa2c66 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/GetTargetsTest.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/GetTargetsTest.java
@@ -48,7 +48,7 @@ public class GetTargetsTest extends WalaTestCase {
   @BeforeClass
   public static void beforeClass() throws Exception {
 
-    scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, FileProvider.getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER);
+    scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, (new FileProvider()).getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER);
 
     ClassLoaderFactory factory = new ClassLoaderFactoryImpl(scope.getExclusions() );
 
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/InnerClassesTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/InnerClassesTest.java
index 5b98443a7..2e01d6405 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/InnerClassesTest.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/InnerClassesTest.java
@@ -48,7 +48,7 @@ public class InnerClassesTest extends WalaTestCase {
 
   @BeforeClass
   public static void beforeClass() throws Exception {
-    scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, FileProvider.getFile("J2SEClassHierarchyExclusions.txt"),
+    scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, (new FileProvider()).getFile("J2SEClassHierarchyExclusions.txt"),
         MY_CLASSLOADER);
 
     ClassLoaderFactory factory = new ClassLoaderFactoryImpl(scope.getExclusions());
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/InterfaceTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/InterfaceTest.java
index 446abf8e9..16518dc82 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/InterfaceTest.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/InterfaceTest.java
@@ -45,7 +45,7 @@ public class InterfaceTest extends WalaTestCase {
 
   @BeforeClass
   public static void beforeClass() throws Exception {
-    scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, FileProvider.getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER);
+    scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, (new FileProvider()).getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER);
 
     ClassLoaderFactory factory = new ClassLoaderFactoryImpl(scope.getExclusions() );
 
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/LibraryVersionTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/LibraryVersionTest.java
index 36cf390c9..edee8c8a7 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/LibraryVersionTest.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/LibraryVersionTest.java
@@ -34,7 +34,7 @@ public class LibraryVersionTest extends WalaTestCase {
   private static final ClassLoader MY_CLASSLOADER = DeterministicIRTest.class.getClassLoader();
 
   @Test public void testLibraryVersion() throws IOException {
-    AnalysisScope scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, FileProvider.getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER);
+    AnalysisScope scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, (new FileProvider()).getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER);
     System.err.println("java library version is " + scope.getJavaLibraryVersion());
     Assert.assertTrue(scope.isJava16Libraries() || scope.isJava15Libraries()||scope.isJava14Libraries());
   }
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/AnnotationTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/AnnotationTest.java
index e003fac7c..52b1d0e22 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/AnnotationTest.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/AnnotationTest.java
@@ -41,7 +41,7 @@ public class AnnotationTest extends WalaTestCase {
   @BeforeClass
   public static void before() throws IOException, ClassHierarchyException {
     AnalysisScope scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA,
-        FileProvider.getFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS), AnnotationTest.class.getClassLoader());
+        (new FileProvider()).getFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS), AnnotationTest.class.getClassLoader());
     cha = ClassHierarchy.make(scope);    
   }
   
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/CFGSanitizerTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/CFGSanitizerTest.java
index a262e436e..59cff7f41 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/CFGSanitizerTest.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/CFGSanitizerTest.java
@@ -53,7 +53,7 @@ public class CFGSanitizerTest extends WalaTestCase {
    */
   @Test
   public void testSyntheticEdgeToExit() throws IOException, IllegalArgumentException, WalaException {
-    AnalysisScope scope = AnalysisScopeReader.makePrimordialScope(FileProvider.getFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS));
+    AnalysisScope scope = AnalysisScopeReader.makePrimordialScope((new FileProvider()).getFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS));
 
     ClassHierarchy cha = ClassHierarchy.make(scope);
     ClassLoader cl = CFGSanitizerTest.class.getClassLoader();
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/CFGTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/CFGTest.java
index 930ca720b..c04e5a357 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/CFGTest.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/CFGTest.java
@@ -56,7 +56,7 @@ public class CFGTest extends WalaTestCase {
   public static void beforeClass() throws Exception {
 
     scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA,
-        FileProvider.getFile("J2SEClassHierarchyExclusions.txt"), CFGTest.class.getClassLoader());
+        (new FileProvider()).getFile("J2SEClassHierarchyExclusions.txt"), CFGTest.class.getClassLoader());
     ClassLoaderFactory factory = new ClassLoaderFactoryImpl(scope.getExclusions());
 
     try {
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/CornerCasesTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/CornerCasesTest.java
index 7ca0919d4..dd77575d2 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/CornerCasesTest.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/CornerCasesTest.java
@@ -53,7 +53,7 @@ public class CornerCasesTest extends WalaTestCase {
    */
   @Test public void testBug38484() throws ClassHierarchyException, IOException {
     AnalysisScope scope = null;
-    scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, FileProvider.getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER);
+    scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, (new FileProvider()).getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER);
     ClassHierarchy cha = ClassHierarchy.make(scope);
     TypeReference t = TypeReference.findOrCreateClass(scope.getApplicationLoader(), "cornerCases", "YuckyInterface");
     IClass klass = cha.lookupClass(t);
@@ -71,7 +71,7 @@ public class CornerCasesTest extends WalaTestCase {
    */
   @Test public void testBug38540() throws ClassHierarchyException, IOException {
     AnalysisScope scope = null;
-    scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, FileProvider.getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER);
+    scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, (new FileProvider()).getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER);
     AnalysisOptions options = new AnalysisOptions();
     ClassHierarchy cha = ClassHierarchy.make(scope);
     TypeReference t = TypeReference.findOrCreateClass(scope.getApplicationLoader(), "cornerCases", "Main");
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/DeterministicIRTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/DeterministicIRTest.java
index 981599d37..b2601aa47 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/DeterministicIRTest.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/DeterministicIRTest.java
@@ -66,7 +66,7 @@ public class DeterministicIRTest extends WalaTestCase {
   public static void beforeClass() throws Exception {
 
     scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA,
-        FileProvider.getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER);
+        (new FileProvider()).getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER);
     options = new AnalysisOptions(scope, null);
     cache = new AnalysisCache();
     ClassLoaderFactory factory = new ClassLoaderFactoryImpl(scope.getExclusions());
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/LocalNamesTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/LocalNamesTest.java
index ccfb7d35b..f3cec2325 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/LocalNamesTest.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/LocalNamesTest.java
@@ -68,7 +68,7 @@ public class LocalNamesTest extends WalaTestCase {
   public static void beforeClass() throws Exception {
 
     scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA,
-        FileProvider.getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER);
+        (new FileProvider()).getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER);
 
     options = new AnalysisOptions(scope, null);
     cache = new AnalysisCache();
@@ -100,7 +100,7 @@ public class LocalNamesTest extends WalaTestCase {
   @Test
   public void testAliasNames() {
     try {
-      AnalysisScope scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, FileProvider
+      AnalysisScope scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, (new FileProvider())
           .getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER);
       ClassHierarchy cha = ClassHierarchy.make(scope);
       TypeReference t = TypeReference.findOrCreateClass(scope.getApplicationLoader(), "cornerCases", "AliasNames");
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/MultiNewArrayTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/MultiNewArrayTest.java
index c9bfc6fd6..9fdfd1c77 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/MultiNewArrayTest.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/MultiNewArrayTest.java
@@ -41,7 +41,7 @@ public class MultiNewArrayTest extends WalaTestCase {
   
   @Test public void testMultiNewArray1() throws IOException, ClassHierarchyException {
     AnalysisScope scope = null;
-    scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, FileProvider.getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER);
+    scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, (new FileProvider()).getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER);
     ClassHierarchy cha = ClassHierarchy.make(scope);
     IClass klass = cha.lookupClass(TypeReference.findOrCreate(ClassLoaderReference.Application, TestConstants.MULTI_DIM_MAIN));
     Assert.assertTrue(klass != null);
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/typeInference/TypeInferenceTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/typeInference/TypeInferenceTest.java
index ec8fb60ba..4371badcf 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/typeInference/TypeInferenceTest.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/typeInference/TypeInferenceTest.java
@@ -64,7 +64,7 @@ public class TypeInferenceTest extends WalaTestCase {
   @BeforeClass
   public static void beforeClass() throws Exception {
 
-    scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, FileProvider.getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER);
+    scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, (new FileProvider()).getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER);
 
     options = new AnalysisOptions(scope, null);
     cache = new AnalysisCache();
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/DataflowTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/DataflowTest.java
index 1aafca3bd..d52905901 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/DataflowTest.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/DataflowTest.java
@@ -67,7 +67,7 @@ public class DataflowTest extends WalaTestCase {
   public static void beforeClass() throws Exception {
 
     scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA,
-        FileProvider.getFile("J2SEClassHierarchyExclusions.txt"), DataflowTest.class.getClassLoader());
+        (new FileProvider()).getFile("J2SEClassHierarchyExclusions.txt"), DataflowTest.class.getClassLoader());
 
     try {
       cha = ClassHierarchy.make(scope);
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/JavaViewerDriver.java b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/JavaViewerDriver.java
index 4d4761af7..a9ccf9f74 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/JavaViewerDriver.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/JavaViewerDriver.java
@@ -40,7 +40,7 @@ public class JavaViewerDriver {
 
   private static void run(String classPath, String exclusionFilePath) throws IOException, ClassHierarchyException, CallGraphBuilderCancelException{
 
-    File exclusionFile = FileProvider.getFile(exclusionFilePath);
+    File exclusionFile = (new FileProvider()).getFile(exclusionFilePath);
     AnalysisScope scope = AnalysisScopeReader.makeJavaBinaryAnalysisScope(classPath, exclusionFile != null ? exclusionFile
         : new File(CallGraphTestUtil.REGRESSION_EXCLUSIONS));
 
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFCallGraph.java b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFCallGraph.java
index 6b443d2ee..49a282361 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFCallGraph.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFCallGraph.java
@@ -108,7 +108,7 @@ public class PDFCallGraph {
    */
   public static Process run(String appJar, String exclusionFile) throws IllegalArgumentException, CancelException {
     try {
-      Graph<CGNode> g = buildPrunedCallGraph(appJar, FileProvider.getFile(exclusionFile));
+      Graph<CGNode> g = buildPrunedCallGraph(appJar, (new FileProvider()).getFile(exclusionFile));
 
       Properties p = null;
       try {
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFControlDependenceGraph.java b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFControlDependenceGraph.java
index 809c35a38..445f93aeb 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFControlDependenceGraph.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFControlDependenceGraph.java
@@ -87,7 +87,7 @@ public class PDFControlDependenceGraph {
       if (PDFCallGraph.isDirectory(appJar)) {
         appJar = PDFCallGraph.findJarFiles(new String[] { appJar });
       }
-      AnalysisScope scope = AnalysisScopeReader.makeJavaBinaryAnalysisScope(appJar, FileProvider.getFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS));
+      AnalysisScope scope = AnalysisScopeReader.makeJavaBinaryAnalysisScope(appJar, (new FileProvider()).getFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS));
 
       ClassHierarchy cha = ClassHierarchy.make(scope);
 
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFSDG.java b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFSDG.java
index 526b05ac7..d02ef598f 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFSDG.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFSDG.java
@@ -117,7 +117,7 @@ public class PDFSDG {
    */
   public static Process run(String appJar, String mainClass, DataDependenceOptions dOptions, ControlDependenceOptions cOptions) throws IllegalArgumentException, CancelException, IOException {
     try {
-      AnalysisScope scope = AnalysisScopeReader.makeJavaBinaryAnalysisScope(appJar, FileProvider.getFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS));
+      AnalysisScope scope = AnalysisScopeReader.makeJavaBinaryAnalysisScope(appJar, (new FileProvider()).getFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS));
 
       // generate a WALA-consumable wrapper around the incoming scope object
       
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFSlice.java b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFSlice.java
index de0661bd9..a08a1b8f8 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFSlice.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFSlice.java
@@ -145,7 +145,7 @@ public class PDFSlice {
       IOException {
     try {
       // create an analysis scope representing the appJar as a J2SE application
-      AnalysisScope scope = AnalysisScopeReader.makeJavaBinaryAnalysisScope(appJar, FileProvider
+      AnalysisScope scope = AnalysisScopeReader.makeJavaBinaryAnalysisScope(appJar, (new FileProvider())
           .getFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS));
 
       // build a class hierarchy, call graph, and system dependence graph
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFTypeHierarchy.java b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFTypeHierarchy.java
index c7c6cdb98..eb01049ce 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFTypeHierarchy.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFTypeHierarchy.java
@@ -71,7 +71,7 @@ public class PDFTypeHierarchy {
     try {
       validateCommandLine(args);
       String classpath = args[CLASSPATH_INDEX];
-      AnalysisScope scope = AnalysisScopeReader.makeJavaBinaryAnalysisScope(classpath, FileProvider.getFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS));
+      AnalysisScope scope = AnalysisScopeReader.makeJavaBinaryAnalysisScope(classpath, (new FileProvider()).getFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS));
 
       // invoke WALA to build a class hierarchy
       ClassHierarchy cha = ClassHierarchy.make(scope);
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFWalaIR.java b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFWalaIR.java
index 57fd0b26e..6cc17d800 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFWalaIR.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFWalaIR.java
@@ -72,7 +72,7 @@ public class PDFWalaIR {
       
       // Build an AnalysisScope which represents the set of classes to analyze.  In particular,
       // we will analyze the contents of the appJar jar file and the Java standard libraries.
-      AnalysisScope scope = AnalysisScopeReader.makeJavaBinaryAnalysisScope(appJar, FileProvider
+      AnalysisScope scope = AnalysisScopeReader.makeJavaBinaryAnalysisScope(appJar, (new FileProvider())
           .getFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS));
 
       // Build a class hierarchy representing all classes to analyze.  This step will read the class
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/properties/WalaExamplesProperties.java b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/properties/WalaExamplesProperties.java
index 6f2226672..b3ecb044e 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/properties/WalaExamplesProperties.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/properties/WalaExamplesProperties.java
@@ -43,7 +43,7 @@ public final class WalaExamplesProperties {
       throw new IllegalStateException("failed to find URL for wala.examples.properties");
     }
 
-    return new File(FileProvider.filePathFromURL(url)).getParentFile().getParentFile().getAbsolutePath();
+    return new File((new FileProvider()).filePathFromURL(url)).getParentFile().getParentFile().getAbsolutePath();
   }
 
 }
\ No newline at end of file
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/util/io/FileProviderTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/util/io/FileProviderTest.java
index 6fda01327..6e8e88772 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/util/io/FileProviderTest.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/util/io/FileProviderTest.java
@@ -17,7 +17,7 @@ public class FileProviderTest {
     URL url = new URL("file:///c:/my/File.jar");
     String expected = "/c:/my/File.jar";
     // exercise:
-    String actual = FileProvider.filePathFromURL(url);
+    String actual = (new FileProvider()).filePathFromURL(url);
     // verify:
     assertEquals(expected, actual);
   }
@@ -29,7 +29,7 @@ public class FileProviderTest {
     URL url = new URL("file:///[Eclipse]/File.jar");
     String expected = PlatformUtil.onWindows() ? "/C:/[Eclipse]/File.jar" : "/[Eclipse]/File.jar";
     // exercise:
-    String actual = FileProvider.filePathFromURL(url);
+    String actual = (new FileProvider()).filePathFromURL(url);
     // verify:
     assertEquals(expected, actual);
   }
diff --git a/com.ibm.wala.core/src/com/ibm/wala/classLoader/AbstractURLModule.java b/com.ibm.wala.core/src/com/ibm/wala/classLoader/AbstractURLModule.java
index 00a838411..c26c998b0 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/classLoader/AbstractURLModule.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/classLoader/AbstractURLModule.java
@@ -40,7 +40,7 @@ public abstract class AbstractURLModule implements Module, ModuleEntry {
       if (con instanceof JarURLConnection)
         return ((JarURLConnection) con).getEntryName();
       else
-        return FileProvider.filePathFromURL(url);
+        return (new FileProvider()).filePathFromURL(url);
     } catch (IOException e) {
       Assertions.UNREACHABLE();
       return null;
diff --git a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ClassLoaderImpl.java b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ClassLoaderImpl.java
index bbdeb9f0f..aae02f476 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ClassLoaderImpl.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ClassLoaderImpl.java
@@ -510,7 +510,7 @@ public class ClassLoaderImpl implements IClassLoader {
     String jarFileName = archive.getJarFile().getName();
     InputStream s = null;
     try {
-      File jarFile = FileProvider.getFile(jarFileName);
+      File jarFile = (new FileProvider()).getFile(jarFileName);
       int bufferSize = 65536;
       s = new BufferedInputStream(new FileInputStream(jarFile), bufferSize);
       byte[] b = new byte[1024];
diff --git a/com.ibm.wala.core/src/com/ibm/wala/client/AbstractAnalysisEngine.java b/com.ibm.wala.core/src/com/ibm/wala/client/AbstractAnalysisEngine.java
index 550193e0f..701c5bb5b 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/client/AbstractAnalysisEngine.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/client/AbstractAnalysisEngine.java
@@ -154,7 +154,7 @@ public abstract class AbstractAnalysisEngine implements AnalysisEngine {
       Assertions.UNREACHABLE("no j2selibs specified. You probably did not call AppAnalysisEngine.setJ2SELibrary.");
     }
 
-    scope = AnalysisScopeReader.readJavaScope(SYNTHETIC_J2SE_MODEL, FileProvider.getFile(getExclusionsFile()), getClass()
+    scope = AnalysisScopeReader.readJavaScope(SYNTHETIC_J2SE_MODEL, (new FileProvider()).getFile(getExclusionsFile()), getClass()
         .getClassLoader());
 
     // add standard libraries
diff --git a/com.ibm.wala.core/src/com/ibm/wala/properties/WalaProperties.java b/com.ibm.wala.core/src/com/ibm/wala/properties/WalaProperties.java
index 97e9701d7..afc9243f2 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/properties/WalaProperties.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/properties/WalaProperties.java
@@ -143,7 +143,7 @@ public final class WalaProperties {
     if (url == null) {
       return System.getProperty("user.dir"); //$NON-NLS-1$
     } else {
-      return new File(FileProvider.filePathFromURL(url)).getParentFile().getParentFile().getPath();
+      return new File((new FileProvider()).filePathFromURL(url)).getParentFile().getParentFile().getPath();
     }
   }
   
diff --git a/com.ibm.wala.core/src/com/ibm/wala/util/config/AnalysisScopeReader.java b/com.ibm.wala.core/src/com/ibm/wala/util/config/AnalysisScopeReader.java
index 187766f83..cf35e885a 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/util/config/AnalysisScopeReader.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/util/config/AnalysisScopeReader.java
@@ -63,7 +63,7 @@ public class AnalysisScopeReader {
       Plugin plugIn) throws IOException {
     BufferedReader r = null;
     try {
-      File scopeFile = (plugIn == null) ? FileProvider.getFile(scopeFileName, javaLoader) : FileProvider.getFileFromPlugin(plugIn,
+      File scopeFile = (plugIn == null) ? (new FileProvider()).getFile(scopeFileName, javaLoader) : (new FileProvider()).getFileFromPlugin(plugIn,
           scopeFileName);
       assert scopeFile.exists();
 
@@ -107,26 +107,27 @@ public class AnalysisScopeReader {
     String language = toks.nextToken();
     String entryType = toks.nextToken();
     String entryPathname = toks.nextToken();
+    FileProvider fp = (new FileProvider());
     if ("classFile".equals(entryType)) {
-      File cf = FileProvider.getFile(entryPathname, javaLoader);
+      File cf = fp.getFile(entryPathname, javaLoader);
       try {
         scope.addClassFileToScope(walaLoader, cf);
       } catch (InvalidClassFileException e) {
         Assertions.UNREACHABLE(e.toString());
       }
     } else if ("sourceFile".equals(entryType)) {
-      File sf = FileProvider.getFile(entryPathname, javaLoader);
+      File sf = fp.getFile(entryPathname, javaLoader);
       scope.addSourceFileToScope(walaLoader, sf, entryPathname);
     } else if ("binaryDir".equals(entryType)) {
-      File bd = FileProvider.getFile(entryPathname, javaLoader);
+      File bd = fp.getFile(entryPathname, javaLoader);
       assert bd.isDirectory();
       scope.addToScope(walaLoader, new BinaryDirectoryTreeModule(bd));
     } else if ("sourceDir".equals(entryType)) {
-      File sd = FileProvider.getFile(entryPathname, javaLoader);
+      File sd = fp.getFile(entryPathname, javaLoader);
       assert sd.isDirectory();
       scope.addToScope(walaLoader, new SourceDirectoryTreeModule(sd));
     } else if ("jarFile".equals(entryType)) {
-      Module M = FileProvider.getJarFileModule(entryPathname, javaLoader);
+      Module M = fp.getJarFileModule(entryPathname, javaLoader);
       scope.addToScope(walaLoader, M);
     } else if ("loaderImpl".equals(entryType)) {
       scope.setLoaderImpl(walaLoader, entryPathname);
diff --git a/com.ibm.wala.core/src/com/ibm/wala/util/io/FileProvider.java b/com.ibm.wala.core/src/com/ibm/wala/util/io/FileProvider.java
index b62e373c7..336968bee 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/util/io/FileProvider.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/util/io/FileProvider.java
@@ -78,21 +78,17 @@ public class FileProvider {
   }
 
   private final static int DEBUG_LEVEL = 0;
-
-  public FileProvider() {
-    super();
-  }
-
+  
   /**
    * @param fileName
    * @return the jar file packaged with this plug-in of the given name, or null
    *         if not found.
    */
-  public static Module getJarFileModule(String fileName) throws IOException {
+  public Module getJarFileModule(String fileName) throws IOException {
     return getJarFileModule(fileName, FileProvider.class.getClassLoader());
   }
 
-  public static Module getJarFileModule(String fileName, ClassLoader loader) throws IOException {
+  public Module getJarFileModule(String fileName, ClassLoader loader) throws IOException {
     if (CorePlugin.getDefault() == null) {
       return getJarFileFromClassLoader(fileName, loader);
     } else if (CorePlugin.IS_RESOURCES_BUNDLE_AVAILABLE) {
@@ -104,14 +100,14 @@ public class FileProvider {
     return getFromPlugin(CorePlugin.getDefault(), fileName);
   }
 
-  public static URL getResource(String fileName) throws IOException {
+  public URL getResource(String fileName) throws IOException {
     if (fileName == null) {
       throw new IllegalArgumentException("null fileName");
     }
     return getResource(fileName, FileProvider.class.getClassLoader());
   }
 
-  public static URL getResource(String fileName, ClassLoader loader) throws IOException {
+  public URL getResource(String fileName, ClassLoader loader) throws IOException {
     if (fileName == null) {
       throw new IllegalArgumentException("null fileName");
     }
@@ -122,14 +118,14 @@ public class FileProvider {
         new Path(fileName), null);
   }
 
-  public static File getFile(String fileName) throws IOException {
+  public File getFile(String fileName) throws IOException {
     if (fileName == null) {
       throw new IllegalArgumentException("null fileName");
     }
     return getFile(fileName, FileProvider.class.getClassLoader());
   }
 
-  public static File getFile(String fileName, ClassLoader loader) throws IOException {
+  public File getFile(String fileName, ClassLoader loader) throws IOException {
     return (CorePlugin.getDefault() == null) ? getFileFromClassLoader(fileName, loader) : getFileFromPlugin(
         CorePlugin.getDefault(), fileName);
   }
@@ -141,7 +137,7 @@ public class FileProvider {
    * @throws IllegalArgumentException
    *           if p is null
    */
-  public static File getFileFromPlugin(Plugin p, String fileName) throws IOException {
+  public File getFileFromPlugin(Plugin p, String fileName) throws IOException {
 
     if (p == null) {
       throw new IllegalArgumentException("p is null");
@@ -161,7 +157,7 @@ public class FileProvider {
    * @return the jar file packaged with this plug-in of the given name, or null
    *         if not found.
    */
-  private static JarFileModule getFromPlugin(Plugin p, String fileName) throws IOException {
+  private JarFileModule getFromPlugin(Plugin p, String fileName) throws IOException {
     URL url = getFileURLFromPlugin(p, fileName);
     return (url == null) ? null : new JarFileModule(new JarFile(filePathFromURL(url)));
   }
@@ -174,7 +170,7 @@ public class FileProvider {
    * @return the URL, or <code>null</code> if the file is not found
    * @throws IOException
    */
-  private static URL getFileURLFromPlugin(Plugin p, String fileName) throws IOException {
+  private  URL getFileURLFromPlugin(Plugin p, String fileName) throws IOException {
     try {
       URL url = FileLocator.find(p.getBundle(), new Path(fileName), null);
       if (url == null) {
@@ -212,7 +208,7 @@ public class FileProvider {
    * @param url
    * @return an escaped version of the URL
    */
-  private static URL fixupFileURLSpaces(URL url) {
+  private URL fixupFileURLSpaces(URL url) {
     String urlString = url.toExternalForm();
     StringBuffer fixedUpUrl = new StringBuffer();
     int lastIndex = 0;
@@ -240,7 +236,7 @@ public class FileProvider {
   /**
    * @throws FileNotFoundException
    */
-  public static File getFileFromClassLoader(String fileName, ClassLoader loader) throws FileNotFoundException {
+  public File getFileFromClassLoader(String fileName, ClassLoader loader) throws FileNotFoundException {
     if (loader == null) {
       throw new IllegalArgumentException("null loader");
     }
@@ -271,7 +267,7 @@ public class FileProvider {
   /**
    * @throws FileNotFoundException
    */
-  public static InputStream getInputStreamFromClassLoader(String fileName, ClassLoader loader) throws FileNotFoundException {
+  public InputStream getInputStreamFromClassLoader(String fileName, ClassLoader loader) throws FileNotFoundException {
     if (loader == null) {
       throw new IllegalArgumentException("null loader");
     }
@@ -290,7 +286,7 @@ public class FileProvider {
    *         if not found: wrapped as a JarFileModule or a NestedJarFileModule
    * @throws IOException
    */
-  public static Module getJarFileFromClassLoader(String fileName, ClassLoader loader) throws IOException {
+  public Module getJarFileFromClassLoader(String fileName, ClassLoader loader) throws IOException {
     if (fileName == null) {
       throw new IllegalArgumentException("null fileName");
     }
@@ -334,7 +330,7 @@ public class FileProvider {
    * @throws IllegalArgumentException
    *           if url is null
    */
-  public static String filePathFromURL(URL url) {
+  public String filePathFromURL(URL url) {
     if (url == null) {
       throw new IllegalArgumentException("url is null");
     }
diff --git a/com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/SWTCallGraph.java b/com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/SWTCallGraph.java
index a68dca303..7c52cb4f0 100644
--- a/com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/SWTCallGraph.java
+++ b/com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/SWTCallGraph.java
@@ -91,7 +91,7 @@ public class SWTCallGraph {
       String exclusionFile = p.getProperty("exclusions");
 
       AnalysisScope scope = AnalysisScopeReader.makeJavaBinaryAnalysisScope(appJar, exclusionFile != null ? new File(exclusionFile)
-          : FileProvider.getFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS));
+          : (new FileProvider()).getFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS));
 
       ClassHierarchy cha = ClassHierarchy.make(scope);
 
diff --git a/com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/SWTPointsTo.java b/com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/SWTPointsTo.java
index 2d509272e..97e4dbfb1 100644
--- a/com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/SWTPointsTo.java
+++ b/com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/SWTPointsTo.java
@@ -79,7 +79,7 @@ public class SWTPointsTo {
   }
 
   public static Graph<Object> buildPointsTo(String appJar) throws WalaException, IllegalArgumentException, CancelException, IOException {
-    AnalysisScope scope = AnalysisScopeReader.makeJavaBinaryAnalysisScope(appJar, FileProvider.getFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS));
+    AnalysisScope scope = AnalysisScopeReader.makeJavaBinaryAnalysisScope(appJar, (new FileProvider()).getFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS));
 
     
     ClassHierarchy cha = ClassHierarchy.make(scope);
diff --git a/com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/SWTTypeHierarchy.java b/com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/SWTTypeHierarchy.java
index 1a7d85bd8..8a0aff161 100644
--- a/com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/SWTTypeHierarchy.java
+++ b/com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/SWTTypeHierarchy.java
@@ -54,7 +54,7 @@ public class SWTTypeHierarchy {
   public static ApplicationWindow run(String classpath) {
 
     try {
-      AnalysisScope scope = AnalysisScopeReader.makeJavaBinaryAnalysisScope(classpath, FileProvider
+      AnalysisScope scope = AnalysisScopeReader.makeJavaBinaryAnalysisScope(classpath, (new FileProvider())
           .getFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS));
 
       // invoke WALA to build a class hierarchy
diff --git a/com.ibm.wala.j2ee/src/com/ibm/wala/j2ee/J2EEAnalysisScope.java b/com.ibm.wala.j2ee/src/com/ibm/wala/j2ee/J2EEAnalysisScope.java
index c5d1b07be..4ec89e1a1 100644
--- a/com.ibm.wala.j2ee/src/com/ibm/wala/j2ee/J2EEAnalysisScope.java
+++ b/com.ibm.wala.j2ee/src/com/ibm/wala/j2ee/J2EEAnalysisScope.java
@@ -48,7 +48,7 @@ public class J2EEAnalysisScope extends AnalysisScope {
    * @param lifecycleEntrypoints Should EJB lifecycle entrypoints be considered as call graph entrypoints?
    */
   public J2EEAnalysisScope(String baseScope, ClassLoader loader, boolean lifecycleEntrypoints) throws IOException {
-    this(baseScope, loader, FileProvider.getFile(EXCLUSIONS_FILE), lifecycleEntrypoints);
+    this(baseScope, loader, (new FileProvider()).getFile(EXCLUSIONS_FILE), lifecycleEntrypoints);
   }
 
   /**