diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38ad60262..916073ce3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,6 +34,6 @@ SET(EXECUTABLE_OUTPUT_PATH ${CMake_BINARY_DIR}/Source CACHE PATH
   "Where to put the executables for CMake"
 )
 
-INCLUDE_REGULAR_EXPRESSION("^(\\.\\./)?(cm|FLTK|CMake).*")
+INCLUDE_REGULAR_EXPRESSION("^(\\.\\./)?(cm|FLTK|CMake|form).*")
 
 
diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt
index 336b64f72..1382acecf 100644
--- a/Source/CursesDialog/CMakeLists.txt
+++ b/Source/CursesDialog/CMakeLists.txt
@@ -14,8 +14,9 @@ SOURCE_FILES( CURSES_SRCS
               ccurses
             )
 
+INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form)
 INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH})
-INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form/)
+
 LINK_LIBRARIES(${CURSES_LIBRARY})
 
 IF(CURSES_EXTRA_LIBRARY)
diff --git a/Source/CursesDialog/form/CMakeLists.txt b/Source/CursesDialog/form/CMakeLists.txt
index 7691bc91a..32c17eb9c 100644
--- a/Source/CursesDialog/form/CMakeLists.txt
+++ b/Source/CursesDialog/form/CMakeLists.txt
@@ -1,5 +1,7 @@
 PROJECT(CMAKE_FORM)
 
+INCLUDE_REGULAR_EXPRESSION("^.*$")
+
 SOURCE_FILES(FORM_SRCS
              fld_arg.c
              fld_attr.c
diff --git a/Source/CursesDialog/form/form.h b/Source/CursesDialog/form/form.h
index d0777daf9..e18dfee7c 100644
--- a/Source/CursesDialog/form/form.h
+++ b/Source/CursesDialog/form/form.h
@@ -33,7 +33,18 @@
 #ifndef FORM_H
 #define FORM_H
 
+#if defined(__sun__) && defined(__GNUC__)
+ #define _MSE_INT_H
+#endif
+
+#define _BOOL_DEFINED
+#include <sys/time.h>
+#ifndef _XOPEN_SOURCE_EXTENDED
+ #define _XOPEN_SOURCE_EXTENDED
+#endif /* XOPEN_SOURCE_EXTENDED */
 #include <curses.h>
+#undef _XOPEN_SOURCE_EXTENDED
+
 #include <eti.h>
 #include <stdarg.h>
 
diff --git a/Source/CursesDialog/form/nc_alloc.h b/Source/CursesDialog/form/nc_alloc.h
index 80ce3f4e3..f49ea93e8 100644
--- a/Source/CursesDialog/form/nc_alloc.h
+++ b/Source/CursesDialog/form/nc_alloc.h
@@ -72,7 +72,7 @@ extern void _nc_leaks_dump_entry(void);
 /* doalloc.c */
 extern void *_nc_doalloc(void *, size_t);
 #if !HAVE_STRDUP
-#define strdup _nc_strdup
+/* #define strdup _nc_strdup */
 extern char *_nc_strdup(const char *);
 #endif