diff --git a/bin/cdist b/bin/cdist
index 14cff65a..78893b60 100755
--- a/bin/cdist
+++ b/bin/cdist
@@ -20,26 +20,10 @@
 #
 #
 
-import argparse
-import logging
-import multiprocessing
-import os
-import re
-import sys
-import time
-
-log = logging.getLogger("cdist")
-
-# Ensure our /lib/ is included into PYTHON_PATH
-sys.path.insert(0, os.path.abspath(
-        os.path.join(os.path.dirname(os.path.realpath(__file__)), '../lib')))
-
-import cdist
-
-TYPE_PREFIX = "__"
-
 def commandline():
     """Parse command line"""
+    import argparse
+
     import cdist.banner
     import cdist.config
     import cdist.install
@@ -203,6 +187,23 @@ def emulator():
 
 if __name__ == "__main__":
     try:
+        import logging
+        import multiprocessing
+        import os
+        import re
+        import sys
+        import time
+
+        log = logging.getLogger("cdist")
+
+        # Ensure our /lib/ is included into PYTHON_PATH
+        sys.path.insert(0, os.path.abspath(
+                os.path.join(os.path.dirname(os.path.realpath(__file__)), '../lib')))
+
+        import cdist
+
+        TYPE_PREFIX = "__"
+
         logging.basicConfig(format='%(levelname)s: %(message)s')
 
         if re.match(TYPE_PREFIX, os.path.basename(sys.argv[0])):
@@ -214,3 +215,5 @@ if __name__ == "__main__":
         sys.exit(0)
 
     sys.exit(0)
+
+