diff --git a/include/libssh/crc32.h b/include/libssh/crc32.h
new file mode 100644
index 00000000..f27a2d52
--- /dev/null
+++ b/include/libssh/crc32.h
@@ -0,0 +1,29 @@
+/*
+ * crc32.c - simple CRC32 code
+ *
+ * This file is part of the SSH Library
+ *
+ * Copyright (c) 2005 by Aris Adamantiadis
+ *
+ * The SSH Library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * The SSH Library 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 Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with the SSH Library; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA 02111-1307, USA.
+ */
+
+#ifndef _CRC32_H
+#define _CRC32_H
+
+uint32_t ssh_crc32(const char *buf, uint32_t len);
+
+#endif /* _CRC32_H */
diff --git a/include/libssh/priv.h b/include/libssh/priv.h
index c267f3de..bd457579 100644
--- a/include/libssh/priv.h
+++ b/include/libssh/priv.h
@@ -217,10 +217,6 @@ unsigned char *bin_to_base64(const unsigned char *source, int len);
 int compress_buffer(ssh_session session,ssh_buffer buf);
 int decompress_buffer(ssh_session session,ssh_buffer buf, size_t maxlen);
 
-/* crc32.c */
-uint32_t ssh_crc32(const char *buf, uint32_t len);
-
-
 /* match.c */
 int match_hostname(const char *host, const char *pattern, unsigned int len);
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 11e81d66..1504b76d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -82,7 +82,6 @@ set(libssh_SRCS
   client.c
   config.c
   connect.c
-  crc32.c
   crypt.c
   dh.c
   ecdh.c
@@ -144,6 +143,7 @@ if (WITH_SSH1)
     ${libssh_SRCS}
     auth1.c
     channels1.c
+    crc32.c
     kex1.c
     packet1.c
   )
diff --git a/src/crc32.c b/src/crc32.c
index 94d3020c..cb4e931d 100644
--- a/src/crc32.c
+++ b/src/crc32.c
@@ -21,7 +21,10 @@
  * MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include "libssh/priv.h"
+#include "libssh/crc32.h"
 
 static uint32_t crc_table[] = {
   0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
diff --git a/src/packet1.c b/src/packet1.c
index ddc64a3b..03f27458 100644
--- a/src/packet1.c
+++ b/src/packet1.c
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "libssh/priv.h"
 #include "libssh/ssh1.h"
+#include "libssh/crc32.h"
 #include "libssh/packet.h"
 #include "libssh/session.h"
 #include "libssh/buffer.h"