Merged with trond's header file cleanup branch.

diff --cc libmemcached/Makefile.am
index f192eda45b5d6f035cbb5d5ba0ebf33b7cb7c6ac,044276a0c0d76b32299b9480ff4e88ab9b0b1310..21f00870d67d03d116417ce9e34f34b23e614ebb
--- 1/libmemcached/Makefile.am
--- 2/libmemcached/Makefile.am
+++ b/libmemcached/Makefile.am
@@@ -11,18 -11,28 +11,29 @@@ noinst_HEADERS = libmemcached_probes.h 
                   memcached/protocol_binary.h
  
  pkginclude_HEADERS= memcached.h \
 -                    memcached.hpp \
 +                  memcached.hpp \
 +                  exception.hpp \
+                     memcached_allocators.h \
+                     memcached_arithmetic.h \
+                     memcached_behavior.h \
+                     memcached_callback.h \
                      memcached_configure.h \
-                   memcached_constants.h \
-                   memcached_get.h \
-                   memcached_result.h \
-                   memcached_server.h \
-                   memcached_storage.h \
-                   memcached_string.h \
-                   memcached_types.h \
-                   memcached_watchpoint.h \
-                   visibility.h
+                     memcached_constants.h \
+                     memcached_delete.h \
+                     memcached_dump.h \
+                     memcached_flush.h \
+                     memcached_flush_buffers.h \
+                     memcached_get.h \
+                     memcached_hash.h \
+                     memcached_result.h \
+                     memcached_server.h \
+                     memcached_st.h \
+                     memcached_stats.h \
+                     memcached_storage.h \
+                     memcached_string.h \
+                     memcached_types.h \
+                     memcached_watchpoint.h \
+                     visibility.h
  
  
  if BUILD_LIBMEMCACHEDUTIL

diff --cc libmemcached/memcached.hpp
index a101da349073ce4910bdecacef4ed7188eb6c1b6,23f6ea5b45579a773f5fdb20a06faec4c1471e41..76854e33932965f11c236034ccf50349b943285e
--- 1/libmemcached/memcached.hpp
--- 2/libmemcached/memcached.hpp
+++ b/libmemcached/memcached.hpp
@@@ -12,11 -12,10 +12,11 @@@
   * @brief Libmemcached C++ interface
   */
  
- #ifndef LIBMEMCACHEDPP_H
- #define LIBMEMCACHEDPP_H
+ #ifndef LIBMEMCACHED_MEMCACHED_HPP
+ #define LIBMEMCACHED_MEMCACHED_HPP
  
  #include <libmemcached/memcached.h>
 +#include <libmemcached/exception.hpp>
  
  #include <string.h>
  

diff --cc tests/plus.cpp
Simple merge