2 files changed, 6 insertions, 2 deletions
diff --git a/hl/c++/src/H5PacketTable.cpp b/hl/c++/src/H5PacketTable.cpp
index 59730e0..0cfdb59 100644
--- a/hl/c++/src/H5PacketTable.cpp
+++ b/hl/c++/src/H5PacketTable.cpp
@@ -120,7 +120,7 @@
         if( H5PTis_varlen(table_id) != 0 )    // If this is not a fixed-length table
         {
             H5PTclose(table_id);
-            table_id = NULL;
+            table_id = -1;
         }
     }
 
@@ -216,7 +216,7 @@
         if( H5PTis_varlen(table_id) != 1 )    // If this is not a variable-length table
         {
             H5PTclose(table_id);
-            table_id = NULL;
+            table_id = -1;
         }
     }
 
diff --git a/hl/c++/src/H5PacketTable.h b/hl/c++/src/H5PacketTable.h
index 71c9de5..bd3d166 100644
--- a/hl/c++/src/H5PacketTable.h
+++ b/hl/c++/src/H5PacketTable.h
@@ -23,7 +23,11 @@
 #ifndef H5PTWRAP_H
 #define H5PTWRAP_H
 
+/* High-level library internal header file */
+#include "H5HLprivate2.h"
+
 #include "H5PTpublic.h"
+#include "H5api_adpt.h"
 
 class H5_HLCPPDLL  PacketTable
 {