diff --git a/src/include/gen/autoconfig_msvc.h b/src/include/gen/autoconfig_msvc.h
index 872850f97b..9a2d55899c 100644
--- a/src/include/gen/autoconfig_msvc.h
+++ b/src/include/gen/autoconfig_msvc.h
@@ -247,7 +247,7 @@
 #undef NETBSD
 #undef sun
 #undef SOLARIS
-#undef hpux
+#undef HPUX
 #undef VMS
 #undef AIX
 #define WIN_NT
diff --git a/src/jrd/common.h b/src/jrd/common.h
index 0e96f0a758..1ab08cb9ce 100644
--- a/src/jrd/common.h
+++ b/src/jrd/common.h
@@ -481,11 +481,7 @@ static inline int sinixz_sigaction(int sig, const struct sinixz_sigaction *act,
 * HP/UX platforms 
 *****************************************************/
 
-#if (defined(hpux) || defined(HPUX))
-
-#ifndef hpux
-#define hpux
-#endif
+#ifdef HPUX
 
 //#define KILLER_SIGNALS
 #define UNIX
@@ -516,7 +512,7 @@ static inline int sinixz_sigaction(int sig, const struct sinixz_sigaction *act,
 
 #define RISC_ALIGNMENT
 
-#endif /* hpux */
+#endif /* HPUX */
 
 
 /*****************************************************
diff --git a/src/jrd/isc_file.cpp b/src/jrd/isc_file.cpp
index bc026d605d..392b0d6048 100644
--- a/src/jrd/isc_file.cpp
+++ b/src/jrd/isc_file.cpp
@@ -1768,7 +1768,7 @@ static bool get_server(tstring&, tstring& node_name)
 	return true;
 }
 #endif
-#endif // hpux
+#endif // HPUX
 #endif // NO_NFS
 } // anonymous namespace