diff --git a/src/misc.h b/src/misc.h
index 7cee869c..55f4afde 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -17,32 +17,13 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined(MISC_H_INCLUDED)
 #define MISC_H_INCLUDED
 
-
-////
-//// Includes
-////
-
-#include <fstream>
 #include <string>
 
 #include "types.h"
 
-////
-//// Macros
-////
-
-#define Min(x, y) (((x) < (y))? (x) : (y))
-#define Max(x, y) (((x) < (y))? (y) : (x))
-
-
-////
-//// Prototypes
-////
-
 extern const std::string engine_name();
 extern const std::string engine_author();
 extern int get_system_time();
@@ -51,14 +32,9 @@ extern int input_available();
 extern void prefetch(char* addr);
 extern void prefetchPawn(Key, int);
 
-
-////
-//// Debug
-////
-
+// Debug functions
 extern bool dbg_show_mean;
 extern bool dbg_show_hit_rate;
-
 extern void dbg_hit_on(bool b);
 extern void dbg_hit_on_c(bool c, bool b);
 extern void dbg_before();
diff --git a/src/types.h b/src/types.h
index 29934e9d..67e40fff 100644
--- a/src/types.h
+++ b/src/types.h
@@ -20,16 +20,15 @@
 #if !defined(TYPES_H_INCLUDED)
 #define TYPES_H_INCLUDED
 
-#if !defined(_MSC_VER)
+#include <cstdlib>
 
-#include <inttypes.h>
-
-#else
+#if defined(_MSC_VER)
 
 // Disable some silly and noisy warning from MSVC compiler
 #pragma warning(disable: 4800) // Forcing value to bool 'true' or 'false'
 #pragma warning(disable: 4127) // Conditional expression is constant
 
+// MSVC does not support <inttypes.h>
 typedef   signed __int8    int8_t;
 typedef unsigned __int8   uint8_t;
 typedef   signed __int16  int16_t;
@@ -39,15 +38,18 @@ typedef unsigned __int32 uint32_t;
 typedef   signed __int64  int64_t;
 typedef unsigned __int64 uint64_t;
 
-#endif // !defined(_MSC_VER)
+#else
 
-// Hash keys
+#include <inttypes.h>
+
+#endif
+
+// Our hash key and bitboard types
 typedef uint64_t Key;
-
-// Bitboard type
 typedef uint64_t Bitboard;
 
-#include <cstdlib>
+#define Min(x, y) (((x) < (y)) ? (x) : (y))
+#define Max(x, y) (((x) < (y)) ? (y) : (x))
 
 ////
 //// Configuration