diff --git a/mozilla/widget/timer/src/unix/motif/Makefile.in b/mozilla/widget/timer/src/unix/motif/Makefile.in
index e3f39caeeba..2012c3c2486 100644
--- a/mozilla/widget/timer/src/unix/motif/Makefile.in
+++ b/mozilla/widget/timer/src/unix/motif/Makefile.in
@@ -29,22 +29,22 @@ REQUIRES	= xpcom
 CPPSRCS		= nsTimerMotif.cpp
 
 ifndef MOZ_MONOLITHIC_TOOLKIT
-
 TIMER_SUFFIX	= motif
 IS_COMPONENT	= 1
 CPPSRCS		+= nsTimerMotifFactory.cpp
-INCLUDES	+= $(MOZ_MOTIF_CFLAGS) -I$(srcdir)/..
 EXTRA_DSO_LDOPTS = $(MOZ_MOTIF_LDFLAGS)
-
 else
-
 TIMER_SUFFIX	= s
-CXXFLAGS	+= $(TK_CFLAGS)
-INCLUDES	+= $(TK_CFLAGS) -I$(srcdir)/..
 override NO_SHARED_LIB=1
 override NO_STATIC_LIB=
-
 endif
 
 include $(topsrcdir)/config/rules.mk
 
+ifndef MOZ_MONOLITHIC_TOOLKIT
+INCLUDES	+= $(MOZ_MOTIF_CFLAGS) -I$(srcdir)/..
+else
+CXXFLAGS	+= $(TK_CFLAGS)
+INCLUDES	+= $(TK_CFLAGS) -I$(srcdir)/..
+endif
+
diff --git a/mozilla/widget/timer/src/unix/qt/Makefile.in b/mozilla/widget/timer/src/unix/qt/Makefile.in
index 5da3b70db84..001b42b9132 100644
--- a/mozilla/widget/timer/src/unix/qt/Makefile.in
+++ b/mozilla/widget/timer/src/unix/qt/Makefile.in
@@ -33,22 +33,22 @@ CPPSRCS		= \
 		$(NULL)
 
 ifndef MOZ_MONOLITHIC_TOOLKIT
-
 TIMER_SUFFIX	= qt
 IS_COMPONENT	= 1
 CPPSRCS		+= nsTimerQtFactory.cpp
-INCLUDES	+= $(MOZ_QT_CFLAGS) -I$(srcdir)/..
 EXTRA_DSO_LDOPTS = $(MOZ_QT_LDFLAGS)
-
 else
-
 TIMER_SUFFIX	= s
-CXXFLAGS	+= $(TK_CFLAGS)
-INCLUDES	+= $(TK_CFLAGS) -I$(srcdir)/..
 override NO_SHARED_LIB=1
 override NO_STATIC_LIB=
-
 endif
 
 include $(topsrcdir)/config/rules.mk
 
+ifndef MOZ_MONOLITHIC_TOOLKIT
+INCLUDES	+= $(MOZ_QT_CFLAGS) -I$(srcdir)/..
+else
+CXXFLAGS	+= $(TK_CFLAGS)
+INCLUDES	+= $(TK_CFLAGS) -I$(srcdir)/..
+endif
+
diff --git a/mozilla/widget/timer/src/unix/xlib/Makefile.in b/mozilla/widget/timer/src/unix/xlib/Makefile.in
index bd31f6b9189..68e105222a5 100644
--- a/mozilla/widget/timer/src/unix/xlib/Makefile.in
+++ b/mozilla/widget/timer/src/unix/xlib/Makefile.in
@@ -29,22 +29,22 @@ REQUIRES	= xpcom
 CPPSRCS		= nsTimerXlib.cpp
 
 ifndef MOZ_MONOLITHIC_TOOLKIT
-
 TIMER_SUFFIX	= xlib
 IS_COMPONENT	= 1
 CPPSRCS		+= nsTimerXlibFactory.cpp
-INCLUDES	+= $(MOZ_XLIB_CFLAGS) -I$(srcdir)/..
 EXTRA_DSO_LDOPTS = $(MOZ_XLIB_LDFLAGS)
-
 else
-
 TIMER_SUFFIX	= s
-CXXFLAGS	+= $(TK_CFLAGS)
-INCLUDES	+= $(TK_CFLAGS) -I$(srcdir)/..
 override NO_SHARED_LIB=1
 override NO_STATIC_LIB=
-
 endif
 
 include $(topsrcdir)/config/rules.mk
 
+ifndef MOZ_MONOLITHIC_TOOLKIT
+INCLUDES	+= $(MOZ_XLIB_CFLAGS) -I$(srcdir)/..
+else
+CXXFLAGS	+= $(TK_CFLAGS)
+INCLUDES	+= $(TK_CFLAGS) -I$(srcdir)/..
+endif
+