diff --git a/mozilla/lib/layout/layout.c b/mozilla/lib/layout/layout.c
index 644fe9d8f8b..a594e1c444f 100644
--- a/mozilla/lib/layout/layout.c
+++ b/mozilla/lib/layout/layout.c
@@ -3715,10 +3715,8 @@ lo_FinishLayout(MWContext *context, lo_DocState *state, int32 mocha_event)
 #endif /* OLD_MSGS */
 
         /* Flush out layer callbacks so that document dimensions are correct. */
-		/*
         if (context->compositor)
             CL_CompositeNow(context->compositor);
-		*/
 
 		FE_FinishedLayout(context);
 		return;
@@ -3759,10 +3757,9 @@ lo_FinishLayout(MWContext *context, lo_DocState *state, int32 mocha_event)
 #endif /* OLD_MSGS */
 
         /* Flush out layer callbacks so that document dimensions are correct. */
-		/*
         if (context->compositor)
             CL_CompositeNow(context->compositor);
-		*/
+
 		FE_FinishedLayout(context);
 		return;
 	}
@@ -3832,10 +3829,8 @@ lo_FinishLayout(MWContext *context, lo_DocState *state, int32 mocha_event)
 #endif /* OLD_MSGS */
 
     /* Flush out layer callbacks so that document dimensions are correct. */
-	/* 
     if (context->compositor)
         CL_CompositeNow(context->compositor);
-	*/
 
 	if (state->is_a_subdoc == SUBDOC_NOT && state->top_state && !state->top_state->have_title)
 	{
diff --git a/mozilla/lib/layout/layout.h b/mozilla/lib/layout/layout.h
index 2e5ffc9656e..a5c0847c482 100644
--- a/mozilla/lib/layout/layout.h
+++ b/mozilla/lib/layout/layout.h
@@ -1465,9 +1465,11 @@ extern void
 lo_ReflectNamedAnchor(MWContext *context, lo_DocState *state, PA_Tag *tag,
                       lo_NameList *name_rec, int32 layer_id);
 
+#ifdef DOM
 extern void
 lo_ReflectSpan(MWContext *context, lo_DocState *doc_state, PA_Tag *tag,
                       lo_NameList *name_rec, int32 layer_id);
+#endif
 
 extern void
 lo_ReflectLink(MWContext *context, lo_DocState *state, PA_Tag *tag,