diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am
index 78ffea592..12110b26f 100644
--- a/src/backend/Makefile.am
+++ b/src/backend/Makefile.am
@@ -46,7 +46,9 @@ noinst_HEADERS +=						\
 	$(liblumibackend_a_srcdir)/filehandle.h			\
 	$(liblumibackend_a_srcdir)/filedescriptor.h		\
 	$(liblumibackend_a_srcdir)/filehandlecache.h		\
+	$(liblumibackend_a_srcdir)/interface.c			\
 	$(liblumibackend_a_srcdir)/interfaceregistry.h		\
+	$(liblumibackend_a_srcdir)/interfacedescriptor.h	\
 	$(liblumibackend_a_srcdir)/config.h 			\
 	$(liblumibackend_a_srcdir)/configentry.h 		\
 	$(liblumibackend_a_srcdir)/configitem.h 		\
diff --git a/src/backend/interface.c b/src/backend/interface.c
index 0150e403e..58d0d0c0f 100644
--- a/src/backend/interface.c
+++ b/src/backend/interface.c
@@ -21,7 +21,8 @@
 
 #include "lib/mutex.h"
 #include "lib/safeclib.h"
-#include "lib/interface.h"
+
+#include "backend/interface.h"
 
 #include "backend/interfaceregistry.h"
 
diff --git a/src/lib/interface.h b/src/backend/interface.h
similarity index 100%
rename from src/lib/interface.h
rename to src/backend/interface.h
diff --git a/src/lib/interfacedescriptor.h b/src/backend/interfacedescriptor.h
similarity index 98%
rename from src/lib/interfacedescriptor.h
rename to src/backend/interfacedescriptor.h
index 1b6501a7b..468bd2e80 100644
--- a/src/lib/interfacedescriptor.h
+++ b/src/backend/interfacedescriptor.h
@@ -21,7 +21,7 @@
 #ifndef LUMIERA_INTERFACEDESCRIPTOR_H
 #define LUMIERA_INTERFACEDESCRIPTOR_H
 
-#include "lib/interface.h"
+#include "backend/interface.h"
 
 /**
  * WIP: interface descriptor, needs some generic metadata interface
diff --git a/src/backend/interfaceregistry.h b/src/backend/interfaceregistry.h
index 0af95c9be..11ed91bde 100644
--- a/src/backend/interfaceregistry.h
+++ b/src/backend/interfaceregistry.h
@@ -23,7 +23,8 @@
 
 #include "lib/mutex.h"
 #include "lib/psplay.h"
-#include "lib/interface.h"
+
+#include "backend/interface.h"
 
 #include <nobug.h>
 
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 2ad293158..4dc927b43 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -31,7 +31,6 @@ liblumi_a_SOURCES =					\
 	$(liblumi_a_srcdir)/psplay.c			\
 	$(liblumi_a_srcdir)/mrucache.c			\
 	$(liblumi_a_srcdir)/time.c			\
-	$(liblumi_a_srcdir)/interfacedescriptor.c	\
 	$(liblumi_a_srcdir)/appconfig.cpp
 
 noinst_HEADERS +=						\
@@ -47,7 +46,6 @@ noinst_HEADERS +=						\
 	$(liblumi_a_srcdir)/time.h				\
 	$(liblumi_a_srcdir)/ppmpl.h				\
 	$(liblumi_a_srcdir)/interface.h				\
-	$(liblumi_a_srcdir)/interfacedescriptor.h		\
 	$(liblumi_a_srcdir)/appconfig.hpp			\
 	$(liblumi_a_srcdir)/lifecycleregistry.hpp
 
diff --git a/tests/backend/test-interfaces.c b/tests/backend/test-interfaces.c
index 214c795c8..09fa25afa 100644
--- a/tests/backend/test-interfaces.c
+++ b/tests/backend/test-interfaces.c
@@ -19,9 +19,9 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "lib/interface.h"
+#include "backend/interface.h"
 #include "backend/interfaceregistry.h"
-#include "lib/interfacedescriptor.h"
+#include "backend/interfacedescriptor.h"
 #include "tests/test.h"
 
 /*