Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -426,12 +426,12 @@
 	])
 ], [
 	AC_DEFINE(OF_NO_SHARED, 1, [Whether no shared library was built])
 	AC_SUBST(LIBOBJFW_DEP, "../src/libobjfw.a")
 	AC_SUBST(LIBOBJFW_DEP_LVL2, "../../src/libobjfw.a")
-	AC_SUBST(LIBOBJFWHID_DEP, "../src/libobjfwhid.a")
-	AC_SUBST(LIBOBJFWHID_DEP_LVL2, "../../src/libobjfwhid.a")
+	AC_SUBST(LIBOBJFWHID_DEP, "../src/hid/libobjfwhid.a")
+	AC_SUBST(LIBOBJFWHID_DEP_LVL2, "../../src/hid/libobjfwhid.a")
 ])
 
 AS_IF([test x"$build_framework" = x"yes"], [
 	TESTS_LIBS="-framework ObjFW \${RUNTIME_FRAMEWORK_LIBS} $TESTS_LIBS"
 	TESTS_LIBS="-framework ObjFWHID $TESTS_LIBS"

Index: tests/gamecontroller/Makefile
==================================================================
--- tests/gamecontroller/Makefile
+++ tests/gamecontroller/Makefile
@@ -95,11 +95,12 @@
 
 CPPFLAGS += -I../../src			\
 	    -I../../src/exceptions	\
 	    -I../../src/hid		\
 	    -I../../src/runtime		\
-	    -I../..
+	    -I../..			\
+	    -DOBJFWHID_LOCAL_INCLUDES
 LIBS := -L../../src/hid -lobjfwhid		\
 	-L../../src -lobjfw			\
 	-L../../src/runtime ${RUNTIME_LIBS}	\
 	${LIBS}
 LD = ${OBJC}