diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ad41dc..80a6c8c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,7 +82,9 @@ if( NOT IMLIB_BUILD_WITH_X )
   message( FATAL_ERROR "Imlib is not built with X support" )
 endif( NOT IMLIB_BUILD_WITH_X )
 
-add_definitions( -D_POSIX_C_SOURCE=200809L -D_BSD_SOURCE -D_DEFAULT_SOURCE )
+#add_definitions( -D_POSIX_C_SOURCE=200809L -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700 -D_WITH_GETLINE )
+
+add_definitions( -D_WITH_GETLINE )
 
 include_directories( ${PROJECT_BINARY_DIR}
                      src
@@ -243,7 +245,7 @@ endif( RT_LIBRARY )
 target_link_libraries( tint2 m )
 
 add_dependencies( tint2 version )
-set_target_properties( tint2 PROPERTIES COMPILE_FLAGS "-Wall -Wpointer-arith -fno-strict-aliasing -pthread -std=c99 ${ASAN_C_FLAGS}" )
+set_target_properties( tint2 PROPERTIES COMPILE_FLAGS "-Wall -Wpointer-arith -fno-strict-aliasing -pthread -std=c11 ${ASAN_C_FLAGS}" )
 set_target_properties( tint2 PROPERTIES LINK_FLAGS "-pthread -fno-strict-aliasing ${ASAN_L_FLAGS} ${BACKTRACE_L_FLAGS}" )
 
 install( TARGETS tint2 DESTINATION bin )
diff --git a/src/launcher/apps-common.c b/src/launcher/apps-common.c
index e173046..faf87f7 100644
--- a/src/launcher/apps-common.c
+++ b/src/launcher/apps-common.c
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 
 static gint compare_strings(gconstpointer a, gconstpointer b)
 {
diff --git a/src/tint.c b/src/tint.c
index 4811c19..cc26e0f 100644
--- a/src/tint.c
+++ b/src/tint.c
@@ -269,10 +269,6 @@ const char *signal_name(int sig)
 		return "SIGVTALRM: Virtual alarm clock (4.2 BSD).";
 	case SIGPROF:
 		return "SIGPROF: Profiling alarm clock (4.2 BSD).";
-	case SIGWINCH:
-		return "SIGWINCH: Window size change (4.3 BSD, Sun).";
-	case SIGIO:
-		return "SIGIO: Pollable event occurred (System V) / I/O now possible (4.2 BSD).";
 	// case SIGPWR: return "SIGPWR: Power failure restart (System V).";
 	case SIGSYS:
 		return "SIGSYS: Bad system call.";
diff --git a/src/tint2conf/CMakeLists.txt b/src/tint2conf/CMakeLists.txt
index 1fb0b8e..12d1494 100644
--- a/src/tint2conf/CMakeLists.txt
+++ b/src/tint2conf/CMakeLists.txt
@@ -63,7 +63,7 @@ target_link_libraries( tint2conf ${X11_T2C_LIBRARIES}
 add_definitions( -DINSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\" )
 add_definitions( -DLOCALEDIR=\"${CMAKE_INSTALL_FULL_LOCALEDIR}\" )
 add_definitions( -DGETTEXT_PACKAGE=\"tint2conf\" )
-set_target_properties( tint2conf PROPERTIES COMPILE_FLAGS "-Wall -pthread -std=c99" )
+set_target_properties( tint2conf PROPERTIES COMPILE_FLAGS "-Wall -pthread -std=c11" )
 set_target_properties( tint2conf PROPERTIES LINK_FLAGS "-pthread" )
 
 add_subdirectory(po)