diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..7d2175b
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,306 @@
+name: 🛠️ Build cppp-reiconv
+
+on:
+  release:
+    types: [published]
+
+jobs:
+
+  build-dist:
+
+    runs-on: ubuntu-latest
+
+    steps:
+
+    #--------------------------------------------collect--------------------------------------------
+    - uses: actions/checkout@v3
+    
+    - name: 🏷️ Get infomations
+      run: |
+        tag="${GITHUB_REF#refs/tags/}"
+        echo "tag=$tag" >> $GITHUB_ENV
+        echo "pkgname=cppp-reiconv-$tag" >> $GITHUB_ENV
+        echo "srcdir=$(pwd)" >> $GITHUB_ENV
+
+    - name: 📁 Collect dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install p7zip-full zip xz-utils -y
+        sudo apt-get install gperf cmake gcc python3 -y
+        
+    #--------------------------------------------build--------------------------------------------
+    - name: 🧳 Prepare for source distribution building
+      run: |
+        mkdir -p ./dist
+        ./setup.sh
+    
+    - name: 🛠️ Build source distribution
+      run: |
+        ./cpppdist.py
+    
+    - name: 📦 Make packages
+      run: |
+        tar cvf ${{ env.pkgname }}.tar ${{ env.pkgname }}
+        zip -r -9 dist/${{ env.pkgname }}.zip ${{ env.pkgname }}
+        7z a dist/${{ env.pkgname }}.7z ${{ env.pkgname }}
+        xz -c -9 -k ${{ env.pkgname }}.tar > dist/${{ env.pkgname }}.tar.xz
+        gzip -c -9 -k ${{ env.pkgname }}.tar > dist/${{ env.pkgname }}.tar.gz
+
+        cd dist
+        for i in $(ls) ; do md5sum $i > $i.md5 ; done
+        cd ..
+    
+    #--------------------------------------------publish--------------------------------------------
+
+    - name: ⬆️ Create release and upload assets
+      uses: softprops/action-gh-release@v1
+      with:
+          tag_name: ${{ env.tag }}
+          files: ./dist/*
+
+  build-linux:
+  
+    needs: build-dist
+
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [
+            aarch64-linux-gnu,
+            alpha-linux-gnu,
+            arm-linux-gnueabi,
+            arm-linux-gnueabihf,
+            i686-linux-gnu,
+            mips-linux-gnu,
+            mips64-linux-gnuabi64,
+            mips64el-linux-gnuabi64,
+            mipsel-linux-gnu,
+            mipsisa32r6-linux-gnu,
+            mipsisa32r6el-linux-gnu,
+            mipsisa64r6-linux-gnuabi64,
+            mipsisa64r6el-linux-gnuabi64,
+            powerpc-linux-gnu,
+            powerpc64-linux-gnu,
+            powerpc64le-linux-gnu,
+            riscv64-linux-gnu,
+            sh4-linux-gnu,
+            x86_64-linux-gnu
+          ]
+    
+    runs-on: ubuntu-latest
+    
+    steps:
+    
+    #--------------------------------------------collect--------------------------------------------
+    - name: 🏷️ Get infomations
+      run: |
+        tag="${GITHUB_REF#refs/tags/}"
+        echo "tag=$tag" >> $GITHUB_ENV
+        echo "pkgname=cppp-reiconv-$tag" >> $GITHUB_ENV
+        echo "srcdir=$(pwd)" >> $GITHUB_ENV
+
+    - name: 📁 Collect dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install p7zip-full zip xz-utils wget -y
+        sudo apt-get install gperf cmake -y
+        if [ "${{ matrix.arch }}" = "x86_64-linux-gnu" ] ;
+        then
+          sudo apt-get install gcc g++ -y ;
+        else
+          sudo apt-get install gcc-${{ matrix.arch }} g++-${{ matrix.arch }} -y ;
+        fi
+    
+    - name: 📁 Get source distribution tarball
+      run: |
+        wget https://github.com/${{ github.repository }}/releases/download/${{ env.tag }}/${{ env.pkgname }}.tar.gz
+        tar zxvf ${{ env.pkgname }}.tar.gz
+        mv ${{ env.pkgname }}/* .
+    
+    #--------------------------------------------build--------------------------------------------
+    - name: 🧳 Prepare for binary distribution building
+      run: |
+        mkdir -p dist
+    
+    - name: 🛠️ Build binary distribution
+      run: |
+        export C_COMPILER="gcc"
+        export CXX_COMPILER="g++"
+        export LINKER="ld"
+        export CC="/usr/bin/${{ matrix.arch }}-$C_COMPILER"
+        export CXX="/usr/bin/${{ matrix.arch }}-$CXX_COMPILER"
+        export LD="/usr/bin/${{ matrix.arch }}-$LINKER"
+
+        mkdir build
+        cd build
+        cmake .. -DCMAKE_INSTALL_PREFIX=${{ env.srcdir }}/${{ env.pkgname }}-${{ matrix.arch }} -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX -DCMAKE_LINKER=$LD
+        cmake --build . --config=Release
+        cmake --install .
+        cd ..
+    
+    - name: 📦 Make packages
+      run: |
+        tar cvf ${{ env.pkgname }}-${{ matrix.arch }}.tar ${{ env.pkgname }}-${{ matrix.arch }}
+        zip -r -9 dist/${{ env.pkgname }}-${{ matrix.arch }}.zip ${{ env.pkgname }}-${{ matrix.arch }}
+        7z a dist/${{ env.pkgname }}-${{ matrix.arch }}.7z ${{ env.pkgname }}-${{ matrix.arch }}
+        xz -c -9 -k ${{ env.pkgname }}-${{ matrix.arch }}.tar > dist/${{ env.pkgname }}-${{ matrix.arch }}.tar.xz
+        gzip -c -9 -k ${{ env.pkgname }}-${{ matrix.arch }}.tar > dist/${{ env.pkgname }}-${{ matrix.arch }}.tar.gz
+
+        cd dist
+        for i in $(ls) ; do md5sum $i > $i.md5 ; done
+        cd ..
+    
+    #--------------------------------------------publish--------------------------------------------
+
+    - name: ⬆️ Create release and upload assets
+      uses: softprops/action-gh-release@v1
+      with:
+        tag_name: ${{ env.tag }}
+        files: ./dist/*
+
+  build-macos:
+
+    needs: build-dist
+
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [
+            x86_64,
+            arm64
+          ]
+    
+    runs-on: macos-latest
+    
+    steps:
+    
+    #--------------------------------------------collect--------------------------------------------
+    - name: 🏷️ Get infomations
+      run: |
+        tag="${GITHUB_REF#refs/tags/}"
+        echo "tag=$tag" >> $GITHUB_ENV
+        echo "pkgname=cppp-reiconv-$tag" >> $GITHUB_ENV
+        echo "srcdir=$(pwd)" >> $GITHUB_ENV
+
+    - name: 📁 Collect dependencies
+      run: |
+        brew install p7zip zip xz wget md5sha1sum
+        brew install gperf cmake
+    
+    - name: 📁 Get source distribution tarball
+      run: |
+        wget https://github.com/${{ github.repository }}/releases/download/${{ env.tag }}/${{ env.pkgname }}.tar.gz
+        tar zxvf ${{ env.pkgname }}.tar.gz
+        mv ${{ env.pkgname }}/* .
+    
+    #--------------------------------------------build--------------------------------------------
+    - name: 🧳 Prepare for binary distribution building
+      run: |
+        mkdir -p dist
+    
+    - name: 🛠️ Build binary distribution
+      run: |
+        export CC="clang"
+        export CXX="clang++"
+
+        mkdir build
+        cd build
+        cmake .. -DCMAKE_INSTALL_PREFIX=${{ env.srcdir }}/${{ env.pkgname }}-${{ matrix.arch }}-darwin-apple -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -arch ${{ matrix.arch }}" -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -arch ${{ matrix.arch }}"
+        cmake --build . --config=Release
+        cmake --install .
+        cd ..
+    
+    - name: 📦 Make packages
+      run: |
+        tar cvf ${{ env.pkgname }}-${{ matrix.arch }}-darwin-apple.tar ${{ env.pkgname }}-${{ matrix.arch }}-darwin-apple
+        zip -r -9 dist/${{ env.pkgname }}-${{ matrix.arch }}-darwin-apple.zip ${{ env.pkgname }}-${{ matrix.arch }}-darwin-apple
+        7z a dist/${{ env.pkgname }}-${{ matrix.arch }}-darwin-apple.7z ${{ env.pkgname }}-${{ matrix.arch }}-darwin-apple
+        xz -c -9 -k ${{ env.pkgname }}-${{ matrix.arch }}-darwin-apple.tar > dist/${{ env.pkgname }}-${{ matrix.arch }}-darwin-apple.tar.xz
+        gzip -c -9 -k ${{ env.pkgname }}-${{ matrix.arch }}-darwin-apple.tar > dist/${{ env.pkgname }}-${{ matrix.arch }}-darwin-apple.tar.gz
+
+        cd dist
+        for i in $(ls) ; do md5sum $i > $i.md5 ; done
+        cd ..    
+    #--------------------------------------------publish--------------------------------------------
+
+    - name: ⬆️ Create release and upload assets
+      uses: softprops/action-gh-release@v1
+      with:
+        tag_name: ${{ env.tag }}
+        files: ./dist/*
+
+  build-msvc:
+
+    needs: build-dist
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { arch: amd64, msvc_arch: x64 }
+          - { arch: i386, msvc_arch: Win32 }
+          - { arch: arm64, msvc_arch: ARM64 }
+          - { arch: arm, msvc_arch: ARM }
+
+    runs-on: windows-latest
+
+    steps:
+
+      #--------------------------------------------collect--------------------------------------------
+      - name: 🧳 Set up MSVC
+        uses: microsoft/setup-msbuild@v1
+
+      - name: 🏷️ Get infomations
+        run: |
+          $tag="$env:GITHUB_REF_NAME"
+          echo "tag=$tag" >> $env:GITHUB_ENV
+          echo "pkgname=cppp-reiconv-$tag" >> $env:GITHUB_ENV
+          echo "srcdir=$($PWD.Path)" >> $env:GITHUB_ENV
+      
+      - name: 📁 Collect dependencies
+        run: |
+          choco install 7zip.commandline zip gzip dos2unix wget mingw -y
+      
+      - name: 📁 Get source distribution tarball
+        run: |
+          wget https://github.com/${{ github.repository }}/releases/download/${{ env.tag }}/${{ env.pkgname }}.tar.gz
+          tar zxvf ${{ env.pkgname }}.tar.gz
+          Move-Item -Path ${{ env.pkgname }}\* -Destination .
+      
+      - name: 🧳 Prepare for binary distribution building
+        run: |
+          mkdir dist
+
+      - name: 🛠️ Build binary distribution
+        run: |
+          mkdir build
+          cd build
+          cmake .. -DCMAKE_INSTALL_PREFIX=${{ env.srcdir }}/${{ env.pkgname }}-${{ matrix.arch }}-windows-msvc -A ${{ matrix.msvc_arch }}
+          cmake --build . --config=Release
+          cmake --install .
+          cd ..
+      
+      - name: 📦 Make packages
+        run: |
+          tar cvf ${{ env.pkgname }}-${{ matrix.arch }}-windows-msvc.tar ${{ env.pkgname }}-${{ matrix.arch }}-windows-msvc
+          zip -r -9 dist/${{ env.pkgname }}-${{ matrix.arch }}-windows-msvc.zip ${{ env.pkgname }}-${{ matrix.arch }}-windows-msvc
+          7z a dist/${{ env.pkgname }}-${{ matrix.arch }}-windows-msvc.7z ${{ env.pkgname }}-${{ matrix.arch }}-windows-msvc
+          xz -9 -k ${{ env.pkgname }}-${{ matrix.arch }}-windows-msvc.tar
+          gzip -9 -k ${{ env.pkgname }}-${{ matrix.arch }}-windows-msvc.tar
+          mv ${{ env.pkgname }}-${{ matrix.arch }}-windows-msvc.tar.xz dist
+          mv ${{ env.pkgname }}-${{ matrix.arch }}-windows-msvc.tar.gz dist
+  
+          cd dist
+          Get-ChildItem | ForEach-Object {
+            md5sum $_.Name > ($_.Name + ".md5")
+            dos2unix ($_.Name + ".md5")
+          }
+          cd ..
+      
+      #--------------------------------------------publish--------------------------------------------
+  
+      - name: ⬆️ Create release and upload assets
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: ${{ env.tag }}
+          files: ./dist/*
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 802b1ad..65187e8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,4 +1,4 @@
-name: Test
+name: ✔️ Test cppp-reiconv library
 
 on:
   release:
@@ -16,23 +16,30 @@ jobs:
     #--------------------------------------------collect--------------------------------------------
     - uses: actions/checkout@v3
     
-    - name: Collect dependencies
+    - name: 📁 Collect dependencies
       run: |
         sudo apt-get update
         sudo apt-get install gcc cmake -y
     
+    - name: 🧰 Setup build-aux
+      run: |
+        ./setup.sh
+    
     #--------------------------------------------build--------------------------------------------
-    - name: Build
+    - name: 🛠️ Build
       run : |
-        mkdir build
+        mkdir -p build
         cd build
         cmake .. -DENABLE_EXTRA=ON -DENABLE_TEST=ON
+        cmake --build .
+        cd ..
     
     #--------------------------------------------test--------------------------------------------
-    - name: Test
+    - name: ✔️ Test
       run : |
-        ctest --verbose --output-on-failure
-    
+        cd build
+        ctest --verbose
+        cd ..
     
   test-macos:
 
@@ -42,18 +49,26 @@ jobs:
     #--------------------------------------------collect--------------------------------------------
     - uses: actions/checkout@v3
     
-    - name: Collect dependencies
+    - name: 📁 Collect dependencies
       run: |
-        brew install cmake -y
+        brew install cmake
+    
+    - name: 🧰 Setup build-aux
+      run : |
+        ./setup.sh
     
     #--------------------------------------------build--------------------------------------------
-    - name: Build
+    - name: 🛠️ Build
       run : |
         mkdir build
         cd build
         cmake .. -DENABLE_EXTRA=ON -DENABLE_TEST=ON
+        cmake --build .
+        cd ..
     
     #--------------------------------------------test--------------------------------------------
-    - name: Test
+    - name: ✔️ Test
       run : |
-        ctest --verbose --output-on-failure
+        cd build
+        ctest --verbose
+        cd ..
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d72a3c..5024c59 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,10 +24,26 @@ option(ENABLE_EXTRA "Enable extra encodings and features." OFF)
 # Set C++ standard
 set(CMAKE_CXX_STANDARD 11)
 
-include("${CMAKE_SOURCE_DIR}/build-aux/cmake/cppp.cmake")
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/build-aux")
+    set(BUILD_AUX "${CMAKE_CURRENT_SOURCE_DIR}/build-aux")
+elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../build-aux")
+    set(BUILD_AUX "${CMAKE_CURRENT_SOURCE_DIR}/../build-aux")
+else()
+    message(FATAL_ERROR "CMake build-aux directory is not exists, try to execute 'setup.cmd' or './setup.sh' to get it.")
+endif()
+set(AUX_DIR "${BUILD_AUX}/cmake")
+
+message(STATUS "Using '${BUILD_AUX}' for C++ Plus build-aux directory.")
+add_subdirectory("${BUILD_AUX}")
+
+include("${AUX_DIR}/cppp.cmake")
 
 check_have_visibility()
 
+if(MSVC)
+    add_compile_options(/wd4018)
+endif()
+
 # Generate header file for build
 if(WIN32)
     set(DLL_VARIABLE "__declspec(dllexport)")
@@ -37,6 +53,7 @@ else()
     set(DLL_VARIABLE "")
 endif()
 configure_file("${srcdir}/include/cppp/reiconv.hpp.in" "${output_includedir}/cppp/reiconv.hpp")
+configure_file("${srcdir}/windows/libcppp-reiconv.rc.in" "${outdir}/windows/libcppp-reiconv.rc")
 
 # Generate header file for install
 if(WIN32)
@@ -58,7 +75,7 @@ if(ENABLE_EXTRA)
 endif()
 
 # Add library
-cppp_build_library(${PROJECT_NAME} "${srcdir}/lib/iconv.cpp" TRUE TRUE "${srcdir}/windows/libcppp-reiconv.rc")
+cppp_build_library(${PROJECT_NAME} "${srcdir}/lib/iconv.cpp" TRUE TRUE "${outdir}/windows/libcppp-reiconv.rc")
 
 # Include test suite.
 include("tests/tests.cmake")
@@ -68,14 +85,22 @@ include("tests/tests.cmake")
 # PERMISSIONS 0644
 install(TARGETS libcppp-reiconv.static
         DESTINATION "${install_staticdir}"
-        PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ )
+        PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+        LIBRARY DESTINATION "${install_shareddir}"
+        ARCHIVE DESTINATION "${install_staticdir}"
+        RUNTIME DESTINATION "${install_bindir}"
+        INCLUDES DESTINATION "${install_includedir}" )
 
 # Shared
 # PERMISSIONS 0755
 install(TARGETS libcppp-reiconv.shared
         EXPORT libcppp-reiconv-export
         DESTINATION "${install_shareddir}"
-        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
+        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+        LIBRARY DESTINATION "${install_shareddir}"
+        ARCHIVE DESTINATION "${install_staticdir}"
+        RUNTIME DESTINATION "${install_bindir}"
+        INCLUDES DESTINATION "${install_includedir}" )
 
 # Includes
 # install includes
diff --git a/ChangeLog b/ChangeLog
index 66cdc67..9025321 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+2023-07-17  ChenPi11  <wushengwuxi-msctinoulk@outlook.com>
+
+	Add social preview in README.md.
+
+2023-07-16  ChenPi11  <wushengwuxi-msctinoulk@outlook.com>
+
+	Finish GitHub build CI for Windows.
+	Fix encoding bug in Windows Resource '(C)' character.
+	Fix shared library runtime and archive install destination problem.
+
+2023-07-15  ChenPi11  <wushengwuxi-msctinoulk@outlook.com>
+
+	Fix macro bug in MSVC resource build.
+	Add GitHub build CI for Linux and macOS.
+
+2023-07-12  ChenPi11  <wushengwuxi-msctinoulk@outlook.com>
+
+	Change `int` to 'unsigned short' in canonical headers.
+	Finish GitHub CI test for Linux and macOS.
+
+2023-07-10  ChenPi11  <wushengwuxi-msctinoulk@outlook.com>
+
+	Update build-aux setup scripts.
+	Fix GitHub test CI's bug.
+
+2023-07-08  ChenPi11  <wushengwuxi-msctinoulk@outlook.com>
+
+	Add GitHub test CI.
+
 2023-07-07  ChenPi11  <wushengwuxi-msctinoulk@outlook.com>
 
 	Perfect the documents.
diff --git a/FILELIST b/FILELIST
index a09b6d5..2f7a292 100644
--- a/FILELIST
+++ b/FILELIST
@@ -551,5 +551,5 @@ FILELIST
 CPPPPKG
 cpppdist.py
 ChangeLog
-windows/libcppp-reiconv.rc
+windows/libcppp-reiconv.rc.in
 NEWS.md
diff --git a/README.md b/README.md
index 1c9625c..733b198 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+![cppp-reiconv logo](https://cppp-project.github.io/cppp-res.github.io/images/reiconv-icon.png)
+
 # cppp-reiconv
 A character set conversion library based on GNU LIBICONV.
 
diff --git a/lib/genaliases.c b/lib/genaliases.c
index e08a21d..0d19390 100644
--- a/lib/genaliases.c
+++ b/lib/genaliases.c
@@ -60,7 +60,7 @@ static void emit_encoding (FILE* out1, FILE* out2, const char* const* names, siz
       putc(c, out2);
     }
   }
-  fprintf(out2,"\")' tmp.h | sed -e 's|^.*\\(stringpool_str[0-9]*\\).*$|  (int)(long)\\&((struct stringpool_t *)0)->\\1,|'\n");
+  fprintf(out2,"\")' tmp.h | sed -e 's|^.*\\(stringpool_str[0-9]*\\).*$|  (unsigned short)(long)\\&((struct stringpool_t *)0)->\\1,|'\n");
   for (; n > 0; names++, n--)
     emit_alias(out1, *names, c_name);
 }
diff --git a/lib/genaliases2.c b/lib/genaliases2.c
index cece5f4..ea6360e 100644
--- a/lib/genaliases2.c
+++ b/lib/genaliases2.c
@@ -43,7 +43,7 @@ static void emit_alias (FILE* out1, const char* tag, const char* alias, const ch
 
 static void emit_encoding (FILE* out1, FILE* out2, const char* tag, const char* const* names, size_t n, const char* c_name)
 {
-  fprintf(out2,"  (int)(long)&((struct stringpool2_t *)0)->stringpool_%s_%u,\n",tag,counter);
+  fprintf(out2,"  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_%s_%u,\n",tag,counter);
   for (; n > 0; names++, n--)
     emit_alias(out1, tag, *names, c_name);
 }
diff --git a/lib/generated/canonical.h b/lib/generated/canonical.h
index fc552f6..7e76511 100644
--- a/lib/generated/canonical.h
+++ b/lib/generated/canonical.h
@@ -1,112 +1,112 @@
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str262,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str218,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str109,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str495,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str290,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str83,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str482,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str277,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str239,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str643,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str438,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str337,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str723,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str518,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str570,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str383,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str280,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str370,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str267,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str32,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str437,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str125,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str175,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str249,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str149,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str161,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str139,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str475,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str123,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str137,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str268,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str130,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str254,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str154,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str166,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str144,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str273,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str353,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str356,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str216,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str78,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str128,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str202,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str102,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str114,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str92,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str428,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str76,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str185,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str86,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str50,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str97,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str209,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str549,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str372,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str320,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str289,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str311,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str612,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str734,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str685,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str875,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str426,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str430,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str204,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str567,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str248,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str237,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str200,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str489,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str66,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str107,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str243,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str221,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str307,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str228,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str338,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str256,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str462,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str708,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str706,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str689,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str233,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str341,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str203,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str329,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str400,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str698,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str148,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str527,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str530,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str555,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str529,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str132,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str442,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str112,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str348,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str592,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str259,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str368,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str89,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str497,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str318,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str192,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str763,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str757,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str769,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str598,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str312,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str60,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str822,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str439,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str262,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str218,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str109,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str495,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str290,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str83,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str482,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str277,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str239,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str643,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str438,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str337,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str723,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str518,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str570,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str383,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str280,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str370,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str267,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str32,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str437,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str125,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str175,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str249,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str149,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str161,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str139,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str475,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str123,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str137,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str268,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str130,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str254,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str154,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str166,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str144,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str273,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str353,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str356,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str216,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str78,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str128,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str202,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str102,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str114,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str92,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str428,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str76,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str185,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str86,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str50,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str97,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str209,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str549,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str372,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str320,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str289,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str311,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str612,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str734,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str685,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str875,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str426,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str430,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str204,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str567,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str248,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str237,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str200,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str489,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str66,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str107,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str243,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str221,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str307,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str228,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str338,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str256,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str462,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str708,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str706,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str689,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str233,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str341,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str203,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str329,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str400,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str698,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str148,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str527,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str530,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str555,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str529,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str132,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str442,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str112,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str348,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str592,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str259,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str368,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str89,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str497,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str318,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str192,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str763,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str757,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str769,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str598,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str312,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str60,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str822,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str439,
diff --git a/lib/generated/canonical_aix.h b/lib/generated/canonical_aix.h
index 6149bc1..a842c19 100644
--- a/lib/generated/canonical_aix.h
+++ b/lib/generated/canonical_aix.h
@@ -1,9 +1,9 @@
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_aix_0,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_aix_1,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_aix_2,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_aix_3,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_aix_4,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_aix_5,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_aix_6,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_aix_10,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_aix_14,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_0,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_1,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_2,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_3,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_4,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_5,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_6,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_10,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_14,
diff --git a/lib/generated/canonical_aix_sysaix.h b/lib/generated/canonical_aix_sysaix.h
index 8b58d1f..29e7499 100644
--- a/lib/generated/canonical_aix_sysaix.h
+++ b/lib/generated/canonical_aix_sysaix.h
@@ -1,9 +1,9 @@
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_aix_0,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_aix_2,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_aix_4,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_aix_6,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_aix_8,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_aix_10,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_aix_12,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_aix_16,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_aix_20,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_0,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_2,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_4,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_6,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_8,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_10,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_12,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_16,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_20,
diff --git a/lib/generated/canonical_dos.h b/lib/generated/canonical_dos.h
index aa82651..baeecfb 100644
--- a/lib/generated/canonical_dos.h
+++ b/lib/generated/canonical_dos.h
@@ -1,15 +1,15 @@
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_0,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_4,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_5,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_8,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_12,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_13,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_17,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_21,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_22,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_26,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_31,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_35,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_38,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_42,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_47,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_0,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_4,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_5,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_8,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_12,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_13,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_17,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_21,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_22,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_26,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_31,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_35,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_38,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_42,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_47,
diff --git a/lib/generated/canonical_extra.h b/lib/generated/canonical_extra.h
index 29678a0..07998ed 100644
--- a/lib/generated/canonical_extra.h
+++ b/lib/generated/canonical_extra.h
@@ -1,7 +1,7 @@
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_extra_0,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_extra_2,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_extra_4,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_extra_6,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_extra_7,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_extra_9,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_extra_11,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_extra_0,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_extra_2,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_extra_4,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_extra_6,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_extra_7,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_extra_9,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_extra_11,
diff --git a/lib/generated/canonical_osf1.h b/lib/generated/canonical_osf1.h
index 0e134ac..a413551 100644
--- a/lib/generated/canonical_osf1.h
+++ b/lib/generated/canonical_osf1.h
@@ -1,2 +1,2 @@
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_osf1_0,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_osf1_1,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_osf1_0,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_osf1_1,
diff --git a/lib/generated/canonical_osf1_sysosf1.h b/lib/generated/canonical_osf1_sysosf1.h
index 15c2769..a877ad2 100644
--- a/lib/generated/canonical_osf1_sysosf1.h
+++ b/lib/generated/canonical_osf1_sysosf1.h
@@ -1,2 +1,2 @@
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_osf1_0,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_osf1_2,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_osf1_0,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_osf1_2,
diff --git a/lib/generated/canonical_sysaix.h b/lib/generated/canonical_sysaix.h
index 196aa78..dd820b1 100644
--- a/lib/generated/canonical_sysaix.h
+++ b/lib/generated/canonical_sysaix.h
@@ -1,112 +1,112 @@
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str430,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str437,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str299,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str668,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str547,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str263,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str650,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str529,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str409,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str806,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str685,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str588,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str957,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str836,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str801,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str471,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str918,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str453,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str900,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str64,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str576,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str134,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str186,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str380,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str150,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str154,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str130,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str530,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str166,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str170,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str322,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str142,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str388,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str158,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str162,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str138,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str81,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str507,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str513,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str268,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str88,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str140,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str334,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str104,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str108,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str84,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str484,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str120,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str250,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str110,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str54,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str175,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str519,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str812,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str543,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str578,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str849,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str249,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str878,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str614,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str488,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str997,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str667,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str387,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str408,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str701,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str407,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str600,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str548,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str127,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str183,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str176,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str506,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str421,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str277,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str274,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str49,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str57,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str458,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str735,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str767,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str697,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str420,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str545,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str89,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str189,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str638,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str466,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str237,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str710,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str595,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str621,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str594,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str184,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str169,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str181,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str562,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str992,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str256,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str280,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str19,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str593,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str272,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str252,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str684,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str666,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str674,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str333,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str198,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str106,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str673,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str270,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str430,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str437,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str299,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str668,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str547,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str263,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str650,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str529,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str409,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str806,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str685,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str588,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str957,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str836,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str801,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str471,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str918,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str453,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str900,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str64,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str576,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str134,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str186,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str380,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str150,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str154,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str130,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str530,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str166,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str170,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str322,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str142,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str388,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str158,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str162,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str138,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str81,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str507,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str513,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str268,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str88,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str140,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str334,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str104,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str108,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str84,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str484,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str120,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str250,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str110,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str54,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str175,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str519,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str812,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str543,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str578,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str849,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str249,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str878,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str614,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str488,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str997,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str667,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str387,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str408,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str701,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str407,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str600,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str548,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str127,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str183,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str176,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str506,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str421,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str277,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str274,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str49,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str57,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str458,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str735,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str767,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str697,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str420,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str545,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str89,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str189,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str638,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str466,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str237,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str710,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str595,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str621,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str594,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str184,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str169,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str181,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str562,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str992,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str256,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str280,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str19,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str593,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str272,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str252,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str684,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str666,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str674,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str333,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str198,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str106,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str673,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str270,
diff --git a/lib/generated/canonical_syshpux.h b/lib/generated/canonical_syshpux.h
index fc98ebb..607e74b 100644
--- a/lib/generated/canonical_syshpux.h
+++ b/lib/generated/canonical_syshpux.h
@@ -1,112 +1,112 @@
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str304,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str387,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str335,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str759,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str750,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str301,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str742,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str733,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str347,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str803,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str794,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str550,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str974,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str965,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str509,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str672,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str837,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str655,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str820,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str83,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str453,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str153,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str213,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str431,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str179,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str175,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str149,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str319,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str197,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str205,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str225,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str161,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str439,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str187,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str183,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str157,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str216,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str608,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str614,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str160,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str96,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str156,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str374,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str122,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str118,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str92,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str262,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str140,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str144,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str127,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str63,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str194,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str493,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str870,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str628,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str322,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str515,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str724,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str874,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str827,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str894,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str1111,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str518,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str382,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str426,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str668,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str375,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str123,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str338,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str234,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str223,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str135,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str799,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str472,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str196,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str178,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str321,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str268,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str413,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str533,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str577,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str561,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str244,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str373,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str88,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str265,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str643,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str498,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str272,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str678,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str534,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str564,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str578,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str174,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str343,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str208,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str324,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str740,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str209,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str220,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str119,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str458,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str275,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str148,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str989,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str963,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str976,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str701,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str317,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str138,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str749,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str352,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str304,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str387,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str335,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str759,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str750,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str301,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str742,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str733,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str347,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str803,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str794,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str550,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str974,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str965,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str509,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str672,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str837,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str655,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str820,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str83,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str453,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str153,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str213,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str431,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str179,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str175,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str149,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str319,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str197,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str205,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str225,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str161,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str439,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str187,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str183,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str157,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str216,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str608,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str614,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str160,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str96,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str156,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str374,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str122,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str118,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str92,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str262,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str140,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str144,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str127,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str63,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str194,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str493,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str870,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str628,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str322,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str515,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str724,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str874,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str827,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str894,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str1111,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str518,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str382,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str426,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str668,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str375,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str123,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str338,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str234,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str223,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str135,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str799,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str472,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str196,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str178,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str321,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str268,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str413,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str533,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str577,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str561,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str244,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str373,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str88,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str265,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str643,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str498,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str272,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str678,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str534,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str564,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str578,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str174,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str343,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str208,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str324,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str740,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str209,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str220,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str119,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str458,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str275,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str148,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str989,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str963,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str976,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str701,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str317,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str138,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str749,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str352,
diff --git a/lib/generated/canonical_sysosf1.h b/lib/generated/canonical_sysosf1.h
index 7df5a1d..808b58d 100644
--- a/lib/generated/canonical_sysosf1.h
+++ b/lib/generated/canonical_sysosf1.h
@@ -1,112 +1,112 @@
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str539,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str296,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str289,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str619,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str413,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str275,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str612,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str406,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str269,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str610,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str404,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str317,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str647,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str441,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str636,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str563,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str682,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str556,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str675,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str5,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str387,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str155,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str183,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str207,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str169,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str177,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str161,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str531,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str191,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str151,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str242,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str158,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str210,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str172,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str180,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str164,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str304,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str786,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str787,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str127,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str43,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str71,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str95,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str57,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str65,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str49,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str419,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str79,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str128,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str64,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str42,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str44,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str313,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str500,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str370,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str395,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str426,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str403,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str821,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str798,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str906,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str869,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str483,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str510,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str259,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str889,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str393,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str457,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str504,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str540,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str137,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str101,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str246,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str96,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str245,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str235,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str453,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str298,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str301,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str683,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str719,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str669,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str295,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str315,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str219,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str267,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str459,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str534,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str67,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str576,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str481,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str495,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str491,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str82,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str517,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str45,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str323,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str618,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str199,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str318,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str75,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str512,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str376,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str108,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str882,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str884,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str891,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str646,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str264,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str16,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str681,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str381,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str539,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str296,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str289,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str619,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str413,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str275,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str612,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str406,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str269,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str610,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str404,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str317,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str647,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str441,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str636,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str563,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str682,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str556,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str675,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str5,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str387,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str155,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str183,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str207,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str169,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str177,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str161,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str531,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str191,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str151,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str242,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str158,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str210,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str172,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str180,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str164,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str304,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str786,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str787,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str127,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str43,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str71,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str95,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str57,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str65,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str49,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str419,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str79,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str128,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str64,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str42,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str44,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str313,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str500,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str370,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str395,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str426,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str403,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str821,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str798,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str906,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str869,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str483,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str510,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str259,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str889,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str393,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str457,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str504,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str540,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str137,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str101,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str246,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str96,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str245,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str235,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str453,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str298,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str301,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str683,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str719,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str669,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str295,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str315,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str219,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str267,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str459,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str534,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str67,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str576,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str481,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str495,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str491,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str82,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str517,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str45,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str323,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str618,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str199,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str318,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str75,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str512,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str376,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str108,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str882,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str884,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str891,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str646,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str264,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str16,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str681,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str381,
diff --git a/lib/generated/canonical_syssolaris.h b/lib/generated/canonical_syssolaris.h
index d6be5ef..fd43ca2 100644
--- a/lib/generated/canonical_syssolaris.h
+++ b/lib/generated/canonical_syssolaris.h
@@ -1,112 +1,112 @@
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str227,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str261,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str173,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str484,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str447,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str257,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str526,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str489,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str256,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str571,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str534,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str338,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str649,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str612,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str553,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str450,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str754,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str492,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str796,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str26,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str556,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str51,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str61,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str199,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str145,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str55,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str53,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str351,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str59,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str73,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str110,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str52,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str200,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str146,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str56,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str54,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str210,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str276,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str318,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str72,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str14,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str24,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str162,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str108,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str18,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str16,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str314,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str22,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str70,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str21,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str13,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str81,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str296,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str568,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str377,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str283,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str410,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str418,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str529,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str584,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str509,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str786,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str430,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str215,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str275,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str641,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str247,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str385,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str605,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str144,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str246,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str131,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str505,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str229,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str163,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str254,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str308,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str255,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str417,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str595,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str603,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str576,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str262,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str327,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str76,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str219,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str583,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str678,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str101,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str570,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str427,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str432,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str502,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str105,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str310,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str93,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str263,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str554,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str92,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str96,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str58,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str378,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str271,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str77,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str883,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str872,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str919,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str670,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str278,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str86,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str668,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str265,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str227,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str261,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str173,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str484,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str447,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str257,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str526,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str489,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str256,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str571,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str534,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str338,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str649,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str612,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str553,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str450,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str754,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str492,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str796,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str26,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str556,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str51,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str61,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str199,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str145,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str55,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str53,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str351,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str59,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str73,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str110,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str52,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str200,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str146,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str56,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str54,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str210,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str276,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str318,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str72,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str14,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str24,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str162,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str108,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str18,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str16,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str314,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str22,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str70,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str21,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str13,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str81,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str296,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str568,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str377,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str283,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str410,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str418,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str529,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str584,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str509,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str786,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str430,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str215,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str275,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str641,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str247,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str385,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str605,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str144,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str246,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str131,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str505,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str229,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str163,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str254,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str308,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str255,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str417,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str595,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str603,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str576,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str262,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str327,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str76,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str219,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str583,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str678,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str101,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str570,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str427,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str432,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str502,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str105,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str310,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str93,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str263,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str554,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str92,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str96,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str58,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str378,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str271,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str77,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str883,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str872,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str919,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str670,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str278,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str86,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str668,
+  (unsigned short)(long)&((struct stringpool_t *)0)->stringpool_str265,
diff --git a/lib/generated/canonical_zos.h b/lib/generated/canonical_zos.h
index bb9ff7e..a2cda3c 100644
--- a/lib/generated/canonical_zos.h
+++ b/lib/generated/canonical_zos.h
@@ -1,53 +1,53 @@
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_0,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_8,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_12,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_17,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_23,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_28,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_30,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_35,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_40,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_45,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_50,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_55,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_57,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_63,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_67,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_73,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_78,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_82,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_87,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_92,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_99,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_102,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_106,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_110,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_113,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_116,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_119,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_122,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_125,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_128,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_131,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_138,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_145,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_153,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_161,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_168,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_175,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_182,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_189,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_196,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_203,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_206,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_209,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_212,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_215,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_218,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_221,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_224,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_227,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_229,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_232,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_235,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_zos_238,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_0,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_8,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_12,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_17,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_23,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_28,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_30,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_35,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_40,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_45,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_50,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_55,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_57,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_63,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_67,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_73,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_78,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_82,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_87,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_92,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_99,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_102,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_106,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_110,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_113,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_116,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_119,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_122,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_125,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_128,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_131,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_138,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_145,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_153,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_161,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_168,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_175,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_182,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_189,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_196,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_203,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_206,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_209,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_212,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_215,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_218,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_221,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_224,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_227,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_229,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_232,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_235,
+  (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_zos_238,
diff --git a/setup.cmd b/setup.cmd
index 70ceefb..21bbdf8 100644
--- a/setup.cmd
+++ b/setup.cmd
@@ -31,7 +31,6 @@ if exist ..\build-aux (
 )
 
 echo Notice: '..\build-aux' for C++ Plus are not exists, cloning it......
-echo Notice: It will be cloned to '.\build-aux' and ignored by '.gitignore', if you 'git clean' this project, The '.\build-aux' may be deleted, and you will need to rerun this script to adapt to your environment at that time.
 git clone https://github.com/cppp-project/build-aux
 if %errorlevel%==0 (
     echo Success: '.\build-aux' cloned successfully, please don't remove it, and you can develop this package normally.
diff --git a/setup.sh b/setup.sh
index 2082103..a6b5997 100755
--- a/setup.sh
+++ b/setup.sh
@@ -48,7 +48,6 @@ then
 fi
 
 text_out 0 "Notice" "'../build-aux' for C++ Plus are not exists, cloning it......"
-text_out 0 "Notice" "It will be cloned to './build-aux' and ignored by '.gitignore', if you 'git clean' this project, The './build-aux' may be deleted, and you will need to rerun this script to adapt to your environment at that time."
 execute "git clone https://github.com/cppp-project/build-aux"
 if [ $? -eq 0 ]
 then
diff --git a/windows/libcppp-reiconv.rc b/windows/libcppp-reiconv.rc.in
similarity index 82%
rename from windows/libcppp-reiconv.rc
rename to windows/libcppp-reiconv.rc.in
index 3601005..b87c0d1 100644
--- a/windows/libcppp-reiconv.rc
+++ b/windows/libcppp-reiconv.rc.in
@@ -2,6 +2,11 @@
 
 #include <winver.h>
 
+#define PROJECT_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
+#define PROJECT_VERSION_MINOR @PROJECT_VERSION_MINOR@
+#define PROJECT_VERSION_PATCH @PROJECT_VERSION_PATCH@
+#define PROJECT_VERSION "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@"
+
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION PROJECT_VERSION_MAJOR,PROJECT_VERSION_MINOR,PROJECT_VERSION_PATCH,0
  PRODUCTVERSION PROJECT_VERSION_MAJOR,PROJECT_VERSION_MINOR,PROJECT_VERSION_PATCH,0
@@ -24,7 +29,7 @@ BEGIN
             VALUE "FileDescription", "LGPLed cppp-reiconv for Windows\0"
             VALUE "FileVersion", PROJECT_VERSION "\0"
             VALUE "InternalName", "libcppp-reiconv.dll\0"
-            VALUE "LegalCopyright", "Copyright © 2023\0"
+            VALUE "LegalCopyright", "Copyright (C) 2023\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "libcppp-reiconv.dll\0"
             VALUE "ProductName", "cppp-reiconv: character set conversion library\0"