2 files changed, 6 insertions, 2 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 6861506..1ed1c68 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -84,8 +84,7 @@ if GNOME
 gnome_SOURCE= Gnome.hh Gnome.cc
 endif
 if REMEMBER_SRC
-REMEMBER_SOURCE= Remember.hh Remember.cc \
-        ClientPattern.hh ClientPattern.cc
+REMEMBER_SOURCE= Remember.hh Remember.cc
 endif
 if TOOLBAR_SRC
 TOOLBAR_SOURCE = Toolbar.hh Toolbar.cc \
@@ -132,6 +131,7 @@ fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \
         RootCmdMenuItem.hh RootCmdMenuItem.cc\
         MenuCreator.hh MenuCreator.cc \
         ClientMenu.hh ClientMenu.cc \
+        ClientPattern.hh ClientPattern.cc \
         WorkspaceMenu.hh WorkspaceMenu.cc \
         FocusModelMenuItem.hh \
         ToggleMenu.hh \
diff --git a/src/Window.cc b/src/Window.cc
index 4b4d1dc..edc2b8e 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -36,7 +36,9 @@
 #include "WinButton.hh"
 #include "WinButtonTheme.hh"
 #include "WindowCmd.hh"
+#ifdef REMEMBER
 #include "Remember.hh"
+#endif
 #include "MenuCreator.hh"
 #include "FocusControl.hh"
 #include "IconButton.hh"
@@ -2190,9 +2192,11 @@ void FluxboxWindow::propertyNotifyEvent(WinClient &client, Atom atom) {
         } else if (atom == fbatoms->getMWMHintsAtom()) {
             client.updateMWMHints();
             updateMWMHintsFromClient(client);
+#ifdef REMEMBER
             if (!m_toggled_decos) {
                 Remember::instance().updateDecoStateFromClient(client);
             }
+#endif
             applyDecorations(); // update decorations (if they changed)
         }
         break;