diff --git a/include/haproxy/api-t.h b/include/haproxy/api-t.h
index 501f4ad54..e82f54b65 100644
--- a/include/haproxy/api-t.h
+++ b/include/haproxy/api-t.h
@@ -32,8 +32,8 @@
 #include <inttypes.h>
 #include <stddef.h>
 
-#include <common/compat.h>
-#include <common/compiler.h>
-#include <common/defaults.h>
+#include <haproxy/compat.h>
+#include <haproxy/compiler.h>
+#include <haproxy/defaults.h>
 
 #endif /* _HAPROXY_TYPES_H */
diff --git a/include/haproxy/api.h b/include/haproxy/api.h
index 66165b130..5a916ba44 100644
--- a/include/haproxy/api.h
+++ b/include/haproxy/api.h
@@ -30,7 +30,7 @@
 #ifndef _HAPROXY_BASE_H
 #define _HAPROXY_BASE_H
 
-#include <common/initcall.h>
+#include <haproxy/initcall.h>
 #include <haproxy/api-t.h>
 
 #endif
diff --git a/include/common/compat.h b/include/haproxy/compat.h
similarity index 97%
rename from include/common/compat.h
rename to include/haproxy/compat.h
index 34fbac5db..251dfb202 100644
--- a/include/common/compat.h
+++ b/include/haproxy/compat.h
@@ -1,8 +1,8 @@
 /*
- * include/common/compat.h
+ * include/haproxy/compat.h
  * Operating system compatibility interface.
  *
- * Copyright (C) 2000-2010 Willy Tarreau - w@1wt.eu
+ * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _COMMON_COMPAT_H
-#define _COMMON_COMPAT_H
+#ifndef _HAPROXY_COMPAT_H
+#define _HAPROXY_COMPAT_H
 
 #include <limits.h>
 #include <signal.h>
@@ -235,7 +235,7 @@ typedef struct { } empty_t;
 #endif
 #endif
 
-#endif /* _COMMON_COMPAT_H */
+#endif /* _HAPROXY_COMPAT_H */
 
 /*
  * Local variables:
diff --git a/include/common/compiler.h b/include/haproxy/compiler.h
similarity index 97%
rename from include/common/compiler.h
rename to include/haproxy/compiler.h
index 5578a58bc..a0d456985 100644
--- a/include/common/compiler.h
+++ b/include/haproxy/compiler.h
@@ -1,8 +1,8 @@
 /*
- * include/common/compiler.h
+ * include/haproxy/compiler.h
  * This files contains some compiler-specific settings.
  *
- * Copyright (C) 2000-2009 Willy Tarreau - w@1wt.eu
+ * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef _COMMON_COMPILER_H
-#define _COMMON_COMPILER_H
+#ifndef _HAPROXY_COMPILER_H
+#define _HAPROXY_COMPILER_H
 
 
 /*
@@ -200,4 +200,4 @@
 #endif
 #endif
 
-#endif /* _COMMON_COMPILER_H */
+#endif /* _HAPROXY_COMPILER_H */
diff --git a/include/common/defaults.h b/include/haproxy/defaults.h
similarity index 98%
rename from include/common/defaults.h
rename to include/haproxy/defaults.h
index aeddb0108..165c78b8e 100644
--- a/include/common/defaults.h
+++ b/include/haproxy/defaults.h
@@ -1,8 +1,8 @@
 /*
- * include/common/defaults.h
+ * include/haproxy/defaults.h
  * Miscellaneous default values.
  *
- * Copyright (C) 2000-2010 Willy Tarreau - w@1wt.eu
+ * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _COMMON_DEFAULTS_H
-#define _COMMON_DEFAULTS_H
+#ifndef _HAPROXY_DEFAULTS_H
+#define _HAPROXY_DEFAULTS_H
 
 /* MAX_PROCS defines the highest limit for the global "nbproc" value. It
  * defaults to the number of bits in a long integer but may be lowered to save
@@ -347,4 +347,4 @@
 #define DEFAULT_PAT_LRU_SIZE 10000
 #endif
 
-#endif /* _COMMON_DEFAULTS_H */
+#endif /* _HAPROXY_DEFAULTS_H */
diff --git a/include/common/initcall.h b/include/haproxy/initcall.h
similarity index 98%
rename from include/common/initcall.h
rename to include/haproxy/initcall.h
index 6da752ce6..eb7369b93 100644
--- a/include/common/initcall.h
+++ b/include/haproxy/initcall.h
@@ -1,9 +1,9 @@
 /*
- * include/common/initcall.h
+ * include/haproxy/initcall.h
  *
  * Initcall management.
  *
- * Copyright (C) 2018 Willy Tarreau - w@1wt.eu
+ * Copyright (C) 2018-2020 Willy Tarreau - w@1wt.eu
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -26,8 +26,8 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef _COMMON_INIT_H
-#define _COMMON_INIT_H
+#ifndef _HAPROXY_INITCALL_H
+#define _HAPROXY_INITCALL_H
 
 /* List of known init stages. If others are added, please declare their
  * section at the end of the file below.
@@ -258,7 +258,7 @@ extern struct initcall *__initstg[STG_SIZE];
 
 #endif // USE_OBSOLETE_LINKER
 
-#endif /* _COMMON_INIT_H */
+#endif /* _HAPROXY_INITCALL_H */
 
 /*
  * Local variables: