diff --git a/lib/com_err/com_err.h b/lib/com_err/com_err.h
index 1fcfe7f7a..5b8b7e28f 100644
--- a/lib/com_err/com_err.h
+++ b/lib/com_err/com_err.h
@@ -45,26 +45,6 @@
 #define __attribute__(X)
 #endif
 
-#ifndef KRB5_LIB
-#ifndef KRB5_LIB_FUNCTION
-#if defined(_WIN32)
-#define KRB5_LIB_FUNCTION __declspec(dllimport)
-#define KRB5_LIB_CALL __stdcall
-#define KRB5_LIB_VARIABLE __declspec(dllimport)
-#else
-#define KRB5_LIB_FUNCTION
-#define KRB5_LIB_CALL
-#define KRB5_LIB_VARIABLE
-#endif
-#endif
-#endif
-
-#ifdef _WIN32
-#define KRB5_CALLCONV __stdcall
-#else
-#define KRB5_CALLCONV
-#endif
-
 typedef void (KRB5_CALLCONV *errf) (const char *, long, const char *, va_list);
 
 KRB5_LIB_FUNCTION const char * KRB5_LIB_CALL
diff --git a/lib/com_err/com_right.h b/lib/com_err/com_right.h
index e13855aba..7f4114565 100644
--- a/lib/com_err/com_right.h
+++ b/lib/com_err/com_right.h
@@ -36,6 +36,26 @@
 #ifndef __COM_RIGHT_H__
 #define __COM_RIGHT_H__
 
+#ifndef KRB5_LIB
+#ifndef KRB5_LIB_FUNCTION
+#if defined(_WIN32)
+#define KRB5_LIB_FUNCTION __declspec(dllimport)
+#define KRB5_LIB_CALL __stdcall
+#define KRB5_LIB_VARIABLE __declspec(dllimport)
+#else
+#define KRB5_LIB_FUNCTION
+#define KRB5_LIB_CALL
+#define KRB5_LIB_VARIABLE
+#endif
+#endif
+#endif
+
+#ifdef _WIN32
+#define KRB5_CALLCONV __stdcall
+#else
+#define KRB5_CALLCONV
+#endif
+
 #ifdef __STDC__
 #include <stdarg.h>
 #endif