diff --git a/cgi.d b/cgi.d
index 25ed728..9ff9b31 100644
--- a/cgi.d
+++ b/cgi.d
@@ -4667,7 +4667,7 @@ void serveFastCgi(alias fun, CustomCgi = Cgi, long maxContentLength = defaultMax
 }
 
 /// Returns the default listening port for the current cgi configuration. 8085 for embedded httpd, 4000 for scgi, irrelevant for others.
-ushort defaultListeningPort() {
+ushort defaultListeningPort() @safe {
 	version(netman_httpd)
 		return 8080;
 	else version(embedded_httpd_processes)
@@ -4681,7 +4681,7 @@ ushort defaultListeningPort() {
 }
 
 /// Default host for listening. 127.0.0.1 for scgi, null (aka all interfaces) for all others. If you want the server directly accessible from other computers on the network, normally use null. If not, 127.0.0.1 is a bit better. Settable with default handlers with --listening-host command line argument.
-string defaultListeningHost() {
+string defaultListeningHost() @safe {
 	version(netman_httpd)
 		return null;
 	else version(embedded_httpd_processes)
diff --git a/mp3.d b/mp3.d
index df86cb3..0593bea 100644
--- a/mp3.d
+++ b/mp3.d
@@ -90,7 +90,7 @@ class MP3Decoder {
 			I realize these are all breaking changes, but the fix is easy and the new functionality,
 			the [seek] function among others, is worth it. To me anyway, and I hope for you too.
 	+/
-	this (int delegate (ubyte[] buf) reader, int delegate(ulong where) seeker) {
+	this (int delegate (ubyte[] buf) reader, int delegate(ulong where) seeker) @system {
 		if (reader is null)
 			throw new Exception("reader is null");
 		if (seeker is null)
@@ -338,7 +338,7 @@ alias uint64_t = ulong;
 alias int16_t = short;
 alias int32_t = int;
 
-enum MINIMP3_MAX_SAMPLES_PER_FRAME = (1152*2);
+@safe enum MINIMP3_MAX_SAMPLES_PER_FRAME = (1152*2);
 
 struct mp3dec_frame_info_t
 {
diff --git a/simpledisplay.d b/simpledisplay.d
index dd353f5..c04df9d 100644
--- a/simpledisplay.d
+++ b/simpledisplay.d
@@ -3762,7 +3762,7 @@ private:
 	}
 
 	// for all windows in nativeMapping
-	package static void processAllCustomEvents () {
+	package static void processAllCustomEvents () @system {
 
 		cleanupQueue.process();
 
@@ -18706,7 +18706,7 @@ extern(System) nothrow @nogc {
 		private __gshared /*glXCreateContextAttribsARB_fna*/void* glXCreateContextAttribsARBFn = cast(void*)1; //HACK!
 
 		// this made public so we don't have to get it again and again
-		public bool glXCreateContextAttribsARB_present () {
+		public bool glXCreateContextAttribsARB_present () @system {
 			if (glXCreateContextAttribsARBFn is cast(void*)1) {
 				// get it
 				glXCreateContextAttribsARBFn = cast(void*)glbindGetProcAddress("glXCreateContextAttribsARB");
@@ -18716,7 +18716,7 @@ extern(System) nothrow @nogc {
 		}
 
 		// this made public so we don't have to get it again and again
-		public GLXContext glXCreateContextAttribsARB (Display *dpy, GLXFBConfig config, GLXContext share_context, /*Bool*/int direct, const(int)* attrib_list) {
+		public GLXContext glXCreateContextAttribsARB (Display *dpy, GLXFBConfig config, GLXContext share_context, /*Bool*/int direct, const(int)* attrib_list) @system {
 			if (!glXCreateContextAttribsARB_present()) assert(0, "glXCreateContextAttribsARB is not present");
 			return (cast(glXCreateContextAttribsARB_fna)glXCreateContextAttribsARBFn)(dpy, config, share_context, direct, attrib_list);
 		}