4 files changed, 5 insertions, 6 deletions
diff --git a/src/libstate/global_state.cpp b/src/libstate/global_state.cpp
index 2b9162f12..34bcd03fc 100644
--- a/src/libstate/global_state.cpp
+++ b/src/libstate/global_state.cpp
@@ -83,7 +83,7 @@ Library_State* swap_global_state(Library_State* new_state)
 */
 bool global_state_exists()
    {
-   return (global_lib_state);
+   return (global_lib_state != 0);
    }
 
 }
diff --git a/src/libstate/lookup.cpp b/src/libstate/lookup.cpp
index f5d2c5a0c..24a46e3e9 100644
--- a/src/libstate/lookup.cpp
+++ b/src/libstate/lookup.cpp
@@ -32,7 +32,7 @@ bool have_algorithm(const std::string& name)
 /*
 * Query the block size of a cipher or hash
 */
-u32bit block_size_of(const std::string& name)
+size_t block_size_of(const std::string& name)
    {
    Algorithm_Factory& af = global_state().algorithm_factory();
 
@@ -48,7 +48,7 @@ u32bit block_size_of(const std::string& name)
 /*
 * Query the output_length() of a hash or MAC
 */
-u32bit output_length_of(const std::string& name)
+size_t output_length_of(const std::string& name)
    {
    Algorithm_Factory& af = global_state().algorithm_factory();
 
diff --git a/src/libstate/lookup.h b/src/libstate/lookup.h
index f1e1a52ca..02c1708aa 100644
--- a/src/libstate/lookup.h
+++ b/src/libstate/lookup.h
@@ -288,7 +288,7 @@ inline bool have_mac(const std::string& algo_spec)
 * @param algo_spec the name of the algorithm
 * @return block size of the specified algorithm
 */
-BOTAN_DLL u32bit block_size_of(const std::string& algo_spec);
+BOTAN_DLL size_t block_size_of(const std::string& algo_spec);
 
 /**
 * Find out the output length of a certain symmetric algorithm.
@@ -297,7 +297,7 @@ BOTAN_DLL u32bit block_size_of(const std::string& algo_spec);
 * @param algo_spec the name of the algorithm
 * @return output length of the specified algorithm
 */
-BOTAN_DLL u32bit output_length_of(const std::string& algo_spec);
+BOTAN_DLL size_t output_length_of(const std::string& algo_spec);
 
 }
 
diff --git a/src/libstate/scan_name.h b/src/libstate/scan_name.h
index 0d30dc44c..3e1728f29 100644
--- a/src/libstate/scan_name.h
+++ b/src/libstate/scan_name.h
@@ -11,7 +11,6 @@
 #include <botan/types.h>
 #include <string>
 #include <vector>
-#include <set>
 
 namespace Botan {