diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am
index 45ce555a8..8b33df06a 100644
--- a/src/backend/Makefile.am
+++ b/src/backend/Makefile.am
@@ -21,14 +21,13 @@ noinst_LIBRARIES += liblumibackend.a
 liblumibackend_a_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror
 liblumibackend_a_CPPFLAGS = -I$(top_srcdir)/src/
 
-liblumibackend_a_SOURCES = \
-	$(liblumibackend_a_srcdir)/mediaaccessfacade.cpp
-
-#	$(liblumibackend_a_srcdir)/backend.c \
-#	$(liblumibackend_a_srcdir)/file.c \
-#	$(liblumibackend_a_srcdir)/filehandle.c \
-#	$(liblumibackend_a_srcdir)/filedescriptor.c \
-#	$(liblumibackend_a_srcdir)/filehandlecache.c
+liblumibackend_a_SOURCES =					\
+	$(liblumibackend_a_srcdir)/mediaaccessfacade.cpp	\
+	$(liblumibackend_a_srcdir)/backend.c			\
+	$(liblumibackend_a_srcdir)/file.c			\
+	$(liblumibackend_a_srcdir)/filehandle.c			\
+	$(liblumibackend_a_srcdir)/filedescriptor.c		\
+	$(liblumibackend_a_srcdir)/filehandlecache.c
 
 
 noinst_HEADERS +=						\
diff --git a/tests/backend/test-filedescriptors.c b/tests/backend/test-filedescriptors.c
index 40f516048..3e14ead1d 100644
--- a/tests/backend/test-filedescriptors.c
+++ b/tests/backend/test-filedescriptors.c
@@ -18,8 +18,6 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#define _GNU_SOURCE
-
 #include "lib/safeclib.h"
 
 #include "backend/backend.h"
diff --git a/tests/backend/test-filehandles.c b/tests/backend/test-filehandles.c
index 71056144e..17c237d4f 100644
--- a/tests/backend/test-filehandles.c
+++ b/tests/backend/test-filehandles.c
@@ -18,8 +18,6 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#define _GNU_SOURCE
-
 #include "lib/llist.h"
 #include "lib/safeclib.h"