needed to split lib into separate headers and source files, which requires lots of drudgery to specify paths for each include filename (no longer relying on same-directory lookups)

also rename wchar -> utf8 to avoid conflict with <wchar.h> (requires
rebuild of workspace)
(unfortunately copying history fails to "502 bad gateway"; had to delete
old + add new independently)

This was SVN commit r7340.

source/lib/allocators/aligned_allocator.cpp

@@ -25,4 +25,4 @@
  */
 
 #include "precompiled.h"
-#include "aligned_allocator.h"
+#include "lib/allocators/aligned_allocator.h"

source/lib/allocators/allocators.cpp

@@ -25,12 +25,12 @@
  */
 
 #include "precompiled.h"
-#include "allocators.h"
+#include "lib/allocators/allocators.h"
 
 #include "lib/sysdep/cpu.h"	// cpu_CAS
 #include "lib/bits.h"
 
-#include "mem_util.h"
+#include "lib/allocators/mem_util.h"
 
 
 //-----------------------------------------------------------------------------

source/lib/allocators/bucket.cpp

@@ -25,10 +25,10 @@
  */
 
 #include "precompiled.h"
-#include "bucket.h"
+#include "lib/allocators/bucket.h"
 
 #include "lib/bits.h"
-#include "mem_util.h"
+#include "lib/allocators/mem_util.h"
 
 
 // power-of-2 isn't required; value is arbitrary.

source/lib/allocators/dynarray.cpp

@@ -25,11 +25,11 @@
  */
 
 #include "precompiled.h"
-#include "dynarray.h"
+#include "lib/allocators/dynarray.h"
 
 #include "lib/posix/posix_mman.h"	// PROT_* constants for da_set_prot
 #include "lib/sysdep/cpu.h"
-#include "mem_util.h"
+#include "lib/allocators/mem_util.h"
 
 
 // indicates that this DynArray must not be resized or freed

source/lib/allocators/headerless.cpp

@@ -25,10 +25,10 @@
  */
 
 #include "precompiled.h"
-#include "headerless.h"
+#include "lib/allocators/headerless.h"
 
-#include "mem_util.h"
-#include "pool.h"
+#include "lib/allocators/mem_util.h"
+#include "lib/allocators/pool.h"
 #include "lib/bits.h"
 
 

source/lib/allocators/mem_util.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "precompiled.h"
-#include "mem_util.h"
+#include "lib/allocators/mem_util.h"
 
 #include "lib/bits.h"				// round_up
 #include "lib/posix/posix_mman.h"

source/lib/allocators/pool.cpp

@@ -25,9 +25,9 @@
  */
 
 #include "precompiled.h"
-#include "pool.h"
+#include "lib/allocators/pool.h"
 
-#include "mem_util.h"
+#include "lib/allocators/mem_util.h"
 
 
 LibError pool_create(Pool* p, size_t max_size, size_t el_size)

source/lib/allocators/pool.h

@@ -27,7 +27,7 @@
 #ifndef INCLUDED_POOL
 #define INCLUDED_POOL
 
-#include "dynarray.h"
+#include "lib/allocators/dynarray.h"
 
 /**
  * allocator design parameters:

source/lib/allocators/shared_ptr.cpp

@@ -21,9 +21,9 @@
  */
 
 #include "precompiled.h"
-#include "shared_ptr.h"
+#include "lib/allocators/shared_ptr.h"
 
-#include "allocators.h"	// AllocatorChecker
+#include "lib/allocators/allocators.h"	// AllocatorChecker
 
 
 #ifndef NDEBUG

source/lib/allocators/string_pool.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "precompiled.h"
-#include "string_pool.h"
+#include "lib/allocators/string_pool.h"
 
 #include "lib/rand.h"
 #include "lib/sysdep/cpu.h"	// cpu_memcpy

source/lib/allocators/string_pool.h

@@ -28,7 +28,7 @@
 #define INCLUDED_STRING_POOL
 
 #include "lib/adts.h"	// DynHashTbl
-#include "pool.h"
+#include "lib/allocators/pool.h"
 
 class StringPool
 {

source/lib/app_hooks.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "precompiled.h"
-#include "app_hooks.h"
+#include "lib/app_hooks.h"
 
 #include "lib/path_util.h"
 #include "lib/sysdep/sysdep.h"

source/lib/bits.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "precompiled.h"
-#include "bits.h"
+#include "lib/bits.h"
 
 static inline u32 get_float_bits(const float x)
 {

source/lib/byte_order.cpp

@@ -25,9 +25,9 @@
  */
 
 #include "precompiled.h"
-#include "byte_order.h"
+#include "lib/byte_order.h"
 
-#include "bits.h"
+#include "lib/bits.h"
 
 #ifndef swap16
 

source/lib/debug.cpp

@@ -25,16 +25,16 @@
  */
 
 #include "precompiled.h"
-#include "debug.h"
+#include "lib/debug.h"
 
 #include <cstdarg>
 #include <cstring>
 #include <cstdio>
 
-#include "app_hooks.h"
-#include "path_util.h"
+#include "lib/app_hooks.h"
+#include "lib/path_util.h"
 #include "lib/allocators/allocators.h"	// page_aligned_alloc
-#include "fnv_hash.h"
+#include "lib/fnv_hash.h"
 #include "lib/sysdep/cpu.h"	// cpu_CAS
 #include "lib/sysdep/sysdep.h"
 

source/lib/debug_stl.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "precompiled.h"
-#include "debug_stl.h"
+#include "lib/debug_stl.h"
 
 #include <deque>
 #include <map>
@@ -33,7 +33,7 @@
 #include <cassert>
 #include <list>
 
-#include "regex.h"
+#include "lib/regex.h"
 
 
 ERROR_ASSOCIATE(ERR::STL_CNT_UNKNOWN, L"Unknown STL container type_name", -1);

source/lib/external_libraries/dbghelp.cpp

@@ -24,13 +24,13 @@
 
 #if OS_WIN
 
-#include "dbghelp.h"
+#include "lib/external_libraries/dbghelp.h"
 
 // define extension function pointers
 extern "C"
 {
 #define FUNC(ret, name, params) ret (__stdcall *p##name) params;
-#include "dbghelp_funcs.h"
+#include "lib/external_libraries/dbghelp_funcs.h"
 #undef FUNC
 }
 
@@ -39,7 +39,7 @@ void dbghelp_ImportFunctions()
 	HMODULE hDbghelp = LoadLibraryW(L"dbghelp.dll");
 	debug_assert(hDbghelp);
 #define FUNC(ret, name, params) p##name = (ret (__stdcall*) params)GetProcAddress(hDbghelp, #name);
-#include "dbghelp_funcs.h"
+#include "lib/external_libraries/dbghelp_funcs.h"
 #undef FUNC
 }
 

source/lib/external_libraries/dbghelp.h

@@ -125,7 +125,7 @@ enum DataKind
 
 // declare function pointers
 #define FUNC(ret, name, params) EXTERN_C ret (__stdcall *p##name) params;
-#include "dbghelp_funcs.h"
+#include "lib/external_libraries/dbghelp_funcs.h"
 #undef FUNC
 
 extern void dbghelp_ImportFunctions();

source/lib/external_libraries/sdl.h

@@ -27,7 +27,7 @@
 #ifndef INCLUDED_SDL
 #define INCLUDED_SDL
 
-#include "sdl_fwd.h"
+#include "lib/external_libraries/sdl_fwd.h"
 #include "lib/config2.h"	// CONFIG2_WSDL
 
 #if OS_WIN && CONFIG2_WSDL

source/lib/fat_time.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "precompiled.h"
-#include "fat_time.h"
+#include "lib/fat_time.h"
 
 #include <ctime>
 

source/lib/file/archive/archive.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "precompiled.h"
-#include "archive.h"
+#include "lib/file/archive/archive.h"
 
 ERROR_ASSOCIATE(ERR::ARCHIVE_UNKNOWN_FORMAT, L"Unknown archive format", -1);
 ERROR_ASSOCIATE(ERR::ARCHIVE_UNKNOWN_METHOD, L"Unknown compression method", -1);

source/lib/file/archive/archive_zip.cpp

@@ -25,21 +25,21 @@
  */
 
 #include "precompiled.h"
-#include "archive_zip.h"
+#include "lib/file/archive/archive_zip.h"
 
 #include <time.h>
 #include <limits>
 
 #include "lib/bits.h"
 #include "lib/byte_order.h"
-#include "lib/wchar.h"	// wstring_from_utf8
+#include "lib/utf8.h"	// wstring_from_utf8
 #include "lib/fat_time.h"
 #include "lib/path_util.h"
 #include "lib/allocators/pool.h"
 #include "lib/sysdep/cpu.h"		// cpu_memcpy
-#include "archive.h"
-#include "codec_zlib.h"
-#include "stream.h"
+#include "lib/file/archive/archive.h"
+#include "lib/file/archive/codec_zlib.h"
+#include "lib/file/archive/stream.h"
 #include "lib/file/file.h"
 #include "lib/file/io/io.h"
 #include "lib/file/io/io_align.h"	// BLOCK_SIZE

source/lib/file/archive/archive_zip.h

@@ -27,7 +27,7 @@
 #ifndef INCLUDED_ARCHIVE_ZIP
 #define INCLUDED_ARCHIVE_ZIP
 
-#include "archive.h"
+#include "lib/file/archive/archive.h"
 
 LIB_API PIArchiveReader CreateArchiveReader_Zip(const fs::wpath& archivePathname);
 LIB_API PIArchiveWriter CreateArchiveWriter_Zip(const fs::wpath& archivePathname);

source/lib/file/archive/codec.cpp

@@ -21,7 +21,7 @@
  */
 
 #include "precompiled.h"
-#include "codec.h"
+#include "lib/file/archive/codec.h"
 
 ICodec::~ICodec()
 {

source/lib/file/archive/codec_zlib.cpp

@@ -21,9 +21,9 @@
  */
 
 #include "precompiled.h"
-#include "codec_zlib.h"
+#include "lib/file/archive/codec_zlib.h"
 
-#include "codec.h"
+#include "lib/file/archive/codec.h"
 #include "lib/external_libraries/zlib.h"
 
 #include "lib/sysdep/cpu.h"

source/lib/file/archive/codec_zlib.h

@@ -23,7 +23,7 @@
 #ifndef INCLUDED_CODEC_ZLIB
 #define INCLUDED_CODEC_ZLIB
 
-#include "codec.h"
+#include "lib/file/archive/codec.h"
 
 extern PICodec CreateCodec_ZLibNone();
 extern PICodec CreateCompressor_ZLibDeflate();

source/lib/file/archive/stream.cpp

@@ -21,11 +21,11 @@
  */
 
 #include "precompiled.h"
-#include "stream.h"
+#include "lib/file/archive/stream.h"
 
 #include "lib/allocators/allocators.h"	// page_aligned_alloc
 #include "lib/allocators/shared_ptr.h"
-#include "codec.h"
+#include "lib/file/archive/codec.h"
 //#include "lib/timer.h"
 
 //TIMER_ADD_CLIENT(tc_stream);

source/lib/file/archive/stream.h

@@ -27,7 +27,7 @@
 #ifndef INCLUDED_STREAM
 #define INCLUDED_STREAM
 
-#include "codec.h"
+#include "lib/file/archive/codec.h"
 
 // note: this is similar in function to std::vector, but we don't need
 // iterators etc. and would prefer to avoid initializing each byte.

source/lib/file/common/file_loader.cpp

@@ -21,7 +21,7 @@
  */
 
 #include "precompiled.h"
-#include "file_loader.h"
+#include "lib/file/common/file_loader.h"
 
 /*virtual*/ IFileLoader::~IFileLoader()
 {

source/lib/file/common/file_stats.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "precompiled.h"
-#include "file_stats.h"
+#include "lib/file/common/file_stats.h"
 
 #include <set>
 

source/lib/file/common/real_directory.cpp

@@ -21,7 +21,7 @@
  */
 
 #include "precompiled.h"
-#include "real_directory.h"
+#include "lib/file/common/real_directory.h"
 
 #include "lib/path_util.h"
 #include "lib/file/file.h"

source/lib/file/common/real_directory.h

@@ -23,7 +23,7 @@
 #ifndef INCLUDED_REAL_DIRECTORY
 #define INCLUDED_REAL_DIRECTORY
 
-#include "file_loader.h"
+#include "lib/file/common/file_loader.h"
 #include "lib/sysdep/dir_watch.h"
 
 class RealDirectory : public IFileLoader

source/lib/file/common/trace.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "precompiled.h"
-#include "trace.h"
+#include "lib/file/common/trace.h"
 
 #include <cstdio>
 

source/lib/file/file.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "precompiled.h"
-#include "file.h"
+#include "lib/file/file.h"
 
 #include "lib/file/common/file_stats.h"
 #include "lib/sysdep/sysdep.h"	// sys_wopen

source/lib/file/file_system.cpp

@@ -21,14 +21,14 @@
  */
 
 #include "precompiled.h"
-#include "file_system.h"
+#include "lib/file/file_system.h"
 
 #include <vector>
 #include <algorithm>
 #include <string>
 
 #include "lib/path_util.h"
-#include "lib/wchar.h"	// wstring_from_utf8
+#include "lib/utf8.h"	// wstring_from_utf8
 #include "lib/posix/posix_filesystem.h"
 
 

source/lib/file/file_system_util.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "precompiled.h"
-#include "file_system_util.h"
+#include "lib/file/file_system_util.h"
 
 #include <queue>
 #include <cstring>

source/lib/file/io/block_cache.cpp

@@ -25,14 +25,14 @@
  */
 
 #include "precompiled.h"
-#include "block_cache.h"
+#include "lib/file/io/block_cache.h"
 
 #include "lib/config2.h"	// CONFIG2_CACHE_READ_ONLY
 #include "lib/file/common/file_stats.h"
 #include "lib/lockfree.h"
 #include "lib/allocators/pool.h"
 #include "lib/fnv_hash.h"
-#include "io_align.h"
+#include "lib/file/io/io_align.h"
 
 
 //-----------------------------------------------------------------------------

source/lib/file/io/io.cpp

@@ -21,14 +21,14 @@
  */
 
 #include "precompiled.h"
-#include "io.h"
+#include "lib/file/io/io.h"
 
 #include "lib/allocators/allocators.h"	// AllocatorChecker
 #include "lib/sysdep/cpu.h"	// cpu_memcpy
 #include "lib/file/file.h"
 #include "lib/file/common/file_stats.h"
-#include "block_cache.h"
-#include "io_align.h"
+#include "lib/file/io/block_cache.h"
+#include "lib/file/io/io_align.h"
 
 static const size_t ioDepth = 16;
 

source/lib/file/io/io_align.cpp

@@ -21,4 +21,4 @@
  */
 
 #include "precompiled.h"
-#include "io_align.h"
+#include "lib/file/io/io_align.h"

source/lib/file/io/write_buffer.cpp

@@ -21,12 +21,12 @@
  */
 
 #include "precompiled.h"
-#include "write_buffer.h"
+#include "lib/file/io/write_buffer.h"
 
 #include "lib/bits.h"	// IsAligned
 #include "lib/sysdep/cpu.h"
-#include "io.h"
-#include "io_align.h"
+#include "lib/file/io/io.h"
+#include "lib/file/io/io_align.h"
 
 
 WriteBuffer::WriteBuffer()

source/lib/file/vfs/file_cache.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "precompiled.h"
-#include "file_cache.h"
+#include "lib/file/vfs/file_cache.h"
 
 #include "lib/file/common/file_stats.h"
 #include "lib/file/io/io_align.h"       // BLOCK_SIZE

source/lib/file/vfs/file_cache.h

@@ -27,7 +27,7 @@
 #ifndef INCLUDED_FILE_CACHE
 #define INCLUDED_FILE_CACHE
 
-#include "vfs_path.h"
+#include "lib/file/vfs/vfs_path.h"
 
 /**
  * cache of file contents with support for zero-copy IO.

source/lib/file/vfs/vfs.cpp

@@ -21,7 +21,7 @@
  */
 
 #include "precompiled.h"
-#include "vfs.h"
+#include "lib/file/vfs/vfs.h"
 
 #include "lib/allocators/shared_ptr.h"
 #include "lib/path_util.h"
@@ -29,10 +29,10 @@
 #include "lib/file/common/trace.h"
 #include "lib/file/archive/archive.h"
 #include "lib/file/io/io.h"
-#include "vfs_tree.h"
-#include "vfs_lookup.h"
-#include "vfs_populate.h"
-#include "file_cache.h"
+#include "lib/file/vfs/vfs_tree.h"
+#include "lib/file/vfs/vfs_lookup.h"
+#include "lib/file/vfs/vfs_populate.h"
+#include "lib/file/vfs/file_cache.h"
 
 ERROR_ASSOCIATE(ERR::VFS_DIR_NOT_FOUND, L"VFS directory not found", -1);
 ERROR_ASSOCIATE(ERR::VFS_FILE_NOT_FOUND, L"VFS file not found", -1);

source/lib/file/vfs/vfs_lookup.cpp

@@ -25,12 +25,12 @@
  */
 
 #include "precompiled.h"
-#include "vfs_lookup.h"
+#include "lib/file/vfs/vfs_lookup.h"
 
 #include "lib/path_util.h"	// path_foreach_component
-#include "vfs.h"	// error codes
-#include "vfs_tree.h"
-#include "vfs_populate.h"
+#include "lib/file/vfs/vfs.h"	// error codes
+#include "lib/file/vfs/vfs_tree.h"
+#include "lib/file/vfs/vfs_populate.h"
 
 #include "lib/timer.h"
 

source/lib/file/vfs/vfs_lookup.h

@@ -27,7 +27,7 @@
 #ifndef INCLUDED_VFS_LOOKUP
 #define INCLUDED_VFS_LOOKUP
 
-#include "vfs_path.h"
+#include "lib/file/vfs/vfs_path.h"
 
 class VfsFile;
 class VfsDirectory;

source/lib/file/vfs/vfs_path.cpp

@@ -21,4 +21,4 @@
  */
 
 #include "precompiled.h"
-#include "vfs_path.h"
+#include "lib/file/vfs/vfs_path.h"

source/lib/file/vfs/vfs_populate.cpp

@@ -25,13 +25,13 @@
  */
 
 #include "precompiled.h"
-#include "vfs_populate.h"
+#include "lib/file/vfs/vfs_populate.h"
 
 #include "lib/path_util.h"
 #include "lib/file/archive/archive_zip.h"
-#include "vfs_tree.h"
-#include "vfs_lookup.h"
-#include "vfs.h"	// error codes
+#include "lib/file/vfs/vfs_tree.h"
+#include "lib/file/vfs/vfs_lookup.h"
+#include "lib/file/vfs/vfs.h"	// error codes
 
 
 static std::vector<const VfsFile*> s_looseFiles;

source/lib/file/vfs/vfs_tree.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "precompiled.h"
-#include "vfs_tree.h"
+#include "lib/file/vfs/vfs_tree.h"
 
 #include <cstdio>
 

source/lib/frequency_filter.cpp

@@ -21,7 +21,7 @@
  */
 
 #include "precompiled.h"
-#include "frequency_filter.h"
+#include "lib/frequency_filter.h"
 
 static const double errorTolerance = 0.05f;
 static const double sensitivity = 0.10;

source/lib/lib.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "precompiled.h"
-#include "lib.h"
+#include "lib/lib.h"
 
 #include <stdlib.h>
 #include <string.h>

source/lib/lib.h

@@ -65,7 +65,7 @@ scope
 #include <limits>	// numeric_limits
 #include <stdexcept>	// out_of_range
 
-#include "config.h"
+#include "lib/config.h"
 
 
 const size_t KiB = size_t(1) << 10;

source/lib/lib_errors.cpp

@@ -30,7 +30,7 @@
 // object files of the same name but in different paths.
 
 #include "precompiled.h"
-#include "lib_errors.h"
+#include "lib/lib_errors.h"
 
 #include <cstring>
 #include <cstdlib>	// abs

source/lib/lockfree.cpp

@@ -26,7 +26,7 @@
 
 #include "precompiled.h"
 #if 0	// JW: disabled, not used
-#include "lockfree.h"
+#include "lib/lockfree.h"
 
 #include <set>
 #include <algorithm>
@@ -35,8 +35,8 @@
 #include "lib/bits.h"
 #include "lib/sysdep/cpu.h"
 #include "lib/sysdep/sysdep.h"
-#include "timer.h"
-#include "module_init.h"
+#include "lib/timer.h"
+#include "lib/module_init.h"
 
 
 /*

source/lib/module_init.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "precompiled.h"
-#include "module_init.h"
+#include "lib/module_init.h"
 
 #include "lib/sysdep/cpu.h"	// cpu_CAS, cpu_AtomicAdd
 

source/lib/ogl.cpp

@@ -25,14 +25,14 @@
  */
 
 #include "precompiled.h"
-#include "ogl.h"
+#include "lib/ogl.h"
 
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
 
 #include "lib/external_libraries/sdl.h"
-#include "debug.h"
+#include "lib/debug.h"
 #include "lib/sysdep/gfx.h"
 #include "lib/res/h_mgr.h"
 
@@ -54,7 +54,7 @@ extern "C"
 #define FUNC(ret, name, params) ret (GL_CALL_CONV *p##name) params;
 #define FUNC2(ret, nameARB, nameCore, version, params) ret (GL_CALL_CONV *p##nameARB) params;
 #define FUNC3(ret, nameARB, nameCore, version, params) ret (GL_CALL_CONV *p##nameCore) params;
-#include "glext_funcs.h"
+#include "lib/glext_funcs.h"
 #undef FUNC3
 #undef FUNC2
 #undef FUNC
@@ -255,7 +255,7 @@ static void importExtensionFunctions()
 		pname = (ret (GL_CALL_CONV*) params)SDL_GL_GetProcAddress(#nameARB);
 #define FUNC2(ret, nameARB, nameCore, version, params) FUNC23(p##nameARB, ret, nameARB, nameCore, version, params)
 #define FUNC3(ret, nameARB, nameCore, version, params) FUNC23(p##nameCore, ret, nameARB, nameCore, version, params)
-#include "glext_funcs.h"
+#include "lib/glext_funcs.h"
 #undef FUNC3
 #undef FUNC2
 #undef FUNC23

source/lib/ogl.h

@@ -133,7 +133,7 @@ extern const char* ogl_ExtensionString();
 #define FUNC(ret, name, params) EXTERN_C ret (GL_CALL_CONV *p##name) params;
 #define FUNC2(ret, nameARB, nameCore, version, params) EXTERN_C ret (GL_CALL_CONV *p##nameARB) params;
 #define FUNC3(ret, nameARB, nameCore, version, params) EXTERN_C ret (GL_CALL_CONV *p##nameCore) params;
-#include "glext_funcs.h"
+#include "lib/glext_funcs.h"
 #undef FUNC3
 #undef FUNC2
 #undef FUNC

source/lib/path_util.cpp

@@ -25,12 +25,12 @@
  */
 
 #include "precompiled.h"
-#include "path_util.h"
+#include "lib/path_util.h"
 
 #include <cstring>
 #include <cerrno>
 
-#include "lib/wchar.h"
+#include "lib/utf8.h"
 
 
 ERROR_ASSOCIATE(ERR::PATH_EMPTY, L"path is an empty string", -1);

source/lib/posix/posix.cpp

@@ -21,7 +21,7 @@
  */
 
 #include "precompiled.h"
-#include "posix.h"
+#include "lib/posix/posix.h"
 
 #if ARCH_IA32
 # include "lib/sysdep/arch/ia32/ia32_asm.h"

source/lib/posix/posix.h

@@ -66,16 +66,16 @@ need only be renamed (e.g. _open, _stat).
 # include "lib/sysdep/os/win/wposix/wposix.h"
 #endif
 
-#include "posix_types.h"
-#include "posix_aio.h"
-#include "posix_dlfcn.h"
-#include "posix_filesystem.h"
-#include "posix_mman.h"
-#include "posix_pthread.h"
-//#include "posix_sock.h"
-//#include "posix_terminal.h"
-//#include "posix_time.h"
-#include "posix_utsname.h"
+#include "lib/posix/posix_types.h"
+#include "lib/posix/posix_aio.h"
+#include "lib/posix/posix_dlfcn.h"
+#include "lib/posix/posix_filesystem.h"
+#include "lib/posix/posix_mman.h"
+#include "lib/posix/posix_pthread.h"
+//#include "lib/posix/posix_sock.h"
+//#include "lib/posix/posix_terminal.h"
+//#include "lib/posix/posix_time.h"
+#include "lib/posix/posix_utsname.h"
 
 
 // note: the following need only be #defined (instead of defining a

source/lib/posix/posix_aio.h

@@ -31,4 +31,4 @@
 # include <aio.h>
 #endif
 
-#include "posix_errno.h"	// for user convenience
+#include "lib/posix/posix_errno.h"	// for user convenience

source/lib/posix/posix_dlfcn.h

@@ -26,4 +26,4 @@
 # include <dlfcn.h>
 #endif
 
-#include "posix_errno.h"	// for user convenience
+#include "lib/posix/posix_errno.h"	// for user convenience

source/lib/posix/posix_filesystem.h

@@ -28,6 +28,6 @@
 # include <dirent.h>
 #endif
 
-#include "posix_errno.h"	// for user convenience
+#include "lib/posix/posix_errno.h"	// for user convenience
 
 #include "lib/sysdep/filesystem.h"

source/lib/posix/posix_mman.h

@@ -26,4 +26,4 @@
 # include <sys/mman.h>
 #endif
 
-#include "posix_errno.h"	// for user convenience
+#include "lib/posix/posix_errno.h"	// for user convenience

source/lib/posix/posix_pthread.h

@@ -27,4 +27,4 @@
 # include <semaphore.h>
 #endif
 
-#include "posix_errno.h"	// for user convenience
+#include "lib/posix/posix_errno.h"	// for user convenience

source/lib/posix/posix_sock.h

@@ -30,4 +30,4 @@
 # include <arpa/inet.h>
 #endif
 
-#include "posix_errno.h"	// for user convenience
+#include "lib/posix/posix_errno.h"	// for user convenience

source/lib/posix/posix_terminal.h

@@ -26,4 +26,4 @@
 # include <sys/ioctl.h>
 #endif
 
-#include "posix_errno.h"	// for user convenience
+#include "lib/posix/posix_errno.h"	// for user convenience

source/lib/posix/posix_time.h

@@ -26,4 +26,4 @@
 # include <sys/time.h>
 #endif
 
-#include "posix_errno.h"	// for user convenience
+#include "lib/posix/posix_errno.h"	// for user convenience

source/lib/posix/posix_utsname.h

@@ -26,4 +26,4 @@
 # include <sys/utsname.h>
 #endif
 
-#include "posix_errno.h"	// for user convenience
+#include "lib/posix/posix_errno.h"	// for user convenience

source/lib/rand.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "precompiled.h"
-#include "rand.h"
+#include "lib/rand.h"
 
 // avoids several common pitfalls; see discussion at
 // http://www.azillionmonkeys.com/qed/random.html

source/lib/secure_crt.cpp

@@ -30,10 +30,10 @@
 #include <errno.h>
 #include <stdarg.h>
 
-#include "secure_crt.h"
+#include "lib/secure_crt.h"
 
 #ifdef WSECURE_CRT
-#include "lib/wchar.h"
+#include "lib/utf8.h"
 #endif
 
 

source/lib/self_test.cpp

@@ -28,8 +28,8 @@
 
 #if 0
 
-#include "self_test.h"
-#include "timer.h"
+#include "lib/self_test.h"
+#include "lib/timer.h"
 
 // checked by debug_OnAssertionFailure; disables asserts if true (see above).
 // set/cleared by self_test_run.

source/lib/sysdep/acpi.cpp

@@ -21,7 +21,7 @@
  */
 
 #include "precompiled.h"
-#include "acpi.h"
+#include "lib/sysdep/acpi.h"
 
 #include "lib/sysdep/os/win/mahaf.h"
 #include "lib/sysdep/cpu.h"

source/lib/sysdep/arch/amd64/amd64.cpp

@@ -24,8 +24,8 @@
 
 #if ARCH_AMD64
 
-#include "amd64.h"
-#include "amd64_asm.h"
+#include "lib/sysdep/arch/amd64/amd64.h"
+#include "lib/sysdep/arch/amd64/amd64_asm.h"
 
 #include "lib/sysdep/cpu.h"
 #if MSC_VERSION

source/lib/sysdep/arch/ia32/ia32.cpp

@@ -26,10 +26,10 @@
 
 #include "precompiled.h"
 
-#include "ia32.h"
+#include "lib/sysdep/arch/ia32/ia32.h"
 
 #include "lib/sysdep/cpu.h"
-#include "ia32_asm.h"
+#include "lib/sysdep/arch/ia32/ia32_asm.h"
 
 
 static const size_t maxInstructionLength = 15;	// IA-32 limitation

source/lib/sysdep/arch/x86_x64/topology.cpp

@@ -25,14 +25,14 @@
  */
 
 #include "precompiled.h"
-#include "topology.h"
+#include "lib/sysdep/arch/x86_x64/topology.h"
 
 #include <set>
 
 #include "lib/bits.h"
 #include "lib/sysdep/cpu.h"	// ERR::CPU_FEATURE_MISSING
 #include "lib/sysdep/os_cpu.h"
-#include "x86_x64.h"
+#include "lib/sysdep/arch/x86_x64/x86_x64.h"
 
 
 //-----------------------------------------------------------------------------

source/lib/sysdep/arch/x86_x64/x86_x64.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "precompiled.h"
-#include "x86_x64.h"
+#include "lib/sysdep/arch/x86_x64/x86_x64.h"
 
 #include <string.h>
 #include <stdio.h>
@@ -40,9 +40,9 @@
 #include "lib/sysdep/os_cpu.h"
 
 #if ARCH_AMD64
-# include "../amd64/amd64_asm.h"
+# include "lib/sysdep/arch/amd64/amd64_asm.h"
 #else
-# include "../ia32/ia32_asm.h"
+# include "lib/sysdep/arch/ia32/ia32_asm.h"
 #endif
 
 #if MSC_VERSION

source/lib/sysdep/cpu.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "precompiled.h"
-#include "cpu.h"
+#include "lib/sysdep/cpu.h"
 
 ERROR_ASSOCIATE(ERR::CPU_FEATURE_MISSING, L"This CPU doesn't support a required feature", -1);
 ERROR_ASSOCIATE(ERR::CPU_UNKNOWN_OPCODE, L"Disassembly failed", -1);

source/lib/sysdep/gfx.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "precompiled.h"
-#include "gfx.h"
+#include "lib/sysdep/gfx.h"
 
 #include "lib/external_libraries/sdl.h"
 #include "lib/ogl.h"

source/lib/sysdep/os/win/mahaf.cpp

@@ -26,10 +26,10 @@
 
 #include "precompiled.h"
 
-#include "win.h"
+#include "lib/sysdep/os/win/win.h"
 #include <winioctl.h>
-#include "aken/aken.h"
-#include "wutil.h"
+#include "lib/sysdep/os/win/aken/aken.h"
+#include "lib/sysdep/os/win/wutil.h"
 #include "lib/module_init.h"
 
 

source/lib/sysdep/os/win/wclipboard.cpp

@@ -23,8 +23,8 @@
 #include "precompiled.h"
 #include "lib/sysdep/clipboard.h"
 
-#include "win.h"
-#include "wutil.h"
+#include "lib/sysdep/os/win/win.h"
+#include "lib/sysdep/os/win/wutil.h"
 
 // caller is responsible for freeing *hMem.
 static LibError SetClipboardText(const wchar_t* text, HGLOBAL* hMem)

source/lib/sysdep/os/win/wcpu.cpp

@@ -27,7 +27,7 @@
 #include "precompiled.h"
 #include "lib/sysdep/os_cpu.h"
 
-#include "win.h"
+#include "lib/sysdep/os/win/win.h"
 #include "lib/bits.h"
 #include "lib/module_init.h"
 

source/lib/sysdep/os/win/wcpu.h

@@ -27,7 +27,7 @@
 #ifndef INCLUDED_WCPU
 #define INCLUDED_WCPU
 
-#include "win.h"
+#include "lib/sysdep/os/win/win.h"
 
 // "affinity" and "processorNumber" are what Windows sees.
 // "processorMask" and "processor" are the idealized representation we expose

source/lib/sysdep/os/win/wcursor.cpp

@@ -23,8 +23,8 @@
 #include "precompiled.h"
 #include "lib/sysdep/cursor.h"
 
-#include "win.h"
-#include "wutil.h"
+#include "lib/sysdep/os/win/win.h"
+#include "lib/sysdep/os/win/wutil.h"
 
 
 static sys_cursor cursor_from_HICON(HICON hIcon)

source/lib/sysdep/os/win/wdbg.cpp

@@ -28,8 +28,8 @@
 #include "lib/debug.h"
 
 #include "lib/bits.h"
-#include "win.h"
-#include "wutil.h"
+#include "lib/sysdep/os/win/win.h"
+#include "lib/sysdep/os/win/wutil.h"
 
 
 // return 1 if the pointer appears to be totally bogus, otherwise 0.

source/lib/sysdep/os/win/wdbg_heap.cpp

@@ -21,17 +21,17 @@
  */
 
 #include "precompiled.h"
-#include "wdbg_heap.h"
+#include "lib/sysdep/os/win/wdbg_heap.h"
 
-#include "win.h"
+#include "lib/sysdep/os/win/win.h"
 #include <crtdbg.h>
 #include <excpt.h>
 
 #include "lib/external_libraries/dbghelp.h"
 #include "lib/sysdep/cpu.h"	// cpu_AtomicAdd
-#include "winit.h"
-#include "wdbg.h"       // wdbg_printf
-#include "wdbg_sym.h"   // wdbg_sym_WalkStack
+#include "lib/sysdep/os/win/winit.h"
+#include "lib/sysdep/os/win/wdbg.h"       // wdbg_printf
+#include "lib/sysdep/os/win/wdbg_sym.h"   // wdbg_sym_WalkStack
 
 
 WINIT_REGISTER_EARLY_INIT2(wdbg_heap_Init);	// wutil -> wdbg_heap

source/lib/sysdep/os/win/wdbg_sym.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "precompiled.h"
-#include "wdbg_sym.h"
+#include "lib/sysdep/os/win/wdbg_sym.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -42,9 +42,9 @@
 # include "lib/sysdep/arch/ia32/ia32_asm.h"
 #endif
 #include "lib/external_libraries/dbghelp.h"
-#include "winit.h"
-#include "wdbg.h"
-#include "wutil.h"
+#include "lib/sysdep/os/win/winit.h"
+#include "lib/sysdep/os/win/wdbg.h"
+#include "lib/sysdep/os/win/wutil.h"
 
 
 WINIT_REGISTER_CRITICAL_INIT(wdbg_sym_Init);

source/lib/sysdep/os/win/wdir_watch.cpp

@@ -29,9 +29,9 @@
 
 #include "lib/allocators/shared_ptr.h"
 #include "lib/path_util.h"	// path_is_subpath
-#include "win.h"
-#include "winit.h"
-#include "wutil.h"
+#include "lib/sysdep/os/win/win.h"
+#include "lib/sysdep/os/win/winit.h"
+#include "lib/sysdep/os/win/wutil.h"
 
 
 WINIT_REGISTER_MAIN_INIT(wdir_watch_Init);

source/lib/sysdep/os/win/wdll_delay_load.cpp

@@ -25,11 +25,11 @@
  */
 
 #include "precompiled.h"
-#include "wdll_delay_load.h"
+#include "lib/sysdep/os/win/wdll_delay_load.h"
 
 #include "lib/sysdep/cpu.h"
-#include "win.h"
-#include "winit.h"
+#include "lib/sysdep/os/win/win.h"
+#include "lib/sysdep/os/win/winit.h"
 
 WINIT_REGISTER_LATE_SHUTDOWN2(wdll_Shutdown);	// last - DLLs are unloaded here
 

source/lib/sysdep/os/win/wdll_ver.cpp

@@ -25,13 +25,13 @@
  */
 
 #include "precompiled.h"
-#include "wdll_ver.h"
+#include "lib/sysdep/os/win/wdll_ver.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "win.h"
-#include "wutil.h"
+#include "lib/sysdep/os/win/win.h"
+#include "lib/sysdep/os/win/wutil.h"
 
 #include "lib/allocators/shared_ptr.h"
 

source/lib/sysdep/os/win/wgfx.cpp

@@ -27,9 +27,9 @@
 #include "precompiled.h"
 #include "lib/sysdep/gfx.h"
 
-#include "wdll_ver.h"
-#include "win.h"
-#include "wmi.h"
+#include "lib/sysdep/os/win/wdll_ver.h"
+#include "lib/sysdep/os/win/win.h"
+#include "lib/sysdep/os/win/wmi.h"
 
 #if MSC_VERSION
 #pragma comment(lib, "advapi32.lib")	// registry

source/lib/sysdep/os/win/whrt/counter.cpp

@@ -25,16 +25,16 @@
  */
 
 #include "precompiled.h"
-#include "counter.h"
+#include "lib/sysdep/os/win/whrt/counter.h"
 
 #include "lib/bits.h"
 #include "lib/sysdep/cpu.h"	// cpu_CAS
 
-#include "tsc.h"
-#include "hpet.h"
-#include "pmt.h"
-#include "qpc.h"
-#include "tgt.h"
+#include "lib/sysdep/os/win/whrt/tsc.h"
+#include "lib/sysdep/os/win/whrt/hpet.h"
+#include "lib/sysdep/os/win/whrt/pmt.h"
+#include "lib/sysdep/os/win/whrt/qpc.h"
+#include "lib/sysdep/os/win/whrt/tgt.h"
 // to add a new counter type, simply include its header here and
 // insert a case in ConstructCounterAt's switch statement.
 

source/lib/sysdep/os/win/whrt/hpet.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "precompiled.h"
-#include "hpet.h"
+#include "lib/sysdep/os/win/whrt/hpet.h"
 
 // for atomic 64-bit read/write:
 #define HAVE_X64_MOVD ARCH_AMD64 && (ICC_VERSION || MSC_VERSION >= 1500)
@@ -35,7 +35,7 @@
 # include <emmintrin.h>
 #endif
 
-#include "counter.h"
+#include "lib/sysdep/os/win/whrt/counter.h"
 
 #include "lib/sysdep/os/win/win.h"
 #include "lib/sysdep/os/win/mahaf.h"

source/lib/sysdep/os/win/whrt/pmt.cpp

@@ -25,9 +25,9 @@
  */
 
 #include "precompiled.h"
-#include "pmt.h"
+#include "lib/sysdep/os/win/whrt/pmt.h"
 
-#include "counter.h"
+#include "lib/sysdep/os/win/whrt/counter.h"
 
 #include "lib/sysdep/os/win/win.h"
 #include "lib/sysdep/acpi.h"

source/lib/sysdep/os/win/whrt/qpc.cpp

@@ -25,15 +25,15 @@
  */
 
 #include "precompiled.h"
-#include "qpc.h"
+#include "lib/sysdep/os/win/whrt/qpc.h"
 
-#include "counter.h"
+#include "lib/sysdep/os/win/whrt/counter.h"
 
 #include "lib/sysdep/os_cpu.h"
 #include "lib/sysdep/os/win/win.h"
 #include "lib/sysdep/os/win/wutil.h"	// wutil_argv
-#include "pit.h"	// PIT_FREQ
-#include "pmt.h"	// PMT_FREQ
+#include "lib/sysdep/os/win/whrt/pit.h"	// PIT_FREQ
+#include "lib/sysdep/os/win/whrt/pmt.h"	// PMT_FREQ
 
 
 class CounterQPC : public ICounter

source/lib/sysdep/os/win/whrt/tgt.cpp

@@ -29,9 +29,9 @@
 // fairly slow)
 
 #include "precompiled.h"
-#include "tgt.h"
+#include "lib/sysdep/os/win/whrt/tgt.h"
 
-#include "counter.h"
+#include "lib/sysdep/os/win/whrt/counter.h"
 
 #include "lib/sysdep/os/win/win.h"
 #include <mmsystem.h>

source/lib/sysdep/os/win/whrt/tsc.cpp

@@ -25,9 +25,9 @@
  */
 
 #include "precompiled.h"
-#include "tsc.h"
+#include "lib/sysdep/os/win/whrt/tsc.h"
 
-#include "counter.h"
+#include "lib/sysdep/os/win/whrt/counter.h"
 
 #include "lib/bits.h"
 #include "lib/sysdep/os_cpu.h"

source/lib/sysdep/os/win/whrt/whrt.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "precompiled.h"
-#include "whrt.h"
+#include "lib/sysdep/os/win/whrt/whrt.h"
 
 #include <process.h>	// _beginthreadex
 
@@ -36,7 +36,7 @@
 #include "lib/adts.h"
 #include "lib/bits.h"
 
-#include "counter.h"
+#include "lib/sysdep/os/win/whrt/counter.h"
 
 WINIT_REGISTER_EARLY_INIT2(whrt_Init);	// wutil -> whrt -> wtime
 WINIT_REGISTER_LATE_SHUTDOWN(whrt_Shutdown);

source/lib/sysdep/os/win/winit.cpp

@@ -25,9 +25,9 @@
  */
 
 #include "precompiled.h"
-#include "winit.h"
+#include "lib/sysdep/os/win/winit.h"
 
-#include "win.h"	// GetTickCount for quick'n dirty timing
+#include "lib/sysdep/os/win/win.h"	// GetTickCount for quick'n dirty timing
 
 // see http://blogs.msdn.com/larryosterman/archive/2004/09/27/234840.aspx
 // for discussion of a similar mechanism.

source/lib/sysdep/os/win/wmi.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "precompiled.h"
-#include "wmi.h"
+#include "lib/sysdep/os/win/wmi.h"
 
 #include <wbemidl.h>
 

source/lib/sysdep/os/win/wmi.h

@@ -32,7 +32,7 @@
 // everything to be converted to/parsed from strings. it does drag in
 // OLE headers, but this module is entirely Windows-specific anyway.
 #define _WIN32_DCOM
-#include "win.h"
+#include "lib/sysdep/os/win/win.h"
 #include <comdef.h>	// VARIANT
 typedef std::map<std::wstring, VARIANT> WmiMap;