diff --git a/headerfiles.mk b/headerfiles.mk
index 1f735d55..737b1b35 100644
--- a/headerfiles.mk
+++ b/headerfiles.mk
@@ -43,7 +43,7 @@ HDRS=	fifo.h \
 	fdqueue.h \
 	http_server.h \
 	xprintf.h \
-	features.h \
+	lang.h \
 	constants.h \
 	monitor-client.h \
 	mdp_client.h \
diff --git a/instance.h b/instance.h
index 06cc867b..65d58af1 100644
--- a/instance.h
+++ b/instance.h
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #ifndef __SERVAL_DNA__INSTANCE_H
 #define __SERVAL_DNA__INSTANCE_H
 
-#include "features.h"
+#include "lang.h"
 #include "whence.h"
 #include "strbuf.h"
 
diff --git a/keyring_cli.c b/keyring_cli.c
index 53508e45..403ff02f 100644
--- a/keyring_cli.c
+++ b/keyring_cli.c
@@ -18,7 +18,7 @@
  */
 
 #include <stdio.h>
-#include "features.h"
+#include "lang.h"
 #include "cli.h"
 #include "serval_types.h"
 #include "str.h"
diff --git a/features.h b/lang.h
similarity index 88%
rename from features.h
rename to lang.h
index 3d8fe44c..a612e57a 100644
--- a/features.h
+++ b/lang.h
@@ -1,5 +1,6 @@
 /*
 Copyright (C) 2015 Serval Project Inc.
+Copyright (C) 2016 Flinders University
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -16,10 +17,11 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#ifndef __SERVAL_DNA__FEATURES_H
-#define __SERVAL_DNA__FEATURES_H
+#ifndef __SERVAL_DNA__LANG_H
+#define __SERVAL_DNA__LANG_H
 
-/* Useful macros not specific to Serval DNA
+/* Useful macros not specific to Serval DNA that assist with using the C
+ * language.
  */
 
 // Number of elements in an array (Warning: does not work if A is a pointer!).
@@ -60,4 +62,4 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #   define UNUSED(x) x
 #endif
 
-#endif // __SERVAL_DNA__FEATURES_H
+#endif // __SERVAL_DNA__LANG_H
diff --git a/mem.h b/mem.h
index a06fb5f6..f98f7b7b 100644
--- a/mem.h
+++ b/mem.h
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #define __SERVAL_DNA__MEM_H
 
 #include <sys/types.h>
-#include "features.h"
+#include "lang.h"
 #include "log.h"
 
 // #define MALLOC_PARANOIA
diff --git a/section.h b/section.h
index 30298b86..c87c6b6e 100644
--- a/section.h
+++ b/section.h
@@ -19,7 +19,7 @@
 #ifndef __SERVAL_DNA__SECTION_H
 #define __SERVAL_DNA__SECTION_H
 
-#include "features.h"
+#include "lang.h"
 
 /* Macros for creating named linkage sections.
  */
diff --git a/sighandlers.c b/sighandlers.c
index c9098dbd..d925e094 100644
--- a/sighandlers.c
+++ b/sighandlers.c
@@ -18,8 +18,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#include "features.h"
-#include "constants.h"
+#include "lang.h"
 #include "sighandlers.h"
 
 int sigPipeFlag=0;
@@ -33,7 +32,7 @@ void sigPipeHandler(int UNUSED(signal))
 }
 
 void sigIoHandler(int UNUSED(signal))
-{  
+{
   sigIoFlag++;
   return;
 }
diff --git a/socket.h b/socket.h
index b26e0360..69d4d982 100644
--- a/socket.h
+++ b/socket.h
@@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #   endif
 #endif
 
-#include "features.h"
+#include "lang.h"
 #include "whence.h"
 
 struct socket_address{
diff --git a/strbuf.h b/strbuf.h
index 45c6a0fd..85f6d90d 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #ifndef __STRBUF_H__
 #define __STRBUF_H__
 #include <stddef.h>
-#include "features.h"
+#include "lang.h"
 
 /**
     A strbuf provides a convenient set of primitives for assembling a
diff --git a/xprintf.h b/xprintf.h
index 2e784a28..034f4ca3 100644
--- a/xprintf.h
+++ b/xprintf.h
@@ -64,7 +64,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <stdarg.h>
 #include <unistd.h>
 
-#include "features.h"
+#include "lang.h"
 
 typedef void CONTEXT_VPRINTF(void *context, const char *fmt, va_list);