diff --git a/archival/libunarchive/decompress_bunzip2.c b/archival/libunarchive/decompress_bunzip2.c
index 88d88b85f..3d07d9e03 100644
--- a/archival/libunarchive/decompress_bunzip2.c
+++ b/archival/libunarchive/decompress_bunzip2.c
@@ -24,7 +24,7 @@
 	I would ask that anyone benefiting from this work, especially those
 	using it in commercial products, consider making a donation to my local
 	non-profit hospice organization (www.hospiceacadiana.com) in the name of
-   	the woman I loved, Toni W. Hagan, who passed away Feb. 12, 2003.
+	the woman I loved, Toni W. Hagan, who passed away Feb. 12, 2003.
 
 	Manuel
  */
@@ -38,6 +38,8 @@
 
 #include "libbb.h"
 
+#include "unarchive.h"
+
 /* Constants for Huffman coding */
 #define MAX_GROUPS			6
 #define GROUP_SIZE			50		/* 64 would have been more efficient */
diff --git a/archival/libunarchive/decompress_unlzma.c b/archival/libunarchive/decompress_unlzma.c
index 9c53e0a56..7ae343f0f 100644
--- a/archival/libunarchive/decompress_unlzma.c
+++ b/archival/libunarchive/decompress_unlzma.c
@@ -27,6 +27,8 @@
 
 #include "libbb.h"
 
+#include "unarchive.h"
+
 #include "rangecoder.h"
 
 
diff --git a/archival/libunarchive/open_transformer.c b/archival/libunarchive/open_transformer.c
index 0d362a5ab..c1a0aad4d 100644
--- a/archival/libunarchive/open_transformer.c
+++ b/archival/libunarchive/open_transformer.c
@@ -1,17 +1,5 @@
 /*
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <stdlib.h>
@@ -19,6 +7,8 @@
 
 #include "libbb.h"
 
+#include "unarchive.h"
+
 /* transformer(), more than meets the eye */
 int open_transformer(int src_fd, int (*transformer)(int src_fd, int dst_fd))
 {