diff --git a/igvm/Cargo.toml b/igvm/Cargo.toml
index 974300b..17a76c3 100644
--- a/igvm/Cargo.toml
+++ b/igvm/Cargo.toml
@@ -14,7 +14,14 @@ categories = ["virtualization", "parser-implementations"]
 
 [package.metadata.capi.header]
 # cbindgen is handled from igvm_c/Makefile
-enabled = false
+generation = false
+
+[package.metadata.capi.pkg_config]
+# users include <igvm/igvm.h>, so let's strip igvm from Cflags
+strip_include_path_components = 1
+
+[package.metadata.capi.install.include]
+asset = [{from = "../igvm_c/include/igvm.h"}, {from = "../igvm_c/include/igvm_defs.h"}]
 
 [package.metadata.docs.rs]
 # Document all features
diff --git a/igvm_c/Makefile b/igvm_c/Makefile
index 49fec7d..daea749 100644
--- a/igvm_c/Makefile
+++ b/igvm_c/Makefile
@@ -38,7 +38,7 @@ all: build test
 
 build: $(API_DIR)/include/igvm.h $(TARGET_PATH)/dump_igvm$(EXE)
 
-$(LIBIGVM):
+$(LIBIGVM): $(API_DIR)/include/igvm.h
 	$(CARGO) cbuild --prefix $(PREFIX) --features $(FEATURES) $(EXTRA_PARAMS) --manifest-path=$(IGVM_DIR)/igvm/Cargo.toml
 
 $(TARGET_PATH)/libigvm_defs.rlib:
@@ -71,8 +71,6 @@ clean:
 	rm -f $(API_DIR)/include/igvm.h $(API_DIR)/include/igvm_defs.h $(TARGET_PATH)/dump_igvm$(EXE) $(TARGET_PATH)/test_data$(EXE) $(TARGET_PATH)/igvm.bin
 
 install: build
-	mkdir -p $(DESTDIR)/$(PREFIX)/include/igvm
-	install -m 644 $(IGVM_DIR)/igvm_c/include/* $(DESTDIR)/$(PREFIX)/include/igvm
 	$(CARGO) cinstall $(if $(DESTDIR), --destdir "$(DESTDIR)") --prefix "$(PREFIX)" --features $(FEATURES) $(EXTRA_PARAMS) --manifest-path=$(IGVM_DIR)/igvm/Cargo.toml
 	mkdir -p $(DESTDIR)/$(PREFIX)/bin/
 	install -m 755 $(TARGET_PATH)/dump_igvm$(EXE) $(DESTDIR)/$(PREFIX)/bin/