diff --git a/mozilla/extensions/layout-debug/plugin/Makefile.in b/mozilla/extensions/layout-debug/plugin/Makefile.in
index a31a0908c4e..0c0de9d820b 100644
--- a/mozilla/extensions/layout-debug/plugin/Makefile.in
+++ b/mozilla/extensions/layout-debug/plugin/Makefile.in
@@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= npdebug
 LIBRARY_NAME	= npdebug
 RESFILE		= npdebug.res
-DEFFILE		= npdebug.def
+DEFFILE		= $(srcdir)/npdebug.def
 
 REQUIRES=   xpcom \
             dom \
@@ -65,7 +65,7 @@ CPPSRCS		= plugin.cpp \
             npp_gate.cpp \
             $(NULL)
 
-LOCAL_INCLUDES	= -I$(XPIDL_GEN_DIR) -I./include
+LOCAL_INCLUDES	= -I$(XPIDL_GEN_DIR) -I$(srcdir)/include
 
 EXTRA_DSO_LDOPTS += \
 	-L$(DIST)/lib \
diff --git a/mozilla/extensions/layout-debug/plugin/npdebug.rc b/mozilla/extensions/layout-debug/plugin/npdebug.rc
index b756e530648..a998b140344 100644
--- a/mozilla/extensions/layout-debug/plugin/npdebug.rc
+++ b/mozilla/extensions/layout-debug/plugin/npdebug.rc
@@ -1,13 +1,13 @@
 //Microsoft Developer Studio generated resource script.
 //
 #include "resource.h"
+#include "winnt.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -83,7 +83,6 @@ END
 
 2 TEXTINCLUDE DISCARDABLE 
 BEGIN
-    "#include ""afxres.h""\r\n"
     "\0"
 END