diff --git a/bin/deb-build.sh b/bin/deb-build.sh
new file mode 100755
index 0000000..dc2e3ca
--- /dev/null
+++ b/bin/deb-build.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+rm -vf *.*~
+
+# copy hstr/ source code to a work directory and run this script to create DEB package
+cd ..
+bzr commit -m "Sync."
+bzr builddeb -- -us -uc
+bzr builddeb -S && cd ../build-area && pbuilder-dist raring build hh_0.7-0ubuntu1.dsc
+
+# eof
diff --git a/debian/control b/debian/control
index 8c0d281..0656df0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: hh
-Section: admin
-Priority: extra
+Section: universe/admin
+Priority: optional
 Maintainer: Martin Dvorak <martin.dvorak@mindforger.com>
-Build-Depends: debhelper (>= 8.0.0), autotools-dev
+Build-Depends: debhelper (>= 8.0.0), autotools-dev, libreadline-dev, libncurses5-dev
 Standards-Version: 3.9.4
 Homepage: https://github.com/dvorka/hstr
 Vcs-Git: https://github.com/dvorka/hstr.git
@@ -10,7 +10,8 @@ Vcs-Browser: https://github.com/dvorka/hstr
 
 Package: hh
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libreadline5
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Suggest box like shell history completion 
  A command line utility that brings improved shell command completion 
  from the history. It aims to make completion easier and faster than Ctrl-R.
+Tag: implemented-in::c++, interface::commandline, role::program
\ No newline at end of file
diff --git a/src/hstr_history.c b/src/hstr_history.c
index 22bb1e4..f472cc7 100644
--- a/src/hstr_history.c
+++ b/src/hstr_history.c
@@ -8,10 +8,6 @@
 */
 
 #include "include/hstr_history.h"
-#include "include/hashset.h"
-#include "include/radixsort.h"
-
-#include "include/hstr_utils.h"
 
 #define NDEBUG
 #include <assert.h>
diff --git a/src/include/hstr_history.h b/src/include/hstr_history.h
index 00b8a1b..a836823 100644
--- a/src/include/hstr_history.h
+++ b/src/include/hstr_history.h
@@ -18,6 +18,8 @@
 #include <unistd.h>
 #include <stdbool.h>
 #include "hstr_utils.h"
+#include "hashset.h"
+#include "radixsort.h"
 
 #define ENV_VAR_USER "USER"
 #define ENV_VAR_HOME "HOME"
diff --git a/src/include/radixsort.h b/src/include/radixsort.h
index a9196df..8be8172 100644
--- a/src/include/radixsort.h
+++ b/src/include/radixsort.h
@@ -10,6 +10,13 @@
 #ifndef RADIXSORT_H_
 #define RADIXSORT_H_
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+#include <string.h>
+#include <stddef.h>
+#include "hstr_utils.h"
+
 #define SLOT_SIZE 1000
 
 typedef struct radixitem {
diff --git a/src/radixsort.c b/src/radixsort.c
index e5cee2a..78f6554 100644
--- a/src/radixsort.c
+++ b/src/radixsort.c
@@ -8,12 +8,6 @@
 */
 
 #include "include/radixsort.h"
-#include "include/hstr_utils.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include <string.h>
-#include <stddef.h>
 
 #define GET_TOP_INDEX(KEY) KEY/SLOT_SIZE
 #define GET_LOW_INDEX(KEY) KEY%SLOT_SIZE