More layout updates

CMakeLists.txt

@@ -38,7 +38,6 @@ endif()
 
 add_subdirectory(booster)
 include_directories(booster)
-include_directories(cppcms)
 include_directories(src)
 include_directories(private)
 
@@ -395,14 +394,14 @@ set(CPPCMS_SOURCES
 if(DISABLE_ICU_LOCALIZATION)
 
 	set(CPPCMS_SOURCES ${CPPCMS_SOURCES}
-		noicu/locale_src_conversion.cpp
-		noicu/locale_src_format.cpp
-		noicu/locale_src_formatting.cpp
-		noicu/locale_src_generator.cpp
-		noicu/locale_src_info.cpp
-		noicu/locale_src_message.cpp
-		noicu/locale_src_mo_lambda.cpp
-		noicu/locale_src_numeric.cpp)
+		noicu/src/locale_src_conversion.cpp
+		noicu/src/locale_src_format.cpp
+		noicu/src/locale_src_formatting.cpp
+		noicu/src/locale_src_generator.cpp
+		noicu/src/locale_src_info.cpp
+		noicu/src/locale_src_message.cpp
+		noicu/src/locale_src_mo_lambda.cpp
+		noicu/src/locale_src_numeric.cpp)
 
 	set(CPPCMS_PUBLIC_HEADERS ${CPPCMS_PUBLIC_HEADERS}
 		noicu/locale_conversion.h

private/application.h → cppcms/application.h

@@ -19,7 +19,7 @@
 #ifndef CPPCMS_APPLICATION_H
 #define CPPCMS_APPLICATION_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <booster/noncopyable.h>
 #include <booster/hold_ptr.h>
 #include <booster/atomic_counter.h>

private/applications_pool.h → cppcms/applications_pool.h

@@ -19,7 +19,7 @@
 #ifndef CPPCMS_APPLICATIONS_POOL_H
 #define CPPCMS_APPLICATIONS_POOL_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <booster/noncopyable.h>
 #include <booster/hold_ptr.h>
 #include <booster/intrusive_ptr.h>

cppcms/base64.h

@@ -19,7 +19,7 @@
 #ifndef CPPCMS_BASE64_H
 #define CPPCMS_BASE64_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <string>
 
 

cppcms/base_content.h

@@ -19,7 +19,7 @@
 #ifndef CPPCMS_BASE_CONTENT_H
 #define CPPCMS_BASE_CONTENT_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 
 namespace cppcms {
 	///

cppcms/base_view.h

@@ -19,7 +19,7 @@
 #ifndef CPPCMS_BASE_VIEW_H
 #define CPPCMS_BASE_VIEW_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 
 #include <ostream>
 #include <sstream>
@@ -29,9 +29,9 @@
 #include <memory>
 
 #include <booster/hold_ptr.h>
-#include "base_content.h"
+#include <cppcms/base_content.h>
 #include <booster/noncopyable.h>
-#include "config.h"
+#include <cppcms/config.h>
 
 namespace cppcms {
 

cppcms/cache_interface.h

@@ -22,11 +22,11 @@
 #include <string>
 #include <set>
 
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <booster/noncopyable.h>
 #include <booster/intrusive_ptr.h>
 #include <booster/hold_ptr.h>
-#include "cstdint.h"
+#include <cppcms/cstdint.h>
 
 namespace cppcms {
 

cppcms/cache_pool.h

@@ -19,7 +19,7 @@
 #ifndef CPPCMS_CACHE_POOL_H
 #define CPPCMS_CACHE_POOL_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <booster/noncopyable.h>
 #include <booster/intrusive_ptr.h>
 #include <booster/hold_ptr.h>

cppcms/cppcms_error.h

@@ -19,7 +19,7 @@
 #ifndef CPPCMS_ERROR_H
 #define CPPCMS_ERROR_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <string>
 #include <stdexcept>
 

cppcms/cstdint.h

@@ -18,7 +18,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 #ifndef CPPCMS_CSTDINT_H
 #define CPPCMS_CSTDINT_H
-#include "config.h"
+#include <cppcms/config.h>
 #if defined(HAVE_STDINT_H)
 #include <stdint.h>
 #elif defined(HAVE_INTTYPES_H)

cppcms/encoding.h

@@ -22,8 +22,8 @@
 #include <string>
 #include <map>
 #include <locale>
-#include "defs.h"
-#include "config.h"
+#include <cppcms/defs.h>
+#include <cppcms/config.h>
 
 namespace cppcms {
 	///

cppcms/filters.h

@@ -24,9 +24,9 @@
 #include <sstream>
 #include <vector>
 #include <iostream>
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <booster/copy_ptr.h>
-#include "localization.h"
+#include <cppcms/localization.h>
 
 namespace cppcms {
 	namespace filters {

cppcms/form.h

@@ -19,7 +19,7 @@
 #ifndef CPPCMS_FORM_H
 #define CPPCMS_FORM_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <booster/noncopyable.h>
 
 #include <string>
@@ -30,14 +30,14 @@
 #include <stack>
 #include <ostream>
 #include <sstream>
-#include "http_context.h"
-#include "http_request.h"
-#include "http_response.h"
+#include <cppcms/http_context.h>
+#include <cppcms/http_request.h>
+#include <cppcms/http_response.h>
 #include <booster/copy_ptr.h>
 #include <booster/perl_regex.h>
-#include "cppcms_error.h"
-#include "util.h"
-#include "localization.h"
+#include <cppcms/cppcms_error.h>
+#include <cppcms/util.h>
+#include <cppcms/localization.h>
 
 namespace cppcms {
 

cppcms/http_client.h

@@ -19,7 +19,7 @@
 #ifndef CPPCMS_HTTP_CLIENT_H
 #define CPPCMS_HTTP_CLIENT_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <booster/noncopyable.h>
 
 namespace cppcms {

cppcms/http_context.h

@@ -19,7 +19,7 @@
 #ifndef CPPCMS_HTTP_CONTEXT_H
 #define CPPCMS_HTTP_CONTEXT_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <booster/hold_ptr.h>
 #include <booster/intrusive_ptr.h>
 #include <booster/shared_ptr.h>

cppcms/http_cookie.h

@@ -19,12 +19,12 @@
 #ifndef CPPCMS_HTTP_COOKIE_H
 #define CPPCMS_HTTP_COOKIE_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <booster/copy_ptr.h>
 
 #include <string>
 #include <iostream>
-#include "cstdint.h"
+#include <cppcms/cstdint.h>
 namespace cppcms { namespace http {
 
 class cookie;

cppcms/http_file.h

@@ -19,7 +19,7 @@
 #ifndef CPPCMS_HTTP_FILE_H
 #define CPPCMS_HTTP_FILE_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <booster/hold_ptr.h>
 #include <booster/noncopyable.h>
 #include <sstream>

cppcms/http_request.h

@@ -19,7 +19,7 @@
 #ifndef CPPCMS_HTTP_REQUEST_H
 #define CPPCMS_HTTP_REQUEST_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <booster/noncopyable.h>
 #include <booster/hold_ptr.h>
 

cppcms/http_response.h

@@ -19,13 +19,13 @@
 #ifndef CPPCMS_HTTP_RESPONSE_H
 #define CPPCMS_HTTP_RESPONSE_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <booster/noncopyable.h>
 #include <booster/hold_ptr.h>
 
 #include <string>
 #include <iostream>
-#include "cstdint.h"
+#include <cppcms/cstdint.h>
 
 namespace cppcms {
 class cache_interface;

cppcms/json.h

@@ -19,7 +19,7 @@
 #ifndef CPPCMS_JSON_H
 #define CPPCMS_JSON_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <booster/copy_ptr.h>
 
 #include <vector>

cppcms/locale_fwd.h

@@ -1,7 +1,7 @@
 #ifndef CPPCMS_LOCALE_FWD_H
 #define CPPCMS_LOCALE_FWD_H
 
-#include "config.h"
+#include <cppcms/config.h>
 
 #ifdef HAVE_ICU
 	namespace booster {

cppcms/localization.h

@@ -1,7 +1,7 @@
 #ifndef CPPCMS_LOCALIZATION_H
 #define CPPCMS_LOCALIZATION_H
 
-#include "config.h"
+#include <cppcms/config.h>
 
 #ifdef HAVE_ICU
 #	include <booster/locale.h>
@@ -10,7 +10,7 @@
 		namespace locale = ::booster::locale;
 	}
 #else
-#	include "noicu_localization.h"
+#	include <cppcms/noicu_localization.h>
 #endif
 
 

cppcms/logger.h

@@ -19,7 +19,7 @@
 #ifndef CPPCMS_LOGGER_H
 #define CPPCMS_LOGGER_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <iosfwd>
 #include <memory>
 

cppcms/rpc_json.h

@@ -19,10 +19,10 @@
 #ifndef CPPCMS_RPC_JSON_OBJECT_H
 #define CPPCMS_RPC_JSON_OBJECT_H
 
-#include "application.h"
+#include <cppcms/application.h>
 #include <booster/function.h>
-#include "json.h"
-#include "cppcms_error.h"
+#include <cppcms/json.h>
+#include <cppcms/cppcms_error.h>
 
 namespace cppcms {
 namespace rpc {

cppcms/service.h

@@ -19,13 +19,13 @@
 #ifndef CPPCMS_SERVICE_H
 #define CPPCMS_SERVICE_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <booster/noncopyable.h>
 #include <booster/hold_ptr.h>
 #include <booster/function.h>
 #include <locale>
 
-#include "locale_fwd.h"
+#include <cppcms/locale_fwd.h>
 
 namespace booster {
 	namespace aio {

cppcms/session_api.h

@@ -19,7 +19,7 @@
 #ifndef CPPCMS_SESSION_API_H
 #define CPPCMS_SESSION_API_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <booster/noncopyable.h>
 #include <booster/shared_ptr.h>
 #include <string>

cppcms/session_cookies.h

@@ -18,7 +18,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 #ifndef CPPCMS_SESSION_COOKIES_H
 #define CPPCMS_SESSION_COOKIES_H
-#include "session_api.h"
+#include <cppcms/session_api.h>
 #include <booster/hold_ptr.h>
 #include <booster/noncopyable.h>
 #include <memory>

cppcms/session_dual.h

@@ -19,8 +19,8 @@
 #ifndef CPPCMS_SESSION_DUAL_H
 #define CPPCMS_SESSION_DUAL_H
 
-#include "session_api.h"
-#include "defs.h"
+#include <cppcms/session_api.h>
+#include <cppcms/defs.h>
 #include <booster/hold_ptr.h>
 #include <booster/shared_ptr.h>
 #include <memory>

cppcms/session_interface.h

@@ -19,11 +19,11 @@
 #ifndef CPPCMS_SESSION_INTERFACE_H
 #define CPPCMS_SESSION_INTERFACE_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <booster/noncopyable.h>
 #include <booster/hold_ptr.h>
 #include <booster/shared_ptr.h>
-#include "cstdint.h"
+#include <cppcms/cstdint.h>
 #include <string>
 #include <map>
 #include <memory>

cppcms/session_pool.h

@@ -19,10 +19,10 @@
 #ifndef CPPCMS_SESSION_POOL_H
 #define CPPCMS_SESSION_POOL_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <booster/shared_ptr.h>
 #include <booster/hold_ptr.h>
-#include "session_api.h"
+#include <cppcms/session_api.h>
 
 #include <memory>
 

cppcms/session_sid.h

@@ -19,11 +19,11 @@
 #ifndef CPPCMS_SESSION_SID_H
 #define CPPCMS_SESSION_SID_H
 
-#include "session_api.h"
-#include "defs.h"
+#include <cppcms/session_api.h>
+#include <cppcms/defs.h>
 #include <booster/hold_ptr.h>
 #include <booster/shared_ptr.h>
-#include "session_storage.h"
+#include <cppcms/session_storage.h>
 
 namespace cppcms {
 namespace sessions {

cppcms/session_storage.h

@@ -19,7 +19,7 @@
 #ifndef CPPCMS_SESSION_STORAGE_H
 #define CPPCMS_SESSION_STORAGE_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <booster/noncopyable.h>
 #include <booster/shared_ptr.h>
 #include <string>

cppcms/thread_pool.h

@@ -19,7 +19,7 @@
 #ifndef CPPCMS_THREAD_POOL_H
 #define CPPCMS_THREAD_POOL_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <booster/noncopyable.h>
 #include <booster/function.h>
 #include <booster/hold_ptr.h>

cppcms/urandom.h

@@ -19,7 +19,7 @@
 #ifndef CPPCMS_URANDOM_H
 #define CPPCMS_URANDOM_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <booster/hold_ptr.h>
 #include <booster/noncopyable.h>
 

cppcms/url_dispatcher.h

@@ -20,10 +20,10 @@
 #define CPPCMS_URL_DISPATCHER_H
 
 #include <booster/noncopyable.h>
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <booster/function.h>
 #include <booster/hold_ptr.h>
-#include "mem_bind.h"
+#include <cppcms/mem_bind.h>
 #include <string>
 #include <list>
 

cppcms/util.h

@@ -19,7 +19,7 @@
 #ifndef CPPCMS_UTIL_H
 #define CPPCMS_UTIL_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <string>
 
 namespace cppcms {

cppcms/view.h

@@ -18,9 +18,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 #ifndef CPPCMS_VIEW_H
 #define CPPCMS_VIEW_H
-#include "form.h"
-#include "filters.h"
-#include "base_view.h"
-#include "views_pool.h"
+#include <cppcms/form.h>
+#include <cppcms/filters.h>
+#include <cppcms/base_view.h>
+#include <cppcms/views_pool.h>
 #endif
 

cppcms/views_pool.h

@@ -19,9 +19,9 @@
 #ifndef CPPCMS_VIEWS_POOL_H
 #define CPPCMS_VIEWS_POOL_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <booster/noncopyable.h>
-#include "base_view.h"
+#include <cppcms/base_view.h>
 
 #include <memory>
 #include <map>

noicu/locale_conversion.h → noicu/cppcms/locale_conversion.h

@@ -8,8 +8,8 @@
 #ifndef CPPCMS_LOCALE_CONVERTER_HPP_INCLUDED
 #define CPPCMS_LOCALE_CONVERTER_HPP_INCLUDED
 
-#include "defs.h"
-#include "config.h"
+#include <cppcms/defs.h>
+#include <cppcms/config.h>
 #include <locale>
 
 namespace cppcms {

noicu/locale_format.h → noicu/cppcms/locale_format.h

@@ -8,10 +8,10 @@
 #ifndef CPPCMS_LOCALE_FORMAT_HPP_INCLUDED
 #define CPPCMS_LOCALE_FORMAT_HPP_INCLUDED
 
-#include "defs.h"
-#include "config.h"
-#include "locale_message.h"
-#include "locale_formatting.h"
+#include <cppcms/defs.h>
+#include <cppcms/config.h>
+#include <cppcms/locale_message.h>
+#include <cppcms/locale_formatting.h>
 
 #include <sstream>
 #include <iostream>

noicu/locale_formatting.h → noicu/cppcms/locale_formatting.h

@@ -8,9 +8,9 @@
 #ifndef CPPCMS_LOCALE_FORMATTING_HPP_INCLUDED
 #define CPPCMS_LOCALE_FORMATTING_HPP_INCLUDED
 
-#include "defs.h"
-#include "config.h"
-#include "cstdint.h"
+#include <cppcms/defs.h>
+#include <cppcms/config.h>
+#include <cppcms/cstdint.h>
 #include <ostream>
 #include <istream>
 #include <string>

noicu/locale_generator.h → noicu/cppcms/locale_generator.h

@@ -7,8 +7,8 @@
 //
 #ifndef CPPCMS_LOCALE_GENERATOR_HPP
 #define CPPCMS_LOCALE_GENERATOR_HPP
-#include "defs.h"
-#include "config.h"
+#include <cppcms/defs.h>
+#include <cppcms/config.h>
 #include <string>
 #include <locale>
 #include <memory>

noicu/locale_info.h → noicu/cppcms/locale_info.h

@@ -11,8 +11,8 @@
 #include <string>
 #include <map>
 #include <memory>
-#include "defs.h"
-#include "config.h"
+#include <cppcms/defs.h>
+#include <cppcms/config.h>
 
 namespace cppcms {
     namespace locale {

noicu/locale_message.h → noicu/cppcms/locale_message.h

@@ -8,14 +8,14 @@
 #ifndef CPPCMS_LOCALE_MESSAGE_HPP_INCLUDED
 #define CPPCMS_LOCALE_MESSAGE_HPP_INCLUDED
 
-#include "defs.h"
-#include "config.h"
+#include <cppcms/defs.h>
+#include <cppcms/config.h>
 #include <locale>
 #include <string>
 #include <vector>
 #include <set>
 #include <memory>
-#include "locale_formatting.h"
+#include <cppcms/locale_formatting.h>
 
 namespace cppcms {
     namespace locale {

noicu/locale_numeric.h → noicu/cppcms/locale_numeric.h

@@ -12,7 +12,7 @@
 #include <string>
 #include <ios>
 #include <limits>
-#include "locale_formatting.h"
+#include <cppcms/locale_formatting.h>
 #include <algorithm>
 
 namespace cppcms {

noicu/noicu_localization.h → noicu/cppcms/noicu_localization.h

@@ -8,13 +8,13 @@
 #ifndef CPPCMS_NOICU_LOCALIZATION_HPP_INCLUDED
 #define CPPCMS_NOICU_LOCALIZATION_HPP_INCLUDED
 
-#include "locale_format.h"
-#include "locale_formatting.h"
-#include "locale_generator.h"
-#include "locale_info.h"
-#include "locale_message.h"
-#include "locale_numeric.h"
-#include "locale_conversion.h"
+#include <cppcms/locale_format.h>
+#include <cppcms/locale_formatting.h>
+#include <cppcms/locale_generator.h>
+#include <cppcms/locale_info.h>
+#include <cppcms/locale_message.h>
+#include <cppcms/locale_numeric.h>
+#include <cppcms/locale_conversion.h>
 
 #endif
 

noicu/locale_src_conversion.cpp → noicu/src/locale_src_conversion.cpp

@@ -6,10 +6,10 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
 #define CPPCMS_LOCALE_SOURCE
-#include "locale_conversion.h"
-#include "locale_info.h"
+#include <cppcms/locale_conversion.h>
+#include <cppcms/locale_info.h>
 #include "utf_iterator.h"
-#include "config.h"
+#include <cppcms/config.h>
 namespace cppcms {
 namespace locale {
 namespace impl{

noicu/locale_src_format.cpp → noicu/src/locale_src_format.cpp

@@ -6,9 +6,9 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
 #define CPPCMS_LOCALE_SOURCE
-#include "locale_format.h"
-#include "locale_generator.h"
-#include "locale_info.h"
+#include <cppcms/locale_format.h>
+#include <cppcms/locale_generator.h>
+#include <cppcms/locale_info.h>
 #include <limits>
 #include "locale_src_formatting_info.hpp"
 #include <stdlib.h>

noicu/locale_src_formatting.cpp → noicu/src/locale_src_formatting.cpp

@@ -6,7 +6,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
 #define CPPCMS_LOCALE_SOURCE
-#include "locale_formatting.h"
+#include <cppcms/locale_formatting.h>
 #include <typeinfo>
 #include "locale_src_formatting_info.hpp"
 #include "locale_src_ios_prop.hpp"

noicu/locale_src_formatting_info.hpp → noicu/src/locale_src_formatting_info.hpp

@@ -9,15 +9,15 @@
 #define CPPCMS_SRC_LOCALE_FORMATTING_INFO_HPP_INCLUDED
 
 
-#include "config.h"
+#include <cppcms/config.h>
 #ifdef CPPCMS_USE_EXTERNAL_BOOST
 #   include <boost/config.hpp>
 #else // Internal Boost
 #   include <cppcms_boost/config.hpp>
     namespace boost = cppcms_boost;
 #endif
-#include "locale_formatting.h"
-#include "cstdint.h"
+#include <cppcms/locale_formatting.h>
+#include <cppcms/cstdint.h>
 #include <string>
 #include <ios>
 

noicu/locale_src_generator.cpp → noicu/src/locale_src_generator.cpp

@@ -6,10 +6,10 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
 #define CPPCMS_LOCALE_SOURCE
-#include "locale_generator.h"
-#include "locale_numeric.h"
-#include "locale_info.h"
-#include "locale_message.h"
+#include <cppcms/locale_generator.h>
+#include <cppcms/locale_numeric.h>
+#include <cppcms/locale_info.h>
+#include <cppcms/locale_message.h>
 #include <booster/regex.h>
 
 #include <iostream>

noicu/locale_src_info.cpp → noicu/src/locale_src_info.cpp

@@ -6,8 +6,8 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
 #define CPPCMS_LOCALE_SOURCE
-#include "locale_info.h"
-#include "locale_conversion.h"
+#include <cppcms/locale_info.h>
+#include <cppcms/locale_conversion.h>
 #include "locale_src_info_impl.hpp"
 
 namespace cppcms {

noicu/locale_src_message.cpp → noicu/src/locale_src_message.cpp

@@ -6,15 +6,15 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
 #define CPPCMS_LOCALE_SOURCE
-#include "config.h"
+#include <cppcms/config.h>
 #ifdef CPPCMS_USE_EXTERNAL_BOOST
 #   include <boost/config.hpp>
 #else // Internal Boost
 #   include <cppcms_boost/config.hpp>
     namespace boost = cppcms_boost;
 #endif
-#include "locale_info.h"
-#include "locale_message.h"
+#include <cppcms/locale_info.h>
+#include <cppcms/locale_message.h>
 #ifdef CPPCMS_USE_EXTERNAL_BOOST
 #   include <boost/shared_ptr.hpp>
 #   include <boost/unordered_map.hpp>

noicu/locale_src_numeric.cpp → noicu/src/locale_src_numeric.cpp

@@ -6,7 +6,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
 #define CPPCMS_LOCALE_SOURCE
-#include "locale_numeric.h"
+#include <cppcms/locale_numeric.h>
 #include <booster/regex.h>
 
 namespace cppcms {

noicu/locale_src_test_convert.cpp → noicu/src/locale_src_test_convert.cpp

@@ -6,9 +6,9 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include "locale_conversion.h"
-#include "locale_generator.h"
-#include "locale_info.h"
+#include <cppcms/locale_conversion.h>
+#include <cppcms/locale_generator.h>
+#include <cppcms/locale_info.h>
 #include <iomanip>
 #include "locale_src_test_locale.hpp"
 

noicu/locale_src_test_formatting.cpp → noicu/src/locale_src_test_formatting.cpp

@@ -6,15 +6,15 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include "locale_formatting.h"
-#include "locale_format.h"
-#include "locale_generator.h"
+#include <cppcms/locale_formatting.h>
+#include <cppcms/locale_format.h>
+#include <cppcms/locale_generator.h>
 #include "locale_src_test_locale.hpp"
 #include "locale_src_test_locale_tools.hpp"
 #include <sstream>
 #include <iostream>
 #include <iomanip>
-#include "encoding.h"
+#include <cppcms/encoding.h>
 
 using namespace cppcms::locale;
 

noicu/locale_src_test_message.cpp → noicu/src/locale_src_test_message.cpp

@@ -6,8 +6,8 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include "locale_generator.h"
-#include "locale_message.h"
+#include <cppcms/locale_generator.h>
+#include <cppcms/locale_message.h>
 #include "locale_src_test_locale.hpp"
 #include "locale_src_test_locale_tools.hpp"
 

private/base_cache.h

@@ -21,9 +21,9 @@
 
 #include <string>
 #include <set>
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <booster/intrusive_ptr.h>
-#include "cstdint.h"
+#include <cppcms/cstdint.h>
 
 namespace cppcms {
 	namespace impl {

private/base_encryptor.h

@@ -22,9 +22,9 @@
 #include <vector>
 #include <string>
 
-#include "session_cookies.h"
-#include "urandom.h"
-#include "cstdint.h"
+#include <cppcms/session_cookies.h>
+#include <cppcms/urandom.h>
+#include <cppcms/cstdint.h>
 
 namespace cppcms {
 namespace sessions {

private/cache_over_ip.h

@@ -18,7 +18,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 #ifndef CPPCMS_CACHE_OVER_IP_H
 #define CPPCMS_CACHE_OVER_IP_H
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <booster/intrusive_ptr.h>
 #include "base_cache.h"
 #include <string>

private/cache_storage.h

@@ -20,7 +20,7 @@
 #define THREAD_CHACHE_H
 #include "base_cache.h"
 #include <booster/intrusive_ptr.h>
-#include "defs.h"
+#include <cppcms/defs.h>
 
 namespace cppcms {
 namespace impl {

private/cgi_acceptor.h

@@ -20,11 +20,11 @@
 #define CPPCMS_CGI_ACCEPTOR_H
 
 #include "cgi_api.h"
-#include "service.h"
+#include <cppcms/service.h>
 #include "service_impl.h"
-#include "http_context.h"
+#include <cppcms/http_context.h>
 
-#include "config.h"
+#include <cppcms/config.h>
 
 #include <booster/aio/socket.h>
 #include <booster/aio/endpoint.h>

private/cgi_api.h

@@ -25,7 +25,7 @@
 #include <vector>
 #include <map>
 #include <booster/function.h>
-#include "config.h"
+#include <cppcms/config.h>
 
 #include <booster/system_error.h>
 namespace booster { namespace aio { class io_service; }}

private/connection_forwarder.h

@@ -19,7 +19,7 @@
 #ifndef CPPCMS_CONNECTION_FORWARDER_H
 #define CPPCMS_CONNECTION_FORWARDER_H
 
-#include "application.h"
+#include <cppcms/application.h>
 
 namespace cppcms {
 

private/cppcms_error_category.h

@@ -19,7 +19,7 @@
 #ifndef CPPCMS_ERROR_CATEGORY_H
 #define CPPCMS_ERROR_CATEGORY_H
 
-#include "config.h"
+#include <cppcms/config.h>
 #include <booster/system_error.h>
 
 namespace cppcms {

private/fastcgi_api.h

@@ -19,7 +19,7 @@
 #ifndef CPPCMS_IMPL_FASTCGI_API_H
 #define CPPCMS_IMPL_FASTCGI_API_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <string>
 #include <memory>
 

private/hmac_encryptor.h

@@ -19,7 +19,7 @@
 #ifndef CPPCMS_HMAC_ENCRYPTOR_H
 #define CPPCMS_HMAC_ENCRYPTOR_H
 #include "base_encryptor.h"
-#include "config.h"
+#include <cppcms/config.h>
 #include <booster/thread.h>
 
 namespace cppcms {

private/http_api.h

@@ -19,7 +19,7 @@
 #ifndef CPPCMS_IMPL_HTTP_API_H
 #define CPPCMS_IMPL_HTTP_API_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <string>
 #include <memory>
 

private/internal_file_server.h

@@ -16,8 +16,8 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 ///////////////////////////////////////////////////////////////////////////////
-#include "application.h"
-#include "applications_pool.h"
+#include <cppcms/application.h>
+#include <cppcms/applications_pool.h>
 #include <string>
 #include <map>
 

private/posix_util.h

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <pthread.h>
-#include "cppcms_error.h"
+#include <cppcms/cppcms_error.h>
 #include <booster/noncopyable.h>
 
 namespace cppcms {

private/scgi_api.h

@@ -19,7 +19,7 @@
 #ifndef CPPCMS_IMPL_SCGI_API_H
 #define CPPCMS_IMPL_SCGI_API_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 #include <string>
 #include <memory>
 

private/service_impl.h

@@ -19,8 +19,8 @@
 #ifndef CPPCMS_SERVICE_IMPL_H
 #define CPPCMS_SERVICE_IMPL_H
 
-#include "json.h"
-#include "localization.h"
+#include <cppcms/json.h>
+#include <cppcms/localization.h>
 #include <booster/aio/io_service.h>
 #include <booster/shared_ptr.h>
 #include <memory>

private/session_memory_storage.h

@@ -19,8 +19,8 @@
 #ifndef CPPCMS_SESSIOM_MEMORY_STORAGE_H
 #define CPPCMS_SESSIOM_MEMORY_STORAGE_H
 
-#include "defs.h"
-#include "session_storage.h"
+#include <cppcms/defs.h>
+#include <cppcms/session_storage.h>
 namespace cppcms {
 namespace sessions {
 

private/session_posix_file_storage.h

@@ -19,8 +19,8 @@
 #ifndef CPPCMS_SESSION_POSIX_FILE_STORAGE_H
 #define CPPCMS_SESSION_POSIX_FILE_STORAGE_H
 
-#include "defs.h"
-#include "session_storage.h"
+#include <cppcms/defs.h>
+#include <cppcms/session_storage.h>
 #include <booster/hold_ptr.h>
 #include <pthread.h>
 #include <vector>

private/session_tcp_storage.h

@@ -19,7 +19,7 @@
 #ifndef CPPCMS_SESSION_TCP_STORAGE_H
 #define CPPCMS_SESSION_TCP_STORAGE_H
 
-#include "session_storage.h"
+#include <cppcms/session_storage.h>
 #include "tcp_connector.h"
 #include "session_backend_factory.h"
 

private/session_win32_file_storage.h

@@ -19,8 +19,8 @@
 #ifndef CPPCMS_SESSION_POSIX_FILE_STORAGE_H
 #define CPPCMS_SESSION_POSIX_FILE_STORAGE_H
 
-#include "defs.h"
-#include "session_storage.h"
+#include <cppcms/defs.h>
+#include <cppcms/session_storage.h>
 #include <booster/hold_ptr.h>
 #include <vector>
 

private/shmem_allocator.h

@@ -18,7 +18,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 #ifndef CPPCMS_ALLOCATORS
 #define CPPCMS_ALLOCATORS
-#include "config.h"
+#include <cppcms/config.h>
 
 #ifdef CPPCMS_USE_EXTERNAL_BOOST
 #   include <boost/interprocess/managed_external_buffer.hpp>
@@ -28,7 +28,7 @@
 #endif
 
 #include "posix_util.h"
-#include "cppcms_error.h"
+#include <cppcms/cppcms_error.h>
 #include <string>
 
 namespace cppcms {

private/tcp_cache_client.h

@@ -19,8 +19,8 @@
 #ifndef TCP_CHACHE_H
 #define TCP_CHACHE_H
 #include "base_cache.h"
-#include "cache_interface.h"
-#include "session_storage.h"
+#include <cppcms/cache_interface.h>
+#include <cppcms/session_storage.h>
 #include "tcp_connector.h"
 #include <string>
 

private/tcp_cache_protocol.h

@@ -19,7 +19,7 @@
 #ifndef TCP_CACHE_PROTO_H
 #define TCP_CACHE_PROTO_H
 
-#include "cstdint.h"
+#include <cppcms/cstdint.h>
 
 namespace cppcms {
 namespace impl {

private/tcp_cache_server.h

@@ -19,7 +19,7 @@
 #ifndef CPPCMS_TCP_CACHE_SERVER_H
 #define CPPCMS_TCP_CACHE_SERVER_H
 
-#include "defs.h"
+#include <cppcms/defs.h>
 #include "base_cache.h"
 #include <booster/noncopyable.h>
 #include <booster/intrusive_ptr.h>

private/utf_iterator.h

@@ -18,7 +18,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 #ifndef CPPCMS_UTF_ITERATOR_H
 #define CPPCMS_UTF_ITERATOR_H
-#include "cstdint.h"
+#include <cppcms/cstdint.h>
 #include <string.h>
 
 namespace cppcms {

src/aes_encryptor.cpp

@@ -23,10 +23,10 @@
 #include <string>
 #include <vector>
 #include <algorithm>
-#include "cppcms_error.h"
+#include <cppcms/cppcms_error.h>
 #include "aes_encryptor.h"
 
-#include "base64.h"
+#include <cppcms/base64.h>
 
 #ifdef CPPCMS_WIN_NATIVE
 #define CPPCMS_GCRYPT_USE_BOOSTER_THREADS

src/application.cpp

@@ -18,19 +18,19 @@
 ///////////////////////////////////////////////////////////////////////////////
 #define CPPCMS_SOURCE
 
-#include "application.h"
-#include "http_context.h"
-#include "service.h"
-#include "cppcms_error.h"
-#include "url_dispatcher.h"
-#include "applications_pool.h"
-#include "http_response.h"
-#include "views_pool.h"
+#include <cppcms/application.h>
+#include <cppcms/http_context.h>
+#include <cppcms/service.h>
+#include <cppcms/cppcms_error.h>
+#include <cppcms/url_dispatcher.h>
+#include <cppcms/applications_pool.h>
+#include <cppcms/http_response.h>
+#include <cppcms/views_pool.h>
 
 #include <set>
 #include <vector>
 
-#include "config.h"
+#include <cppcms/config.h>
 #ifdef CPPCMS_USE_EXTERNAL_BOOST
 #   include <boost/bind.hpp>
 #else // Internal Boost

src/applications_pool.cpp

@@ -17,14 +17,14 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 #define CPPCMS_SOURCE
-#include "applications_pool.h"
-#include "application.h"
-#include "service.h"
-#include "cppcms_error.h"
-#include "json.h"
+#include <cppcms/applications_pool.h>
+#include <cppcms/application.h>
+#include <cppcms/service.h>
+#include <cppcms/cppcms_error.h>
+#include <cppcms/json.h>
 #include <set>
 #include <vector>
-#include "config.h"
+#include <cppcms/config.h>
 #include <booster/regex.h>
 #include <booster/shared_ptr.h>
 #include <booster/thread.h>

src/base64.cpp

@@ -7,7 +7,7 @@
  */
 
 #define CPPCMS_SOURCE
-#include "base64.h"
+#include <cppcms/base64.h>
 
 
 namespace {

src/base_encryptor.cpp

@@ -18,8 +18,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 #define CPPCMS_SOURCE
 #include "base_encryptor.h"
-#include "base64.h"
-#include "cppcms_error.h"
+#include <cppcms/base64.h>
+#include <cppcms/cppcms_error.h>
 #include <stdio.h>
 #include <stdlib.h>
 

src/base_view.cpp

@@ -17,12 +17,12 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 #define CPPCMS_SOURCE
-#include "base_view.h"
-#include "util.h"
-#include "cppcms_error.h"
+#include <cppcms/base_view.h>
+#include <cppcms/util.h>
+#include <cppcms/cppcms_error.h>
 
 #include <vector>
-#include "config.h"
+#include <cppcms/config.h>
 #ifdef CPPCMS_USE_EXTERNAL_BOOST
 #   include <boost/format.hpp>
 #else // Internal Boost

src/cache_interface.cpp

@@ -17,14 +17,14 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 #define CPPCMS_SOURCE
-#include "cache_interface.h"
+#include <cppcms/cache_interface.h>
 #include "base_cache.h"
-#include "cache_pool.h"
-#include "http_context.h"
-#include "http_response.h"
-#include "json.h"
-#include "service.h"
-#include "cppcms_error.h"
+#include <cppcms/cache_pool.h>
+#include <cppcms/http_context.h>
+#include <cppcms/http_response.h>
+#include <cppcms/json.h>
+#include <cppcms/service.h>
+#include <cppcms/cppcms_error.h>
 #include <sstream>
 #include <iostream>
 

src/cache_pool.cpp

@@ -17,12 +17,12 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 #define CPPCMS_SOURCE
-#include "cache_pool.h"
+#include <cppcms/cache_pool.h>
 #include "cache_storage.h"
 #include "base_cache.h"
-#include "cppcms_error.h"
+#include <cppcms/cppcms_error.h>
 #include "cache_over_ip.h"
-#include "json.h"
+#include <cppcms/json.h>
 
 namespace cppcms {
 

src/cache_storage.cpp

@@ -17,7 +17,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 #define CPPCMS_SOURCE
-#include "config.h"
+#include <cppcms/config.h>
 #include "cache_storage.h"
 #include <booster/thread.h>
 
@@ -30,7 +30,7 @@
 #include <list>
 #include <limits>
 #include <iostream>
-#include "cstdint.h"
+#include <cppcms/cstdint.h>
 
 namespace cppcms {
 namespace impl {

src/cgi_api.cpp

@@ -17,18 +17,18 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 #define CPPCMS_SOURCE
-#include "url_dispatcher.h"
-#include "http_request.h"
-#include "http_response.h"
+#include <cppcms/url_dispatcher.h>
+#include <cppcms/http_request.h>
+#include <cppcms/http_response.h>
 #include "http_protocol.h"
-#include "service.h"
+#include <cppcms/service.h>
 #include "service_impl.h"
-#include "json.h"
+#include <cppcms/json.h>
 #include "cgi_api.h"
-#include "util.h"
+#include <cppcms/util.h>
 
 #include <stdlib.h>
-#include "config.h"
+#include <cppcms/config.h>
 #ifdef CPPCMS_USE_EXTERNAL_BOOST
 #   include <boost/bind.hpp>
 #else // Internal Boost