diff --git a/src/MAX_ELF_HDR.h b/src/MAX_ELF_HDR.h
deleted file mode 100644
index a0501451..00000000
--- a/src/MAX_ELF_HDR.h
+++ /dev/null
@@ -1,2 +0,0 @@
-static unsigned const MAX_ELF_HDR_32(512);
-static unsigned const MAX_ELF_HDR_64(1024);
diff --git a/src/check/dt_check.cpp b/src/check/dt_check.cpp
index 46d8b400..cf268f3c 100644
--- a/src/check/dt_check.cpp
+++ b/src/check/dt_check.cpp
@@ -83,7 +83,7 @@ int upx_doctest_check() { return upx_doctest_check(0, nullptr); }
 // compile-time checks
 **************************************************************************/
 
-// need extra paranthesis because the C preprocessor does not understand C++ templates
+// need extra parenthesis because the C preprocessor does not understand C++ templates
 ACC_COMPILE_TIME_ASSERT_HEADER((std::is_same<short, upx_int16_t>::value))
 ACC_COMPILE_TIME_ASSERT_HEADER((std::is_same<unsigned short, upx_uint16_t>::value))
 ACC_COMPILE_TIME_ASSERT_HEADER((std::is_same<int, upx_int32_t>::value))
diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp
index ddda5f7c..16031a04 100644
--- a/src/p_lx_elf.cpp
+++ b/src/p_lx_elf.cpp
@@ -52,7 +52,9 @@
 #define PT_GNU_RELRO32  Elf32_Phdr::PT_GNU_RELRO
 #define PT_GNU_RELRO64  Elf64_Phdr::PT_GNU_RELRO
 
-#include "MAX_ELF_HDR.h"
+// also see stub/src/MAX_ELF_HDR.[Sc]
+static constexpr unsigned MAX_ELF_HDR_32 = 512;
+static constexpr unsigned MAX_ELF_HDR_64 = 1024;
 
 //static unsigned const EF_ARM_HASENTRY = 0x02;
 static unsigned const EF_ARM_EABI_VER4 = 0x04000000;