diff --git a/Makefile b/Makefile
index f6f3ae65c..df84c2ef1 100644
--- a/Makefile
+++ b/Makefile
@@ -55,6 +55,7 @@ LIBS      += -l$(LUA_LIB_NAME)
 endif
 ifeq ($(USE_INTERNAL_HWLOC),false)
 LIBS      += -l$(HWLOC_LIB_NAME)
+SHARED_CFLAGS += -L$(HWLOC_LIB_DIR)
 endif
 
 #CONFIGURE BUILD SYSTEM
diff --git a/src/topology_hwloc.c b/src/topology_hwloc.c
index d50cb19ba..d59dcd411 100644
--- a/src/topology_hwloc.c
+++ b/src/topology_hwloc.c
@@ -413,9 +413,9 @@ hwloc_init_nodeTopology(cpu_set_t cpuSet)
         socket_type = HWLOC_OBJ_NODE;
     }
 
-    maxNumSockets = likwid_hwloc_get_nbobjs_by_type(hwloc_topology, socket_type);
-    maxNumDies = likwid_hwloc_get_nbobjs_by_type(hwloc_topology, HWLOC_OBJ_DIE);
-    obj = likwid_hwloc_get_obj_by_type(hwloc_topology, socket_type, 0);
+    maxNumSockets = LIKWID_HWLOC_NAME(get_nbobjs_by_type)(hwloc_topology, socket_type);
+    maxNumDies = LIKWID_HWLOC_NAME(get_nbobjs_by_type)(hwloc_topology, HWLOC_OBJ_DIE);
+    obj = LIKWID_HWLOC_NAME(get_obj_by_type)(hwloc_topology, socket_type, 0);
 
     if (obj)
     {