diff --git a/Makefile-variables b/Makefile-variables
index 2b92ecb..2fe64d3 100644
--- a/Makefile-variables
+++ b/Makefile-variables
@@ -39,10 +39,11 @@ CXXFLAGS := --std=c++20 -O3 -Iinclude
 else
 CXXFLAGS := --std=c++17 -O3 -Iinclude
 endif
+CXXFLAGS += $(shell pkg-config --cflags getargv)
 
 EXTRA_CXXFLAGS := -pedantic-errors -Weverything -Wno-c++98-compat -Wno-pre-c++20-compat-pedantic -Wno-poison-system-directories
 LDFLAGS += -Llib -fvisibility=default -fPIC
-LDLIBS += -lgetargv
+LDLIBS += $(shell pkg-config --libs getargv)
 
 LIB_SHORT_NAME = getargv++
 LIB_NAME = lib$(LIB_SHORT_NAME)
diff --git a/include/libgetargv++.hpp b/include/libgetargv++.hpp
index 62ab90c..f877724 100644
--- a/include/libgetargv++.hpp
+++ b/include/libgetargv++.hpp
@@ -16,6 +16,8 @@
 namespace Getargv {
   namespace ffi {
 #include <libgetargv.h>
+    using errno_t = ::errno_t;
+    using uint = ::uint;
   } // namespace ffi
 
   /** \brief This struct provides an iterable and printable representation of