diff --git a/stdutil/stdutil.cpp b/stdutil/stdutil.cpp
index b3c3d03..85d4396 100644
--- a/stdutil/stdutil.cpp
+++ b/stdutil/stdutil.cpp
@@ -1,10 +1,10 @@
-
 #include "stdutil.hpp"
 
-#include <math.h>
+#include <cmath>
 #include <set>
-#include <stdlib.h>
-#include <windows.h>
+#include <cstdlib>
+
+#include <Windows.h>
 
 using namespace std;
 
@@ -171,10 +171,6 @@ void _cdecl operator delete[](void* q, const char* file, int line)
 	op_delete(q);
 }
 
-#else
-
-#define trackmem
-#define checkmem
 
 #endif
 
diff --git a/stdutil/stdutil.hpp b/stdutil/stdutil.hpp
index bf16912..4167338 100644
--- a/stdutil/stdutil.hpp
+++ b/stdutil/stdutil.hpp
@@ -1,16 +1,16 @@
-
-#ifndef STDUTIL_H
-#define STDUTIL_H
-
-#pragma warning(disable : 4786)
-
-#include "config.hpp"
-
+#pragma once
 #include <iostream>
 #include <string>
 
+#include <config.hpp>
+
+#ifdef MEMDEBUG
 void trackmem(bool enable);
 void checkmem(std::ostream& out);
+#else
+static inline void trackmem(bool){};
+static inline void checkmem(std::ostream&){};
+#endif
 
 //some stuff that should be in std libs
 int         atoi(const std::string& s);
@@ -132,5 +132,3 @@ class pool {
 		p->~T();
 	}
 };
-
-#endif