diff --git a/c++/carla-backend/Makefile b/c++/carla-backend/Makefile
index 160b4a2..5b746a0 100644
--- a/c++/carla-backend/Makefile
+++ b/c++/carla-backend/Makefile
@@ -4,6 +4,7 @@
 # Created by falkTX
 #
 
+CC  ?= gcc
 CXX ?= g++
 
 # HAVE_ALSA         = $(shell pkg-config --exists alsa && echo true)
@@ -15,6 +16,8 @@ HAVE_SUIL         = $(shell pkg-config --exists suil-0 && echo true)
 
 BASE_FLAGS        = -O2 -ffast-math -fomit-frame-pointer -fPIC -mtune=generic -msse -mfpmath=sse -Wall -I. -I../carla-includes -I../carla-jackbridge
 
+CARLA_C_FLAGS     = $(BASE_FLAGS) -std=c99 $(CFLAGS)
+
 CARLA_CXX_FLAGS   = $(BASE_FLAGS) -std=c++0x $(CXXFLAGS)
 CARLA_CXX_FLAGS  += $(shell pkg-config --cflags liblo QtCore QtGui)
 CARLA_CXX_FLAGS  += -DQT_NO_DEBUG -DQT_NO_DEBUG_STREAM -DQT_NO_DEBUG_OUTPUT -DNDEBUG
@@ -65,6 +68,7 @@ OBJS = \
 	carla_shared.o \
 	carla_threads.o \
 	ladspa.o dssi.o lv2.o vst.o fluidsynth.o linuxsampler.o \
+	rtmempool/rtmempool.o \
 	../carla-jackbridge/carla_jackbridge.o \
 	../carla-lilv/carla_lilv.a
 
@@ -86,6 +90,9 @@ carla_backend.so: $(OBJS)
 
 # --------------------------------------------------------------
 
+.c.o:
+	$(CC) -c $< $(CARLA_C_FLAGS) -o $@
+
 .cpp.o:
 	$(CXX) -c $< $(CARLA_CXX_FLAGS) -o $@
 
@@ -93,4 +100,4 @@ carla_backend.so: $(OBJS)
 	$(MAKE) -C ../carla-lilv
 
 clean:
-	rm -f *.o lv2-rtmempool/*.o rtaudio-4.0.11/*.o rtmidi-2.0.0/*.o *.so *.dll
+	rm -f $(OBJS) *.a *.so *.dll
diff --git a/c++/carla-backend/Makefile.dbg b/c++/carla-backend/Makefile.dbg
index dcb92a3..10d2e62 100644
--- a/c++/carla-backend/Makefile.dbg
+++ b/c++/carla-backend/Makefile.dbg
@@ -4,6 +4,7 @@
 # Created by falkTX
 #
 
+CC  ?= gcc
 CXX ?= g++
 
 # HAVE_ALSA         = $(shell pkg-config --exists alsa && echo true)
@@ -13,7 +14,9 @@ HAVE_FLUIDSYNTH   = $(shell pkg-config --exists fluidsynth && echo true)
 HAVE_LINUXSAMPLER = $(shell pkg-config --exists linuxsampler && echo true)
 HAVE_SUIL         = $(shell pkg-config --exists suil-0 && echo true)
 
-BASE_FLAGS        = -O0 -g -fPIC -Wall -I. -I../carla-includes
+BASE_FLAGS        = -O0 -g -fPIC -Wall -I. -I../carla-includes -I../carla-jackbridge
+
+CARLA_C_FLAGS     = $(BASE_FLAGS) -std=c99 $(CFLAGS)
 
 CARLA_CXX_FLAGS   = $(BASE_FLAGS) -std=c++0x $(CXXFLAGS)
 CARLA_CXX_FLAGS  += $(shell pkg-config --cflags liblo QtCore QtGui)
@@ -65,6 +68,8 @@ OBJS = \
 	carla_shared.o \
 	carla_threads.o \
 	ladspa.o dssi.o lv2.o vst.o fluidsynth.o linuxsampler.o \
+	rtmempool/rtmempool.o \
+	../carla-jackbridge/carla_jackbridge.o \
 	../carla-lilv/carla_lilv.a
 
 ifeq ($(WANT_RTAUDIO),true)
@@ -81,10 +86,13 @@ doc: carla_backend.doxygen
 	doxygen $<
 
 carla_backend.so: $(OBJS)
-	$(CXX) $^ $(CARLA_LD_FLAGS) -o $@ && strip $@
+	$(CXX) $^ $(CARLA_LD_FLAGS) -o $@
 
 # --------------------------------------------------------------
 
+.c.o:
+	$(CC) -c $< $(CARLA_C_FLAGS) -o $@
+
 .cpp.o:
 	$(CXX) -c $< $(CARLA_CXX_FLAGS) -o $@
 
@@ -92,4 +100,4 @@ carla_backend.so: $(OBJS)
 	$(MAKE) -C ../carla-lilv
 
 clean:
-	rm -f *.o lv2-rtmempool/*.o rtaudio-4.0.11/*.o rtmidi-2.0.0/*.o *.so *.dll
+	rm -f $(OBJS) *.a *.so *.dll