diff --git a/packaging/hip_base.postinst b/packaging/hip_base.postinst
index bdd5507374..daf0591081 100755
--- a/packaging/hip_base.postinst
+++ b/packaging/hip_base.postinst
@@ -22,12 +22,9 @@ done
 popd >/dev/null
 
 # Soft-link to headers
-HIPINCDIR=$HIPDIR/include
+HIPINCDIR=$HIPDIR/include/hip
 ROCMINCDIR=$ROCMDIR/include
 mkdir -p $ROCMINCDIR
 pushd $ROCMINCDIR
     ln -s $HIPINCDIR hip
 popd
-pushd $HIPINCDIR
-ln -s $HIPINCDIR hip
-popd
diff --git a/packaging/hip_base.prerm b/packaging/hip_base.prerm
index e27cbdd2e6..2953e16f2f 100755
--- a/packaging/hip_base.prerm
+++ b/packaging/hip_base.prerm
@@ -28,8 +28,5 @@ ROCMINCDIR=$ROCMDIR/include
 pushd $ROCMINCDIR
 rm hip
 popd
-pushd $HIPINCDIR
-rm hip
-popd
 rmdir --ignore-fail-on-non-empty $ROCMINCDIR
 
diff --git a/packaging/hip_base.txt b/packaging/hip_base.txt
index e528e688ef..6f989d5636 100644
--- a/packaging/hip_base.txt
+++ b/packaging/hip_base.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.3)
 project(hip_base)
 
 install(DIRECTORY @hip_SOURCE_DIR@/bin DESTINATION . USE_SOURCE_PERMISSIONS)
-install(DIRECTORY @hip_SOURCE_DIR@/include DESTINATION . PATTERN "hip" EXCLUDE)
+install(DIRECTORY @hip_SOURCE_DIR@/include DESTINATION .)
 install(FILES @PROJECT_BINARY_DIR@/.version DESTINATION bin)
 install(DIRECTORY @hip_SOURCE_DIR@/cmake DESTINATION .)