diff --git a/storm/Common.hpp b/storm/Common.hpp
deleted file mode 100644
index bffb7d5..0000000
--- a/storm/Common.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef STORM_COMMON_HPP
-#define STORM_COMMON_HPP
-
-
-#define DECLARE_STRICT_HANDLE(name) \
-    typedef struct name##__ {       \
-        int unused;                 \
-    }* name
-
-#define DECLARE_DERIVED_HANDLE(name, base)      \
-    typedef struct name##__ : public base##__ { \
-        int unused;                             \
-    }* name
-
-
-#endif
diff --git a/storm/Handle.hpp b/storm/Handle.hpp
index b4264d2..462dc70 100644
--- a/storm/Handle.hpp
+++ b/storm/Handle.hpp
@@ -7,4 +7,18 @@
     typedef struct name##__* name
 #endif
 
+#if !defined(DECLARE_STRICT_HANDLE)
+#define DECLARE_STRICT_HANDLE(name) \
+    typedef struct name##__ {       \
+        int unused;                 \
+    }* name
+#endif
+
+#if !defined(DECLARE_DERIVED_HANDLE)
+#define DECLARE_DERIVED_HANDLE(name, base)      \
+    typedef struct name##__ : public base##__ { \
+        int unused;                             \
+    }* name
+#endif
+
 #endif
diff --git a/storm/Log.hpp b/storm/Log.hpp
index 0935d0c..9537eab 100644
--- a/storm/Log.hpp
+++ b/storm/Log.hpp
@@ -5,16 +5,14 @@
 #include <cstdarg>
 #include <cstdint>
 
-#include "storm/Common.hpp"
+#include "storm/Handle.hpp"
 #include "storm/String.hpp"
 
 
-enum : uint32_t {
-    SLOG_FLAG_DEFAULT   = 0, // Create or open log file with first SLogWrite() call
-    SLOG_FLAG_OPEN_FILE = 1, // Create or open log file with SLogCreate()
-    SLOG_FLAG_NO_FILE   = 2, // Don't use log file (use OutputDebugString or console only)
-    SLOG_FLAG_APPEND    = 4  // Don't truncate existing log file
-};
+#define SLOG_FLAG_DEFAULT   0 // Create or open log file with first SLogWrite() call
+#define SLOG_FLAG_OPEN_FILE 1 // Create or open log file with SLogCreate()
+#define SLOG_FLAG_NO_FILE   2 // Don't use log file (use OutputDebugString or console only)
+#define SLOG_FLAG_APPEND    4 // Don't truncate existing log file
 
 DECLARE_STRICT_HANDLE(HSLOG);
 DECLARE_STRICT_HANDLE(HLOCKEDLOG);