diff --git a/include/boost/unordered/detail/fca.hpp b/include/boost/unordered/detail/fca.hpp
index 1f733db2..694ae9d8 100644
--- a/include/boost/unordered/detail/fca.hpp
+++ b/include/boost/unordered/detail/fca.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2022-2024 Joaquin M Lopez Munoz.
+// Copyright (C) 2022-2025 Joaquin M Lopez Munoz.
 // Copyright (C) 2022 Christian Mazakas
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -134,11 +134,37 @@ namespace boost {
   namespace unordered {
     namespace detail {
 
+      template <class ValueType, class VoidPtr> struct node;
+
+      // access to node::value_type and node::pointer for incomplete node
+
+      template<class Node> struct node_value_type_impl;
+
+      template <class ValueType, class VoidPtr>
+      struct node_value_type_impl<node<ValueType, VoidPtr>>
+      {
+        typedef ValueType type;
+      };
+
+      template<class Node> using node_value_type = 
+        typename node_value_type_impl<Node>::type;
+
+      template<class Node> struct node_pointer_impl;
+
+      template <class ValueType, class VoidPtr>
+      struct node_pointer_impl<node<ValueType, VoidPtr>>
+      {
+        typedef typename boost::pointer_traits<VoidPtr>::template rebind_to<
+          node<ValueType, VoidPtr>>::type type;
+      };
+
+      template<class Node> using node_pointer = 
+        typename node_pointer_impl<Node>::type;
+
       template <class ValueType, class VoidPtr> struct node
       {
-        typedef ValueType value_type;
-        typedef typename boost::pointer_traits<VoidPtr>::template rebind_to<
-          node>::type node_pointer;
+        typedef node_value_type<node> value_type;
+        typedef detail::node_pointer<node> node_pointer;
 
         node_pointer next;
         opt_storage<value_type> buf;
@@ -304,10 +330,10 @@ namespace boost {
 
       template <class Node> struct grouped_local_bucket_iterator
       {
-        typedef typename Node::node_pointer node_pointer;
+        typedef detail::node_pointer<Node> node_pointer;
 
       public:
-        typedef typename Node::value_type value_type;
+        typedef detail::node_value_type<Node> value_type;
         typedef value_type element_type;
         typedef value_type* pointer;
         typedef value_type& reference;
@@ -370,10 +396,10 @@ namespace boost {
 
       template <class Node> struct const_grouped_local_bucket_iterator
       {
-        typedef typename Node::node_pointer node_pointer;
+        typedef detail::node_pointer<Node> node_pointer;
 
       public:
-        typedef typename Node::value_type const value_type;
+        typedef detail::node_value_type<Node> const value_type;
         typedef value_type const element_type;
         typedef value_type const* pointer;
         typedef value_type const& reference;
diff --git a/include/boost/unordered/detail/implementation.hpp b/include/boost/unordered/detail/implementation.hpp
index 27e88187..214243b1 100644
--- a/include/boost/unordered/detail/implementation.hpp
+++ b/include/boost/unordered/detail/implementation.hpp
@@ -969,7 +969,7 @@ namespace boost {
         template <class Node, class Bucket> class iterator
         {
         public:
-          typedef typename Node::value_type value_type;
+          typedef typename detail::node_value_type<Node> value_type;
           typedef value_type element_type;
           typedef value_type* pointer;
           typedef value_type& reference;
@@ -1023,7 +1023,7 @@ namespace boost {
           }
 
         private:
-          typedef typename Node::node_pointer node_pointer;
+          typedef detail::node_pointer<Node> node_pointer;
           typedef grouped_bucket_iterator<Bucket> bucket_iterator;
 
           node_pointer p;
@@ -1076,7 +1076,7 @@ namespace boost {
         template <class Node, class Bucket> class c_iterator
         {
         public:
-          typedef typename Node::value_type value_type;
+          typedef typename detail::node_value_type<Node> value_type;
           typedef value_type const element_type;
           typedef value_type const* pointer;
           typedef value_type const& reference;
@@ -1131,7 +1131,7 @@ namespace boost {
           }
 
         private:
-          typedef typename Node::node_pointer node_pointer;
+          typedef detail::node_pointer<Node> node_pointer;
           typedef grouped_bucket_iterator<Bucket> bucket_iterator;
 
           node_pointer p;
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 83935fe8..38ee478c 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -362,6 +362,7 @@ local CFOA_TESTS =
   pmr_allocator_tests
   stats_tests
   node_handle_allocator_tests
+  incomplete_tests
 ;
 
 for local test in $(CFOA_TESTS)
diff --git a/test/cfoa/incomplete_tests.cpp b/test/cfoa/incomplete_tests.cpp
new file mode 100644
index 00000000..711362a7
--- /dev/null
+++ b/test/cfoa/incomplete_tests.cpp
@@ -0,0 +1,6 @@
+// Copyright 2025 Joaquin M Lopez Munoz.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#define BOOST_UNORDERED_CFOA_TESTS
+#include "../unordered/incomplete_test.cpp"
diff --git a/test/unordered/incomplete_test.cpp b/test/unordered/incomplete_test.cpp
index ec6f3d64..4a005be3 100644
--- a/test/unordered/incomplete_test.cpp
+++ b/test/unordered/incomplete_test.cpp
@@ -1,17 +1,28 @@
 
 // Copyright 2009 Daniel James.
 // Copyright 2022-2023 Christian Mazakas.
+// Copyright 2025 Joaquin M Lopez Munoz
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "../helpers/unordered.hpp"
+#ifdef BOOST_UNORDERED_CFOA_TESTS
+#include <boost/unordered/concurrent_flat_set.hpp>
+#include <boost/unordered/concurrent_flat_map.hpp>
+#include <boost/unordered/concurrent_node_map.hpp>
+#include <boost/unordered/concurrent_node_set.hpp>
+#endif
+
 
 #include <utility>
 
 namespace x {
   struct D
   {
-#ifdef BOOST_UNORDERED_FOA_TESTS
+#if defined(BOOST_UNORDERED_CFOA_TESTS)
+    boost::concurrent_flat_map<D, D> x;
+    boost::concurrent_node_map<D, D> y;
+#elif defined(BOOST_UNORDERED_FOA_TESTS)
     boost::unordered_flat_map<D, D> x;
     boost::unordered_node_map<D, D> y;
 #else
@@ -30,26 +41,36 @@ namespace incomplete_test {
 
   // Declare some instances
 
-#ifdef BOOST_UNORDERED_FOA_TESTS
+#if defined(BOOST_UNORDERED_CFOA_TESTS)
+  typedef boost::concurrent_flat_map<value, value, hash, equals,
+    allocator<std::pair<value const, value> > >
+    map1;
+  typedef boost::concurrent_flat_set<value, hash, equals, allocator<value> > set1;
+  typedef boost::concurrent_node_map<value, value, hash, equals,
+    allocator<std::pair<value const, value> > >
+    map2;
+  typedef boost::concurrent_node_set<value, hash, equals, allocator<value> >
+    set2;
+#elif defined(BOOST_UNORDERED_FOA_TESTS)
   typedef boost::unordered_flat_map<value, value, hash, equals,
     allocator<std::pair<value const, value> > >
-    map;
-  typedef boost::unordered_flat_set<value, hash, equals, allocator<value> > set;
+    map1;
+  typedef boost::unordered_flat_set<value, hash, equals, allocator<value> > set1;
   typedef boost::unordered_node_map<value, value, hash, equals,
     allocator<std::pair<value const, value> > >
-    multimap;
+    map2;
   typedef boost::unordered_node_set<value, hash, equals, allocator<value> >
-    multiset;
+    set2;
 #else
   typedef boost::unordered_map<value, value, hash, equals,
     allocator<std::pair<value const, value> > >
-    map;
+    map1;
   typedef boost::unordered_multimap<value, value, hash, equals,
     allocator<std::pair<value const, value> > >
-    multimap;
-  typedef boost::unordered_set<value, hash, equals, allocator<value> > set;
+    map2;
+  typedef boost::unordered_set<value, hash, equals, allocator<value> > set1;
   typedef boost::unordered_multiset<value, hash, equals, allocator<value> >
-    multiset;
+    set2;
 #endif
 
   // Now define the types which are stored as members, as they are needed for
@@ -132,24 +153,60 @@ namespace incomplete_test {
     boost::unordered_multiset<struct4, hash, equals, allocator<struct4> > x;
   };
 #endif
-  // Now define the value type.
-
-  struct value
-  {
-  };
 
   // Create some instances.
 
-  incomplete_test::map m1;
-  incomplete_test::multimap m2;
-  incomplete_test::set s1;
-  incomplete_test::multiset s2;
+  incomplete_test::map1 m1;
+#ifndef BOOST_UNORDERED_CFOA_TESTS
+  incomplete_test::map1::iterator itm1;
+  incomplete_test::map1::const_iterator citm1;
+#ifndef BOOST_UNORDERED_FOA_TESTS
+  incomplete_test::map1::local_iterator litm1;
+  incomplete_test::map1::const_local_iterator clitm1;
+#endif
+#endif
+
+  incomplete_test::map2 m2;
+#ifndef BOOST_UNORDERED_CFOA_TESTS
+  incomplete_test::map2::iterator itm2;
+  incomplete_test::map2::const_iterator citm2;
+#ifndef BOOST_UNORDERED_FOA_TESTS
+  incomplete_test::map2::local_iterator litm2;
+  incomplete_test::map2::const_local_iterator clitm2;
+#endif
+#endif
+
+  incomplete_test::set1 s1;
+#ifndef BOOST_UNORDERED_CFOA_TESTS
+  incomplete_test::set1::iterator its1;
+  incomplete_test::set1::const_iterator cits1;
+#ifndef BOOST_UNORDERED_FOA_TESTS
+  incomplete_test::set1::local_iterator lits1;
+  incomplete_test::set1::const_local_iterator clits1;
+#endif
+#endif
+
+  incomplete_test::set2 s2;
+#ifndef BOOST_UNORDERED_CFOA_TESTS
+  incomplete_test::set2::iterator its2;
+  incomplete_test::set2::const_iterator cits2;
+#ifndef BOOST_UNORDERED_FOA_TESTS
+  incomplete_test::set2::local_iterator lits2;
+  incomplete_test::set2::const_local_iterator clits2;
+#endif
+#endif
 
   incomplete_test::struct1 c1;
   incomplete_test::struct2 c2;
   incomplete_test::struct3 c3;
   incomplete_test::struct4 c4;
 
+  // Now define the value type.
+
+  struct value
+  {
+  };
+
   // Now declare, but don't define, the operators required for comparing
   // elements.
 
@@ -171,11 +228,45 @@ namespace incomplete_test {
   void use_types()
   {
     incomplete_test::value x;
-    m1[x] = x;
-    m2.insert(std::make_pair(x, x));
-    s1.insert(x);
-    s2.insert(x);
+    m1.insert(std::make_pair(x, x));
+#ifndef BOOST_UNORDERED_CFOA_TESTS
+    itm1 = m1.begin();
+    citm1 = m1.cbegin();
+#ifndef BOOST_UNORDERED_FOA_TESTS
+    litm1 = m1.begin(0);
+    clitm1 = m1.cbegin(0);
+#endif
+#endif
 
+    m2.insert(std::make_pair(x, x));
+#ifndef BOOST_UNORDERED_CFOA_TESTS
+    itm2 = m2.begin();
+    citm2 = m2.cbegin();
+#ifndef BOOST_UNORDERED_FOA_TESTS
+    litm2 = m2.begin(0);
+    clitm2 = m2.cbegin(0);
+#endif
+#endif
+
+    s1.insert(x);
+#ifndef BOOST_UNORDERED_CFOA_TESTS
+    its1 = s1.begin();
+    cits1 = s1.cbegin();
+#ifndef BOOST_UNORDERED_FOA_TESTS
+    lits1 = s1.begin(0);
+    clits1 = s1.cbegin(0);
+#endif
+#endif
+
+    s2.insert(x);
+#ifndef BOOST_UNORDERED_CFOA_TESTS
+    its2 = s2.begin();
+    cits2 = s2.cbegin();
+#ifndef BOOST_UNORDERED_FOA_TESTS
+    lits2 = s2.begin(0);
+    clits2 = s2.cbegin(0);
+#endif
+#endif
     c1.x.insert(std::make_pair(c1, c1));
     c2.x.insert(std::make_pair(c2, c2));
     c3.x.insert(c3);