4 files changed, 33 insertions, 15 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 18525f038..67688bd6d 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -33,6 +33,7 @@
 #include "main.h"
 #include "microdesc.h"
 #include "networkstatus.h"
+#include "ntmain.h"
 #include "rendclient.h"
 #include "rendcommon.h"
 #include "rendservice.h"
diff --git a/src/or/ntmain.c b/src/or/ntmain.c
index 6f349cca6..9bcb7047e 100644
--- a/src/or/ntmain.c
+++ b/src/or/ntmain.c
@@ -5,6 +5,8 @@
 
 #define MAIN_PRIVATE
 #include "or.h"
+#include "config.h"
+#include "main.h"
 
 #ifdef HAVE_EVENT2_EVENT_H
 #include <event2/event.h>
diff --git a/src/or/ntmain.h b/src/or/ntmain.h
new file mode 100644
index 000000000..2cfa653c3
--- /dev/null
+++ b/src/or/ntmain.h
@@ -0,0 +1,30 @@
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007-2010, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+/**
+ * \file ntmain.h
+ * \brief Header file for ntmain.c.
+ **/
+
+#ifndef _TOR_NTMAIN_H
+#define _TOR_NTMAIN_H
+
+#ifdef MS_WINDOWS
+#if !defined (WINCE)
+#define NT_SERVICE
+#endif
+#endif
+
+#ifdef NT_SERVICE
+int nt_service_parse_options(int argc, char **argv, int *should_exit);
+int nt_service_is_stopping(void);
+void nt_service_set_state(DWORD state);
+#else
+#define nt_service_is_stopping() 0
+#endif
+
+#endif
+
diff --git a/src/or/or.h b/src/or/or.h
index 4f1eab526..2afbac6f3 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3293,21 +3293,6 @@ typedef enum version_status_t {
   VS_UNKNOWN, /**< We have no idea. */
 } version_status_t;
 
-/********************************* ntmain.c ***************************/
-#ifdef MS_WINDOWS
-#if !defined (WINCE)
-#define NT_SERVICE
-#endif
-#endif
-
-#ifdef NT_SERVICE
-int nt_service_parse_options(int argc, char **argv, int *should_exit);
-int nt_service_is_stopping(void);
-void nt_service_set_state(DWORD state);
-#else
-#define nt_service_is_stopping() 0
-#endif
-
 /********************************* onion.c ***************************/
 
 int onion_pending_add(or_circuit_t *circ, char *onionskin);