diff --git a/liblrzip.h b/liblrzip.h
index 342149b..659ad5d 100644
--- a/liblrzip.h
+++ b/liblrzip.h
@@ -17,7 +17,7 @@
    along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(LIBLRZIP_H) && !defined(MAIN_C)
+#ifndef LIBLRZIP_H
 #define LIBLRZIP_H
 
 #define FLAG_VERBOSE (FLAG_VERBOSITY | FLAG_VERBOSITY_MAX)
diff --git a/main.c b/main.c
index de93ea2..f660081 100644
--- a/main.c
+++ b/main.c
@@ -17,7 +17,6 @@
    along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 /* lrzip compression - main program */
-#define MAIN_C
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/runzip.c b/runzip.c
index 30b3350..9988f31 100644
--- a/runzip.c
+++ b/runzip.c
@@ -26,6 +26,7 @@
 #include "runzip.h"
 #include "stream.h"
 #include "util.h"
+#include "liblrzip.h"
 
 static inline uchar read_u8(rzip_control *control, void *ss, int stream)
 {
diff --git a/rzip.c b/rzip.c
index 346e78c..6aa098f 100644
--- a/rzip.c
+++ b/rzip.c
@@ -27,6 +27,7 @@
 #include "rzip.h"
 #include "stream.h"
 #include "util.h"
+#include "liblrzip.h"
 
 #define CHUNK_MULTIPLE (100 * 1024 * 1024)
 #define CKSUM_CHUNK 1024*1024
diff --git a/rzip.h b/rzip.h
index cf07e37..5c8013e 100644
--- a/rzip.h
+++ b/rzip.h
@@ -20,7 +20,6 @@
 #ifndef RZIP_H
 #define RZIP_H
 #include "lrzip.h" /* includes config.h */
-#include "liblrzip.h"
 #include "md5.h"
 
 #include <sys/types.h>
diff --git a/stream.c b/stream.c
index 4f53579..7dda7df 100644
--- a/stream.c
+++ b/stream.c
@@ -26,6 +26,7 @@
 #include "rzip.h"
 #include "util.h"
 #include "zpipe.h"
+#include "liblrzip.h"
 
 #define STREAM_BUFSIZE (1024 * 1024 * 10)