diff --git a/Makefile.PL b/Makefile.PL
index b1b9d14..38eb314 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -17,7 +17,7 @@ my @defines;
 
 my $path_separator = ":";
 if($^O eq "MSWin32") {
-    push @defines,  "XP_PC";
+    push @defines,  "XP_WIN";
     $path_separator = ";";
 } else {
     push @defines, "XP_UNIX";
@@ -175,10 +175,10 @@ END_OF_SOURCE
     close $test_script;
 
     my $exe = tmpnam();;
-    my $cc = join(" ", $Config{cc}, $libs, @ccflags, "-l${lib}", "-o", $exe, (map { "-I$_" } @incs), "test_js.c");
+    my $cc = join(" ", $Config{cc}, @ccflags, "-o", $exe, "test_js.c", "-I.", (map { "-I$_" } @incs), $libs, "-l${lib}" );
     qx($cc);
     if ($?) {
-        print "Failed compiling test_js.c. ABORTING\n";
+        print "Failed compiling test_js.c. ABORTING\n\n$cc\n";
         exit 0;
     }
     unlink("test_js.c");
@@ -210,7 +210,7 @@ WriteMakefile(
     ABSTRACT_FROM   => "lib/JavaScript.pm", # retrieve abstract from module
     AUTHOR          => "Claes Jakobsson <claesjac\@cpan.org>",
     CCFLAGS         => join(" ", @ccflags),
-    LIBS            => ["$libs -l${lib}"], # e.g., "-lm"
+    LIBS            => [":nosearch $libs -l${lib}"], # e.g., "-lm"
     INC             => join(" ", map { "-I$_" } @incs),
     LICENSE         => "perl",
     OBJECT          => q/$(O_FILES)/,
diff --git a/PJS_Call.c b/PJS_Call.c
index 972d386..7b93f90 100644
--- a/PJS_Call.c
+++ b/PJS_Call.c
@@ -2,6 +2,8 @@
 #include "perl.h"
 #include "XSUB.h"
 
+
+
 #include "JavaScript_Env.h"
 
 #include "PJS_Call.h"
diff --git a/PJS_Class.c b/PJS_Class.c
index 2cf79cb..bc9e869 100644
--- a/PJS_Class.c
+++ b/PJS_Class.c
@@ -2,6 +2,8 @@
 #include "perl.h"
 #include "XSUB.h"
 
+
+
 #include "JavaScript_Env.h"
 
 #include "PJS_Class.h"
diff --git a/PJS_Context.c b/PJS_Context.c
index 5f13d9c..c272e64 100644
--- a/PJS_Context.c
+++ b/PJS_Context.c
@@ -2,6 +2,8 @@
 #include "perl.h"
 #include "XSUB.h"
 
+
+
 #include "JavaScript_Env.h"
 
 #include "PJS_Types.h"
diff --git a/PJS_Function.c b/PJS_Function.c
index aefe182..91794a4 100644
--- a/PJS_Function.c
+++ b/PJS_Function.c
@@ -1,4 +1,4 @@
-#include "XSUB.h"
+
 
 #include "JavaScript_Env.h"
 #include "PJS_Function.h"
diff --git a/PJS_PerlArray.c b/PJS_PerlArray.c
index a71484d..ddb3a4b 100644
--- a/PJS_PerlArray.c
+++ b/PJS_PerlArray.c
@@ -1,4 +1,4 @@
-#include "XSUB.h"
+
 
 #include "JavaScript_Env.h"
 
diff --git a/PJS_PerlHash.c b/PJS_PerlHash.c
index 4074e20..a21bb91 100644
--- a/PJS_PerlHash.c
+++ b/PJS_PerlHash.c
@@ -1,4 +1,4 @@
-#include "XSUB.h"
+
 
 #include "JavaScript_Env.h"
 
diff --git a/PJS_PerlSub.c b/PJS_PerlSub.c
index 64f276e..2612b20 100644
--- a/PJS_PerlSub.c
+++ b/PJS_PerlSub.c
@@ -1,4 +1,4 @@
-#include "XSUB.h"
+
 
 #include "JavaScript_Env.h"
 
diff --git a/PJS_Property.c b/PJS_Property.c
index dc12cba..2406b0f 100644
--- a/PJS_Property.c
+++ b/PJS_Property.c
@@ -2,6 +2,8 @@
 #include "perl.h"
 #include "XSUB.h"
 
+
+
 #include "JavaScript_Env.h"
 
 #include "PJS_Context.h"
diff --git a/PJS_TypeConversion.c b/PJS_TypeConversion.c