diff --git a/libs/uw-imap/Makefile b/libs/uw-imap/Makefile
index b3d4357da..9fe5509c0 100644
--- a/libs/uw-imap/Makefile
+++ b/libs/uw-imap/Makefile
@@ -54,10 +54,13 @@ endef
 
 define Build/InstallDev
 	$(INSTALL_DIR)	$(1)/usr/lib \
-			$(1)/usr/include
+			$(1)/usr/include/c-client
 	$(CP) $(PKG_BUILD_DIR)/c-client/libc-client.so.$(PKG_VERSION) $(1)/usr/lib/
 	$(LN) libc-client.so.$(PKG_VERSION) $(1)/usr/lib/libc-client.so
-	$(CP) $(PKG_BUILD_DIR)/c-client/*.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/c-client/linkage.h $(1)/usr/include/c-client/
+	$(CP) $(PKG_BUILD_DIR)/src/c-client/*.h $(1)/usr/include/c-client/
+	$(CP) $(PKG_BUILD_DIR)/src/osdep/unix/*.h $(1)/usr/include/c-client/
+	$(LN) os_slx.h $(1)/usr/include/c-client/osdep.h
 endef
 
 define Package/uw-imap/install