diff --git a/atom/app/atom_library_main.mm b/atom/app/atom_library_main.mm
index 5cf910b2369a..885500beb5d3 100644
--- a/atom/app/atom_library_main.mm
+++ b/atom/app/atom_library_main.mm
@@ -4,9 +4,9 @@
 
 #include "atom/app/atom_library_main.h"
 
-#include "atom/app/atom_main_args.h"
 #include "atom/app/atom_main_delegate.h"
 #include "atom/app/node_main.h"
+#include "atom/common/atom_command_line.h"
 #include "base/at_exit.h"
 #include "base/i18n/icu_util.h"
 #include "base/mac/bundle_locations.h"
diff --git a/atom/app/atom_main.cc b/atom/app/atom_main.cc
index 02dc985e30c4..47be348522f1 100644
--- a/atom/app/atom_main.cc
+++ b/atom/app/atom_main.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "atom/app/atom_main.h"
-#include "atom/app/atom_main_args.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -33,6 +32,7 @@
 #endif  // defined(OS_MACOSX)
 
 #include "atom/app/node_main.h"
+#include "atom/common/atom_command_line.h"
 #include "base/i18n/icu_util.h"
 
 #if defined(OS_WIN)
diff --git a/atom/app/atom_main_args.cc b/atom/common/atom_command_line.cc
similarity index 94%
rename from atom/app/atom_main_args.cc
rename to atom/common/atom_command_line.cc
index ac1c96c1bcaf..2ac62385aeac 100644
--- a/atom/app/atom_main_args.cc
+++ b/atom/common/atom_command_line.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/app/atom_main_args.h"
+#include "atom/common/atom_command_line.h"
 
 #include "base/command_line.h"
 #include "node/deps/uv/include/uv.h"
diff --git a/atom/app/atom_main_args.h b/atom/common/atom_command_line.h
similarity index 85%
rename from atom/app/atom_main_args.h
rename to atom/common/atom_command_line.h
index 5dd42713c65a..7c8840f70751 100644
--- a/atom/app/atom_main_args.h
+++ b/atom/common/atom_command_line.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_APP_ATOM_MAIN_ARGS_H_
-#define ATOM_APP_ATOM_MAIN_ARGS_H_
+#ifndef ATOM_COMMON_ATOM_COMMAND_LINE_H_
+#define ATOM_COMMON_ATOM_COMMAND_LINE_H_
 
 #include <string>
 #include <vector>
@@ -32,4 +32,4 @@ class AtomCommandLine {
 
 }  // namespace atom
 
-#endif  // ATOM_APP_ATOM_MAIN_ARGS_H_
+#endif  // ATOM_COMMON_ATOM_COMMAND_LINE_H_
diff --git a/atom/common/node_bindings.cc b/atom/common/node_bindings.cc
index ff1d646c4d34..2d96d346d6f6 100644
--- a/atom/common/node_bindings.cc
+++ b/atom/common/node_bindings.cc
@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-#include "atom/app/atom_main_args.h"
+#include "atom/common/atom_command_line.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
 #include "base/command_line.h"
 #include "base/base_paths.h"
diff --git a/filenames.gypi b/filenames.gypi
index 99d37b5d3093..579386a5fa2b 100644
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -57,8 +57,6 @@
     'lib_sources': [
       'atom/app/atom_content_client.cc',
       'atom/app/atom_content_client.h',
-      'atom/app/atom_main_args.cc',
-      'atom/app/atom_main_args.h',
       'atom/app/atom_main_delegate.cc',
       'atom/app/atom_main_delegate.h',
       'atom/app/atom_main_delegate_mac.mm',
@@ -227,6 +225,8 @@
       'atom/common/asar/asar_util.h',
       'atom/common/asar/scoped_temporary_file.cc',
       'atom/common/asar/scoped_temporary_file.h',
+      'atom/common/atom_command_line.cc',
+      'atom/common/atom_command_line.h',
       'atom/common/common_message_generator.cc',
       'atom/common/common_message_generator.h',
       'atom/common/crash_reporter/crash_reporter.cc',