diff --git a/op25/gr-op25/lib/crypto.cc b/op25/gr-op25/lib/crypto.cc
index 2d528bb..c67770c 100644
--- a/op25/gr-op25/lib/crypto.cc
+++ b/op25/gr-op25/lib/crypto.cc
@@ -3,6 +3,8 @@
 #include <sstream>
 #include <boost/format.hpp>
 #include <iostream>
+#include <stdio.h>
+#include <memory.h>
 
 extern "C" {
 #include "des.h"
@@ -182,7 +184,7 @@ public:
 		generate(3 * 8);	// Use remaining 3 bytes for LC
 	}
 
-	unsigned long long generate(size_t count)	// 1..64
+	uint64_t generate(size_t count)	// 1..64
 	{
 		unsigned long long ullCurrent = swap_bytes(m_ks);
 		const int max_len = 64;
diff --git a/op25/gr-op25/lib/crypto.h b/op25/gr-op25/lib/crypto.h
index 3180f5b..75785b6 100644
--- a/op25/gr-op25/lib/crypto.h
+++ b/op25/gr-op25/lib/crypto.h
@@ -1,6 +1,7 @@
 #ifndef INCLUDED_CRYPTO_H
 #define INCLUDED_CRYPTO_H
 
+#include <stdint.h>
 #include <vector>
 #include <map>
 #include <boost/shared_ptr.hpp>
diff --git a/op25/gr-op25/lib/crypto_module_du_handler.cc b/op25/gr-op25/lib/crypto_module_du_handler.cc
index 90ac06c..b8baf0c 100644
--- a/op25/gr-op25/lib/crypto_module_du_handler.cc
+++ b/op25/gr-op25/lib/crypto_module_du_handler.cc
@@ -4,6 +4,7 @@
 
 #include <boost/format.hpp>
 #include <sstream>
+#include <stdio.h>
 
 crypto_module_du_handler::crypto_module_du_handler(data_unit_handler_sptr next, crypto_module::sptr crypto_mod)
 	: data_unit_handler(next)
diff --git a/op25/gr-op25/lib/hdu.cc b/op25/gr-op25/lib/hdu.cc
index dc6902c..ae89dc1 100644
--- a/op25/gr-op25/lib/hdu.cc
+++ b/op25/gr-op25/lib/hdu.cc
@@ -29,6 +29,7 @@
 #include <iomanip>
 #include <sstream>
 #include <boost/format.hpp>
+#include <stdio.h>
 
 using namespace std;
 
diff --git a/op25/gr-op25/lib/ldu.cc b/op25/gr-op25/lib/ldu.cc
index e400858..40e6870 100644
--- a/op25/gr-op25/lib/ldu.cc
+++ b/op25/gr-op25/lib/ldu.cc
@@ -1,5 +1,7 @@
 #include "ldu.h"
 
+#include <stdio.h>
+
 #include <itpp/base/vec.h>
 #include <itpp/base/mat.h>
 #include <itpp/base/binary.h>
diff --git a/op25/gr-op25/lib/voice_data_unit.cc b/op25/gr-op25/lib/voice_data_unit.cc
index 7bdfa60..56462b3 100644
--- a/op25/gr-op25/lib/voice_data_unit.cc
+++ b/op25/gr-op25/lib/voice_data_unit.cc
@@ -27,6 +27,7 @@
 #include <map>
 #include <iostream>
 #include <boost/format.hpp>
+#include <stdio.h>
 
 #include <itpp/base/vec.h>
 #include <itpp/base/mat.h>