diff --git a/libs/openzap/src/Makefile b/libs/openzap/src/Makefile
index a9a87dbd6d..1a7ca47cce 100644
--- a/libs/openzap/src/Makefile
+++ b/libs/openzap/src/Makefile
@@ -31,7 +31,7 @@
 
 CC=gcc
 OBJS=hashtable.o hashtable_itr.o openzap.o zap_config.o
-CFLAGS=$(USER_CFLAGS) -Wall -Werror -Wextra -std=c99 -pedantic -ansi
+CFLAGS=$(USER_CFLAGS) -Iinclude -Wall -Werror -Wextra -std=c99 -pedantic -ansi
 MYLIB=libopenzap.a
 
 CFLAGS +=-DZAP_WANPIPE_SUPPORT
diff --git a/libs/openzap/src/hashtable.h b/libs/openzap/src/include/hashtable.h
similarity index 100%
rename from libs/openzap/src/hashtable.h
rename to libs/openzap/src/include/hashtable.h
diff --git a/libs/openzap/src/hashtable_itr.h b/libs/openzap/src/include/hashtable_itr.h
similarity index 100%
rename from libs/openzap/src/hashtable_itr.h
rename to libs/openzap/src/include/hashtable_itr.h
diff --git a/libs/openzap/src/hashtable_private.h b/libs/openzap/src/include/hashtable_private.h
similarity index 100%
rename from libs/openzap/src/hashtable_private.h
rename to libs/openzap/src/include/hashtable_private.h
diff --git a/libs/openzap/src/openzap.h b/libs/openzap/src/include/openzap.h
similarity index 100%
rename from libs/openzap/src/openzap.h
rename to libs/openzap/src/include/openzap.h
diff --git a/libs/openzap/src/zap_config.h b/libs/openzap/src/include/zap_config.h
similarity index 100%
rename from libs/openzap/src/zap_config.h
rename to libs/openzap/src/include/zap_config.h
diff --git a/libs/openzap/src/zap_skel.h b/libs/openzap/src/include/zap_skel.h
similarity index 100%
rename from libs/openzap/src/zap_skel.h
rename to libs/openzap/src/include/zap_skel.h
diff --git a/libs/openzap/src/zap_wanpipe.h b/libs/openzap/src/include/zap_wanpipe.h
similarity index 100%
rename from libs/openzap/src/zap_wanpipe.h
rename to libs/openzap/src/include/zap_wanpipe.h
diff --git a/libs/openzap/src/zap_zt.h b/libs/openzap/src/include/zap_zt.h
similarity index 100%
rename from libs/openzap/src/zap_zt.h
rename to libs/openzap/src/include/zap_zt.h