diff --git a/mixer/Makefile b/mixer/Makefile
index 49fa36f..5fe04dc 100644
--- a/mixer/Makefile
+++ b/mixer/Makefile
@@ -62,7 +62,6 @@ CFLAGS+=-DVERSION=\"$(VERSION)\" \
 	-DDOCUMENT_PATH=\"$(DOCUMENT_PATH)\" \
 	-DPIXMAP_PATH=\"$(PIXMAP_PATH)\"
 
-CXXFLAGS += $(SNDFILE_CFLAGS) $(FLTK_CFLAGS) $(JACK_CFLAGS)
 CXXFLAGS := $(CFLAGS) $(CXXFLAGS)
 
 INCLUDES := -I. -Iutil -IFL -Inonlib
@@ -90,6 +89,7 @@ include makefile.inc
 
 SRCS:=$(Mixer_SRCS)
 OBJS:=$(Mixer_OBJS)
+CXXFLAGS += $(Mixer_CFLAGS)
 
 # FIXME: isn't there a better way?
 $(OBJS): .config Makefile
diff --git a/mixer/configure b/mixer/configure
index d87659c..104af2f 100755
--- a/mixer/configure
+++ b/mixer/configure
@@ -21,6 +21,7 @@ require_command makedepend makedepend
 require_package JACK 0.103.0 jack
 require_package lrdf 0.4.0 lrdf
 require_package liblo 0.23 liblo
+require_package sigcpp 2.0.0 sigc++-2.0
 
 test_version `version_of liblo` 0.26 || warn "Version $(version_of liblo) of liblo is slow to create servers. Consider upgrading to 0.26 or later"
 
diff --git a/mixer/makefile.inc b/mixer/makefile.inc
index fda3f27..6869eba 100644
--- a/mixer/makefile.inc
+++ b/mixer/makefile.inc
@@ -8,7 +8,9 @@ Mixer_SRCS:=$(Mixer_SRCS:.fl=.C)
 Mixer_SRCS:=$(sort $(Mixer_SRCS))
 Mixer_OBJS:=$(Mixer_SRCS:.C=.o)
 
-Mixer_LIBS := $(FLTK_LIBS) $(JACK_LIBS) $(LASH_LIBS) $(LRDF_LIBS) $(LIBLO_LIBS)
+Mixer_LIBS := $(FLTK_LIBS) $(JACK_LIBS) $(LASH_LIBS) $(LRDF_LIBS) $(LIBLO_LIBS) $(SIGCPP_LIBS)
+
+Mixer_CFLAGS := $(FLTK_CFLAGS) $(JACK_CFLAGS) $(LIBLO_CFLAGS) $(SIGCPP_CFLAGS)
 
 src/mixer: $(Mixer_OBJS) FL/libfl_widgets.a nonlib/libnonlib.a
 	@ echo -n Linking mixer...
diff --git a/nonlib/Makefile b/nonlib/Makefile
index e81c2af..5964116 100644
--- a/nonlib/Makefile
+++ b/nonlib/Makefile
@@ -62,7 +62,6 @@ CFLAGS+=-DVERSION=\"$(VERSION)\" \
 	-DDOCUMENT_PATH=\"$(DOCUMENT_PATH)\" \
 	-DPIXMAP_PATH=\"$(PIXMAP_PATH)\"
 
-CXXFLAGS += $(SNDFILE_CFLAGS) $(FLTK_CFLAGS) $(JACK_CFLAGS)
 CXXFLAGS := $(CFLAGS) $(CXXFLAGS)
 
 INCLUDES := -I. -Iutil -IFL -Inonlib
@@ -88,6 +87,7 @@ include makefile.inc
 
 SRCS:=$(nonlib_SRCS)
 OBJS:=$(nonlib_OBJS)
+CXXFLAGS += $(nonlib_CFLAGS)
 
 # FIXME: isn't there a better way?
 $(OBJS): .config Makefile
diff --git a/nonlib/configure b/nonlib/configure
index 1c0d359..212f6f2 100755
--- a/nonlib/configure
+++ b/nonlib/configure
@@ -16,5 +16,9 @@ begin_tests
 require_command ar ar
 require_command makedepend makedepend
 require_package JACK 0.103.0 jack
+require_package liblo 0.23 liblo
+require_package sigcpp 2.0.0 sigc++-2.0
+
+test_version `version_of liblo` 0.26 || warn "Version $(version_of liblo) of liblo is slow to create servers. Consider upgrading to 0.26 or later"
 
 end
diff --git a/nonlib/makefile.inc b/nonlib/makefile.inc
index 3041d60..2a31592 100644
--- a/nonlib/makefile.inc
+++ b/nonlib/makefile.inc
@@ -5,6 +5,8 @@ nonlib_SRCS := $(wildcard nonlib/*.C nonlib/JACK/*.C nonlib/LASH/*.C nonlib/OSC/
 nonlib_SRCS:=$(sort $(nonlib_SRCS))
 nonlib_OBJS:=$(nonlib_SRCS:.C=.o)
 
+nonlib_CFLAGS := $(SIGCPP_CFLAGS) $(LIBLO_CFLAGS) $(JACK_CFLAGS)
+
 all: nonlib/libnonlib.a
 
 nonlib/libnonlib.a: $(nonlib_OBJS)
diff --git a/session/Makefile b/session/Makefile
index 63a16d7..9169926 100644
--- a/session/Makefile
+++ b/session/Makefile
@@ -62,7 +62,6 @@ CFLAGS+=-DVERSION=\"$(VERSION)\" \
 	-DDOCUMENT_PATH=\"$(DOCUMENT_PATH)\" \
 	-DPIXMAP_PATH=\"$(PIXMAP_PATH)\"
 
-CXXFLAGS += $(SNDFILE_CFLAGS) $(FLTK_CFLAGS) $(JACK_CFLAGS)
 CXXFLAGS := $(CFLAGS) $(CXXFLAGS)
 
 INCLUDES := -I. -Iutil -IFL -Inonlib
@@ -90,6 +89,7 @@ include makefile.inc
 
 SRCS:=$(Session_SRCS)
 OBJS:=$(Session_OBJS)
+CXXFLAGS += $(Session_CFLAGS)
 
 # FIXME: isn't there a better way?
 $(OBJS): .config Makefile
diff --git a/session/configure b/session/configure
index 0ffe863..7b49399 100755
--- a/session/configure
+++ b/session/configure
@@ -19,8 +19,8 @@ require_command FLUID fluid
 require_command ar ar
 require_command makedepend makedepend
 # require_package JACK 0.103.0 jack
-require_package lrdf 0.4.0 lrdf
 require_package liblo 0.23 liblo
+require_package sigcpp 2.0.0 sigc++-2.0
 
 test_version `version_of liblo` 0.26 || warn "Version $(version_of liblo) of liblo is slow to create servers. Consider upgrading to 0.26 or later"
 
diff --git a/session/makefile.inc b/session/makefile.inc
index 30ea6f6..08d42aa 100644
--- a/session/makefile.inc
+++ b/session/makefile.inc
@@ -9,7 +9,8 @@ Session_SRCS:=$(Session_SRCS:.fl=.C)
 Session_SRCS:=$(sort $(Session_SRCS))
 Session_OBJS:=$(Session_SRCS:.C=.o)
 
-Session_LIBS := $(LIBLO_LIBS)
+Session_LIBS := $(LIBLO_LIBS) $(SIGCPP_LIBS)
+Session_CFLAGS := $(LIBLO_CFLAGS) $(SIGCPP_CFLAGS)
 
 src/nsmd: src/nsmd.o nonlib/libnonlib.a
 	@ echo -n Linking session handler.
@@ -17,7 +18,7 @@ src/nsmd: src/nsmd.o nonlib/libnonlib.a
 
 src/session-manager: src/session-manager.o nonlib/libnonlib.a
 	@ echo -n Linking session handler.
-	@ $(CXX) $(CXXFLAGS) $(FLTK_LIBS) $(Session_LIBS) src/session-manager.o -o $@ -Lnonlib -lnonlib -ldl && echo $(DONE)
+	@ $(CXX) $(CXXFLAGS) $(FLTK_CLFAGS) $(FLTK_LIBS) $(Session_LIBS) src/session-manager.o -o $@ -Lnonlib -lnonlib -ldl && echo $(DONE)
 
 src/send_osc: src/send_osc.o nonlib/libnonlib.a
 	@ $(CXX) $(CXXFLAGS) $(Session_LIBS) src/send_osc.o -o $@ -Lnonlib -lnonlib -ddl && echo $(DONE)
diff --git a/timeline/Makefile b/timeline/Makefile
index d008f6b..6a77294 100644
--- a/timeline/Makefile
+++ b/timeline/Makefile
@@ -74,7 +74,6 @@ CFLAGS+=-DVERSION=\"$(VERSION)\" \
 	-DDOCUMENT_PATH=\"$(DOCUMENT_PATH)\" \
 	-DPIXMAP_PATH=\"$(PIXMAP_PATH)\"
 
-CXXFLAGS += $(SNDFILE_CFLAGS) $(FLTK_CFLAGS) $(JACK_CFLAGS)
 CXXFLAGS := $(CFLAGS) $(CXXFLAGS)
 
 INCLUDES := -I. -Iutil -IFL -Inonlib
@@ -102,6 +101,7 @@ include makefile.inc
 
 SRCS:=$(Timeline_SRCS)
 OBJS:=$(Timeline_OBJS)
+CXXFLAGS += $(Timeline_CFLAGS)
 
 # FIXME: isn't there a better way?
 $(OBJS): .config Makefile
diff --git a/timeline/configure b/timeline/configure
index e4fe852..9ffb1c4 100755
--- a/timeline/configure
+++ b/timeline/configure
@@ -28,6 +28,7 @@ require_command makedepend makedepend
 require_package JACK 0.103.0 jack
 require_package sndfile 1.0.17 sndfile
 require_package liblo 0.23 liblo
+require_package sigcpp 2.0.0 sigc++-2.0
 
 test_version `version_of liblo` 0.26 || warn "Version $(version_of liblo) of liblo is slow to create servers. Consider upgrading to 0.26 or later"
 
diff --git a/timeline/makefile.inc b/timeline/makefile.inc
index 4b5f276..c33cf10 100644
--- a/timeline/makefile.inc
+++ b/timeline/makefile.inc
@@ -10,7 +10,9 @@ Timeline_SRCS:=$(Timeline_SRCS:.fl=.C)
 Timeline_SRCS:=$(sort $(Timeline_SRCS))
 Timeline_OBJS:=$(Timeline_SRCS:.C=.o)
 
-Timeline_LIBS := $(FLTK_LIBS) $(JACK_LIBS) $(SNDFILE_LIBS) $(LIBLO_LIBS)
+Timeline_LIBS := $(FLTK_LIBS) $(JACK_LIBS) $(SNDFILE_LIBS) $(LIBLO_LIBS) $(SIGCPP_LIBS)
+
+Timeline_CFLAGS := $(SNDFILE_CFLAGS) $(FLTK_CFLAGS) $(JACK_CFLAGS) $(SIGCPP_CFLAGS)
 
 src/timeline: $(Timeline_OBJS) FL/libfl_widgets.a nonlib/libnonlib.a
 	@ echo -n Linking timeline...