diff --git a/mozilla/modules/plugin/samples/simple/Makefile.in b/mozilla/modules/plugin/samples/simple/Makefile.in
index d026ca8da95..74277497bd2 100644
--- a/mozilla/modules/plugin/samples/simple/Makefile.in
+++ b/mozilla/modules/plugin/samples/simple/Makefile.in
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@@ -15,12 +15,6 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-#! gmake
-
-MODULE		= npsimple
-
-LIBRARY_NAME	= npsimple
-
 DEPTH = ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
@@ -28,18 +22,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-REQUIRES = java plug xpcom
+MODULE = npsimple
+LIBRARY_NAME = npsimple
+IS_COMPONENT = 1
 
-CSRCS = stubs.c
-CPPSRCS = npsimple.cpp bad.cpp
+LOCAL_INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../public
 
-JDIRS = .
+CPPSRCS = \
+	npsimple.cpp	\
+	$(NULL)
 
-JRI_GEN =		       \
-	Simple		       \
-        java.lang.Object       \
-	netscape.plugin.Plugin \
-
-CINCLUDES += $(PUBLIC)/plugin $(PUBLIC)/xpcom $(PUBLIC)/java
+include $(topsrcdir)/config/config.mk
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/modules/plugin/test/Makefile.in b/mozilla/modules/plugin/test/Makefile.in
index d026ca8da95..74277497bd2 100644
--- a/mozilla/modules/plugin/test/Makefile.in
+++ b/mozilla/modules/plugin/test/Makefile.in
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@@ -15,12 +15,6 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-#! gmake
-
-MODULE		= npsimple
-
-LIBRARY_NAME	= npsimple
-
 DEPTH = ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
@@ -28,18 +22,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-REQUIRES = java plug xpcom
+MODULE = npsimple
+LIBRARY_NAME = npsimple
+IS_COMPONENT = 1
 
-CSRCS = stubs.c
-CPPSRCS = npsimple.cpp bad.cpp
+LOCAL_INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../public
 
-JDIRS = .
+CPPSRCS = \
+	npsimple.cpp	\
+	$(NULL)
 
-JRI_GEN =		       \
-	Simple		       \
-        java.lang.Object       \
-	netscape.plugin.Plugin \
-
-CINCLUDES += $(PUBLIC)/plugin $(PUBLIC)/xpcom $(PUBLIC)/java
+include $(topsrcdir)/config/config.mk
 
 include $(topsrcdir)/config/rules.mk