diff --git a/project/config/cfgdefs.sh b/project/config/cfgdefs.sh
index 4b5fab9..ec48f1d 100644
--- a/project/config/cfgdefs.sh
+++ b/project/config/cfgdefs.sh
@@ -301,7 +301,7 @@ cfgdefs_perform_common_tests()
 
 	# <panel.h>
 	if [ _${mb_panel_wrapper:-} = _yes ]; then
-		cfgtest_makevar_append '-I$(PROJECT_DIR)/wrappers'
+		cfgtest_makevar_append '-I$(PROJECT_DIR)/wrappers/ncurses'
 		unset mb_panel_wrapper
 	fi
 
diff --git a/wrappers/ncurses/panel.h b/wrappers/ncurses/panel.h
new file mode 100644
index 0000000..307a4e6
--- /dev/null
+++ b/wrappers/ncurses/panel.h
@@ -0,0 +1,7 @@
+#ifdef HAVE_NCURSESW_PANEL_H
+#include <ncursesw/panel.h>
+#else
+#ifdef HAVE_NCURSES_PANEL_H
+#include <ncurses/panel.h>
+#endif
+#endif
diff --git a/wrappers/ncurses/term.h b/wrappers/ncurses/term.h
new file mode 100644
index 0000000..426c296
--- /dev/null
+++ b/wrappers/ncurses/term.h
@@ -0,0 +1,7 @@
+#ifdef HAVE_NCURSESW_PANEL_H
+#include <ncursesw/term.h>
+#else
+#ifdef HAVE_NCURSES_PANEL_H
+#include <ncurses/term.h>
+#endif
+#endif
diff --git a/wrappers/panel.h b/wrappers/panel.h
deleted file mode 100644
index 307a4e6..0000000
--- a/wrappers/panel.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifdef HAVE_NCURSESW_PANEL_H
-#include <ncursesw/panel.h>
-#else
-#ifdef HAVE_NCURSES_PANEL_H
-#include <ncurses/panel.h>
-#endif
-#endif
diff --git a/wrappers/term.h b/wrappers/term.h
deleted file mode 100644
index 426c296..0000000
--- a/wrappers/term.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifdef HAVE_NCURSESW_PANEL_H
-#include <ncursesw/term.h>
-#else
-#ifdef HAVE_NCURSES_PANEL_H
-#include <ncurses/term.h>
-#endif
-#endif