diff --git a/sfx2/source/layout/makefile.mk b/sfx2/source/layout/makefile.mk
index 2ef1231..eedce24 100644
--- a/sfx2/source/layout/makefile.mk
+++ b/sfx2/source/layout/makefile.mk
@@ -44,11 +44,15 @@ CFLAGS += -I../$(PRJ)/toolkit/source/vclcompat
 
 # --- Files --------------------------------------------------------
 
+.IF "$(ENABLE_LAYOUT)" == "TRUE"
+
 SLOFILES = \
 	$(SLO)$/sfxtabpage.obj \
 	$(SLO)$/sfxtabdialog.obj \
 #
 
+.ENDIF # ENABLE_LAYOUT == TRUE
+
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/sfx2/util/makefile.mk b/sfx2/util/makefile.mk
index ec85e9e..b987fae 100644
--- a/sfx2/util/makefile.mk
+++ b/sfx2/util/makefile.mk
@@ -53,7 +53,6 @@ LIB1FILES=  $(SLB)$/appl.lib		\
             $(SLB)$/view.lib		\
             $(SLB)$/control.lib		\
             $(SLB)$/notify.lib		\
-            $(SLB)$/layout.lib		\
             $(SLB)$/menu.lib		\
             $(SLB)$/inet.lib		\
             $(SLB)$/toolbox.lib		\
@@ -62,6 +61,10 @@ LIB1FILES=  $(SLB)$/appl.lib		\
             $(SLB)$/bastyp.lib		\
             $(SLB)$/config.lib
 
+.IF "$(ENABLE_LAYOUT)" == "TRUE"
+LIB1FILES += $(SLB)$/layout.lib
+.ENDIF # ENABLE_LAYOUT == TRUE
+
 HELPIDFILES=\
 			..\inc\sfx2\sfxsids.hrc	\
 			..\source\inc\helpid.hrc