diff --git a/public_header.py b/public_header.py
index 595ebd8..d5c5f45 100644
--- a/public_header.py
+++ b/public_header.py
@@ -91,10 +91,16 @@ destination   = current_path.joinpath('include/library/public')
 if os.path.isdir(destination) == False:
   os.mkdir(destination)
 
-header_files = [f for f in os.listdir(source) if os.path.isfile(os.path.join(source, f))]
-header_files.remove('prim_types_double.h')
-header_files.remove('prim_types_single.h')
-print(header_files)
+include_files = ['macros.h', 'constants.h', 'dwt.h', 'tagtree.h', 'mq_types.h', 'mq.h',
+                'bitstream.h', 'codestream.h', 'tier1.h', 'tier2.h', 'types.h', 'libbwc.h']
+exclude_files = ["prim_types_double.h", "prim_types_single.h"]
+all_files = [f for f in os.listdir(source) if os.path.isfile(os.path.join(source, f))]
+missing_files = [f for f in all_files if f not in include_files and f not in exclude_files]
+if missing_files:
+  raise Warning("Consider updating public_header.py. Missing header file(s)"
+               f"\n{missing_files}\n"
+                "should be added to include_files or exclude_files lists.")
+print(include_files)
 
 #----------------------------------------------------------#
 # Create the I/O stream and write the bwc file header.     #
@@ -213,7 +219,7 @@ printFlg    = False
 buff        = ""
 brktCnt     = 0
 
-for file in header_files:
+for file in include_files:
   with open(source.joinpath(file)) as f:
     for line in f:
       if("BWC_" in line):
@@ -250,7 +256,7 @@ public_header.write(ubox + tab + sbox + lspaces * " " + "____ ____ _  _ ____ ___
 delimFlg    = False
 buff        = ""
 
-for file in header_files:
+for file in include_files:
   with open(source.joinpath(file)) as f:
     for line in f:
       if("typedef enum" in line):
@@ -288,7 +294,7 @@ preProcFlg  = False
 buff        = ""
 brktCnt     = 0
 
-for file in header_files:
+for file in include_files:
   with open(source.joinpath(file)) as f:
     for line in f:
       if("typedef struct" in line or
@@ -311,6 +317,7 @@ for file in header_files:
             public_header.write(deliminator)
           public_header.write(buff)
           delimFlg = True
+        printFlg = False
         buff = ""
 
   f.close
diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt
index d760a60..549453e 100755
--- a/src/library/CMakeLists.txt
+++ b/src/library/CMakeLists.txt
@@ -57,7 +57,13 @@ if("${PREC}" STREQUAL "Single")
 endif()
 
 execute_process(COMMAND python3 public_header.py ${PYTHON_ARGUMENT}
-                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+                RESULT_VARIABLE result
+                ERROR_VARIABLE error_output)
+
+if(result)
+  message(WARNING "Public header generation failed: ${error_output}")
+endif()
 
 #----------------------------------------------------------#
 # Set the linking type according to user choice and add    #