diff --git a/xs/Extractor.xs b/Extractor.xs
similarity index 97%
rename from xs/Extractor.xs
rename to Extractor.xs
index ece31df..968196f 100644
--- a/xs/Extractor.xs
+++ b/Extractor.xs
@@ -61,6 +61,8 @@ EXTRACTOR_ExtractorList *
 EXTRACTOR_removeLibrary (prev, library)
 		EXTRACTOR_ExtractorList *prev
 		const char *library
+	POSTCALL:
+		perl_extractor_invalidate_object (ST(0));
 
 void
 EXTRACTOR_getKeywords (extractor, data)
diff --git a/ext/Module/Install/PRIVATE/File/Extractor.pm b/ext/Module/Install/PRIVATE/File/Extractor.pm
index d56eb84..b3ff7c8 100644
--- a/ext/Module/Install/PRIVATE/File/Extractor.pm
+++ b/ext/Module/Install/PRIVATE/File/Extractor.pm
@@ -32,7 +32,7 @@ sub xs_files {
     my @OBJECT;
     my %XS;
 
-    for my $xs (<xs/*.xs>) {
+    for my $xs (<*.xs>) {
         (my $c = $xs) =~ s/\.xs$/\.c/i;
         (my $o = $xs) =~ s/\.xs$/\$(OBJ_EXT)/i;
 
diff --git a/xs/typemap b/typemap
similarity index 100%
rename from xs/typemap
rename to typemap