diff --git a/mozilla/java/plugins/examples/dom/DOMAccessPanel.java b/mozilla/java/plugins/examples/dom/DOMAccessPanel.java
index a13cab6ec8f..b87202c272d 100644
--- a/mozilla/java/plugins/examples/dom/DOMAccessPanel.java
+++ b/mozilla/java/plugins/examples/dom/DOMAccessPanel.java
@@ -27,8 +27,6 @@ import javax.swing.border.*;
 import javax.swing.event.*;
 import javax.swing.JFileChooser;
 
-import DOMTreeDumper;
-
 public class DOMAccessPanel extends JPanel implements ActionListener, ItemListener,  TreeSelectionListener { 
 
     private JTextField name, aValue;
diff --git a/mozilla/java/plugins/src/Makefile.in b/mozilla/java/plugins/src/Makefile.in
index 1c5a3083606..fd4983f93f2 100644
--- a/mozilla/java/plugins/src/Makefile.in
+++ b/mozilla/java/plugins/src/Makefile.in
@@ -32,6 +32,31 @@ LIBRARY_NAME = pluglet
 MODULE          = pluglet
 IS_COMPONENT    = 1
 
+JDKINCLUDE= -I$(JDKHOME)/include
+
+ifeq ($(OS_ARCH), Linux)
+	JDKINCLUDE += -I$(JDKHOME)/include/linux
+	archExpr = case "`uname -m`" in  \
+                i[3-6]86) \
+                    echo i386 \
+                    ;; \
+                sparc*)  \
+                    echo sparc \
+                    ;; \
+                *) \
+                    uname -m  \
+                    ;; \
+               esac
+
+
+endif
+ifeq ($(OS_ARCH), SunOS)
+	JDKINCLUDE += -I$(JDKHOME)/include/solaris
+	archExpr = uname -p
+endif
+
+HOSTTYPE = $(shell $(archExpr))
+
 CPPSRCS =  \
 	List.cpp \
 	Pluglet.cpp \
@@ -49,11 +74,11 @@ CPPSRCS =  \
 	PlugletViewFactory.cpp \
 	$(NULL)
 
-CXXFLAGS := -I$(JDKHOME)/include -I$(JDKHOME)/include/solaris $(MOZ_TOOLKIT_REGISTRY_CFLAGS) -D_REENTRANT  -DOJI_DISABLE $(CXXFLAGS) 
+CXXFLAGS := $(JDKINCLUDE) $(MOZ_TOOLKIT_REGISTRY_CFLAGS) -D_REENTRANT  -DOJI_DISABLE $(CXXFLAGS) 
 
 DSO_LDOPTS += \
       -L$(JDKHOME)/jre/lib/$(HOSTTYPE)/ \
-      -L$(JDKHOME)/jre/lib/$(HOSTTYPE)/classic \
+      -L$(JDKHOME)/jre/lib/$(HOSTTYPE)/client \
       -ljava -ljvm -lawt -lXt\
       -lgdk