diff --git a/perl-xCAT/xCAT/hpoa.pm b/perl-xCAT/include/hpoa.pm
old mode 100755
new mode 100644
similarity index 99%
rename from perl-xCAT/xCAT/hpoa.pm
rename to perl-xCAT/include/hpoa.pm
index 21a240b61..49471c02a
--- a/perl-xCAT/xCAT/hpoa.pm
+++ b/perl-xCAT/include/hpoa.pm
@@ -10,7 +10,7 @@
 ## For example:
 ## 	hpoa->new(oaAddress => '16.129.49.209');
 
-package xCAT::hpoa;
+package hpoa;
 
 use strict;
 
diff --git a/perl-xCAT/perl-xCAT.spec b/perl-xCAT/perl-xCAT.spec
index 2f3f49f1a..1a1e603f8 100644
--- a/perl-xCAT/perl-xCAT.spec
+++ b/perl-xCAT/perl-xCAT.spec
@@ -44,6 +44,7 @@ Includes xCAT::Table, xCAT::NodeRange, among others.
 rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/data
+mkdir -p $RPM_BUILD_ROOT/%{prefix}/lib/include/
 mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/doc/packages/perl-xCAT
 mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/man/man5
 mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/doc/man5
@@ -55,11 +56,13 @@ cp -r xCAT/* $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/
 chmod 644 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/*
 chmod 755 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/data
 chmod 644 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/data/*
+cp -r include/* $RPM_BUILD_ROOT/%{prefix}/lib/include/
+chmod 644 $RPM_BUILD_ROOT/%{prefix}/lib/include/*
 
 
 # For now, don't ship these plugins - to avoid AIX dependency error.
 %ifnos linux
-rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/hpoa.pm
+rm $RPM_BUILD_ROOT/%{prefix}/lib/include/hpoa.pm
 %endif
 
 cp LICENSE.html $RPM_BUILD_ROOT/%{prefix}/share/doc/packages/perl-xCAT
diff --git a/xCAT-server/lib/xcat/plugins/hpblade.pm b/xCAT-server/lib/xcat/plugins/hpblade.pm
index 43578c92b..c2a1bf54a 100755
--- a/xCAT-server/lib/xcat/plugins/hpblade.pm
+++ b/xCAT-server/lib/xcat/plugins/hpblade.pm
@@ -12,6 +12,7 @@ BEGIN
 	$::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : '/opt/xcat';
 }
 use lib "$::XCATROOT/lib/perl";
+use lib "$::XCATROOT/lib/include";
 
 use strict;
 use xCAT::Table;
@@ -27,7 +28,7 @@ use Net::SSLeay qw(die_now die_if_ssl_error);
 use Data::Dumper;
 use POSIX "WNOHANG";
 use Getopt::Long;
-use xCAT::hpoa;
+use hpoa;
 
 sub handled_commands {
 	return {