diff --git a/mozilla/htmlparser/public/Makefile.in b/mozilla/htmlparser/public/Makefile.in
index e1a99e406f7..08ce2894174 100644
--- a/mozilla/htmlparser/public/Makefile.in
+++ b/mozilla/htmlparser/public/Makefile.in
@@ -51,12 +51,6 @@ EXPORTS = \
 		nsToken.h                   \
 		$(NULL)
 
-ifdef MOZ_DEBUG
-EXPORTS += \
-		nsILoggingSink.h \
-		$(NULL)
-endif
-
 EXPORTS   := $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/htmlparser/tests/logparse/Makefile.in b/mozilla/htmlparser/tests/logparse/Makefile.in
index e52ad90390a..41cae0b2339 100644
--- a/mozilla/htmlparser/tests/logparse/Makefile.in
+++ b/mozilla/htmlparser/tests/logparse/Makefile.in
@@ -44,7 +44,7 @@ LIBS		= \
 		$(NSPR_LIBS) \
 		$(NULL)
 
-LOCAL_INCLUDES = -I$(srcdir)/../../src
+LOCAL_INCLUDES = -I$(srcdir)/../../public -I$(srcdir)/../../src
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/parser/htmlparser/public/Makefile.in b/mozilla/parser/htmlparser/public/Makefile.in
index e1a99e406f7..08ce2894174 100644
--- a/mozilla/parser/htmlparser/public/Makefile.in
+++ b/mozilla/parser/htmlparser/public/Makefile.in
@@ -51,12 +51,6 @@ EXPORTS = \
 		nsToken.h                   \
 		$(NULL)
 
-ifdef MOZ_DEBUG
-EXPORTS += \
-		nsILoggingSink.h \
-		$(NULL)
-endif
-
 EXPORTS   := $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/parser/htmlparser/tests/logparse/Makefile.in b/mozilla/parser/htmlparser/tests/logparse/Makefile.in
index e52ad90390a..41cae0b2339 100644
--- a/mozilla/parser/htmlparser/tests/logparse/Makefile.in
+++ b/mozilla/parser/htmlparser/tests/logparse/Makefile.in
@@ -44,7 +44,7 @@ LIBS		= \
 		$(NSPR_LIBS) \
 		$(NULL)
 
-LOCAL_INCLUDES = -I$(srcdir)/../../src
+LOCAL_INCLUDES = -I$(srcdir)/../../public -I$(srcdir)/../../src
 
 include $(topsrcdir)/config/rules.mk